Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
libcdi
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mpim-sw
libcdi
Commits
bc118777
Commit
bc118777
authored
5 years ago
by
Thomas Jahns
Committed by
Sergey Kosukhin
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Add work-around for defect in OpenMPI 2.0.2.
parent
9d5451b6
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!34
Version 2.2.0
,
!13
Consolidation with CDI-PIO (develop)
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/pio_mpinonb.c
+15
-2
15 additions, 2 deletions
src/pio_mpinonb.c
with
15 additions
and
2 deletions
src/pio_mpinonb.c
+
15
−
2
View file @
bc118777
...
...
@@ -32,6 +32,17 @@ struct fileMPIFWS
static
struct
fileMPIFWS
*
openFiles
;
static
unsigned
openFilesSize
,
openFilesFill
;
/* Open MPI 2.0.2 forgets to set request to MPI_REQUEST_NULL */
#ifdef OMPI_MINOR_VERSION
#if OMPI_MAJOR_VERSION == 2 && OMPI_MINOR_VERSION == 0 && OMPI_RELEASE_VERSION == 2
#define POSTWAIT_WORKAROUND(req) req = MPI_REQUEST_NULL
#else
#define POSTWAIT_WORKAROUND(req)
#endif
#else
#define POSTWAIT_WORKAROUND(req)
#endif
/***************************************************************/
static
void
...
...
@@ -70,8 +81,8 @@ initAFiledataMPINONB(struct fileMPIFWS *of, const char *filename, size_t bufSize
#if OMPI_MAJOR_VERSION == 1 && OMPI_MINOR_VERSION == 2 && MPI_SUBVERSION == 1
#warning "implementing Bull X MPI work-around"
{
MPI_Status
stat
;
xmpi
(
MPI_File_write_ordered
(
of
->
fh
,
filename
,
0
,
MPI_BYTE
,
&
stat
)
);
MPI_Status
stat
us
;
xmpi
Stat
(
MPI_File_write_ordered
(
of
->
fh
,
filename
,
0
,
MPI_BYTE
,
&
stat
us
),
&
status
);
}
#endif
#endif
...
...
@@ -151,6 +162,7 @@ fwMPINONB(int fileID, const void *buffer, size_t len, int tsID)
of
->
tsID
=
tsID
;
MPI_Status
status
;
xmpiStat
(
MPI_Wait
(
&
of
->
request
,
&
status
),
&
status
);
POSTWAIT_WORKAROUND
(
of
->
request
);
xmpi
(
MPI_Barrier
(
commInqCommPio
()));
}
...
...
@@ -192,6 +204,7 @@ fcMPINONB(int fileID)
writeMPINONB
(
of
);
MPI_Status
status
;
xmpiStat
(
MPI_Wait
(
&
(
of
->
request
),
&
status
),
&
status
);
POSTWAIT_WORKAROUND
(
of
->
request
);
/* remove file element */
int
iret
=
destroyAFiledataMPINONB
(
of
);
--
openFilesFill
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment