Skip to content

Commit 67e9d79

Browse files
authored
Merge pull request #14 from hppritcha/topic/sessions_tests_cleanup
sessions tests - some cleanup
2 parents 53c2732 + 77ecad7 commit 67e9d79

File tree

5 files changed

+44
-11
lines changed

5 files changed

+44
-11
lines changed

.gitignore

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
sessions/sessions_ex1.o
2+
sessions/sessions_ex2
3+
sessions/sessions_ex3
4+
sessions/sessions_ex4
5+
sessions/sessions_test
6+
sessions/sessions_test1
7+
sessions/sessions_test10
8+
sessions/sessions_test11
9+
sessions/sessions_test12
10+
sessions/sessions_test13
11+
sessions/sessions_test14
12+
sessions/sessions_test15
13+
sessions/sessions_test16
14+
sessions/sessions_test2
15+
sessions/sessions_test3
16+
sessions/sessions_test4
17+
sessions/sessions_test5
18+
sessions/sessions_test6
19+
sessions/sessions_test7
20+
sessions/sessions_test8
21+
sessions/sessions_test9
22+

sessions/Makefile

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ EXAMPLES = \
4141
sessions_test1 \
4242
sessions_test2 \
4343
sessions_test3 \
44-
sessions_test4 \
4544
sessions_test5 \
4645
sessions_test6 \
4746
sessions_test7 \
@@ -51,7 +50,6 @@ EXAMPLES = \
5150
sessions_test11 \
5251
sessions_test12 \
5352
sessions_test13 \
54-
sessions_test14 \
5553
sessions_test15 \
5654
sessions_test16
5755

@@ -60,9 +58,9 @@ EXAMPLES = \
6058
# others if we have the appropriate Open MPI / OpenSHMEM language
6159
# bindings.
6260

63-
all: sessions_ex1.o sessions_ex2 sessions_test sessions_test1 sessions_test2 sessions_test3 sessions_test4 sessions_test5 \
61+
all: sessions_ex1.o sessions_ex2 sessions_test sessions_test1 sessions_test2 sessions_test3 sessions_test5 \
6462
sessions_test6 sessions_test7 sessions_test8 sessions_test9 sessions_test10 sessions_test11 sessions_test12 sessions_test13 \
65-
sessions_test14 sessions_test15 sessions_test16
63+
sessions_test15 sessions_test16
6664
@ if which ompi_info >/dev/null 2>&1 ; then \
6765
$(MAKE) mpi; \
6866
fi
@@ -99,8 +97,6 @@ sessions_test2: sessions_test2.c
9997
$(MPICC) $(CFLAGS) $(LDFLAGS) $? $(LDLIBS) -o $@
10098
sessions_test3: sessions_test3.c
10199
$(MPICC) $(CFLAGS) $(LDFLAGS) $? $(LDLIBS) -o $@
102-
sessions_test4: sessions_test4.c
103-
$(MPICC) $(CFLAGS) $(LDFLAGS) $? $(LDLIBS) -o $@
104100
sessions_test5: sessions_test5.c
105101
$(MPICC) $(CFLAGS) $(LDFLAGS) $? $(LDLIBS) -o $@
106102
sessions_test6: sessions_test6.c
@@ -119,8 +115,6 @@ sessions_test12: sessions_test12.c
119115
$(MPICC) $(CFLAGS) $(LDFLAGS) $? $(LDLIBS) -o $@
120116
sessions_test13: sessions_test13.c
121117
$(MPICC) $(CFLAGS) $(LDFLAGS) $? $(LDLIBS) -o $@
122-
sessions_test14: sessions_test14.c
123-
$(MPICC) $(CFLAGS) $(LDFLAGS) $? $(LDLIBS) -o $@
124118
sessions_test15: sessions_test15.c
125119
$(MPICC) $(CFLAGS) $(LDFLAGS) $? $(LDLIBS) -o $@
126120
sessions_test16: sessions_test16.c

sessions/sessions_test14.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
/*
2+
* this test disabled for now, has numerous bugs
3+
*/
14
#include <stdio.h>
25
#include <stdlib.h>
36
#include <string.h>

sessions/sessions_test15.c

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ int main (int argc, char *argv[])
2424
MPI_Group group, group1;
2525
MPI_Comm comm_world, comm_world1;
2626
MPI_Info info;
27-
int rc, npsets, npsets1, one = 1, i;
27+
int rc, npsets, npsets1, one = 1, i, nprocs;
28+
int rank, buffer;
2829

2930
rc = MPI_Session_create_errhandler (my_session_errhandler, &errhandler);
3031
if (MPI_SUCCESS != rc) {
@@ -87,10 +88,18 @@ int main (int argc, char *argv[])
8788
MPI_Comm_create_from_group (group, "my_world", MPI_INFO_NULL, MPI_ERRORS_RETURN, &comm_world);
8889
MPI_Group_free (&group);
8990

91+
MPI_Comm_size(comm_world, &nprocs);
92+
MPI_Comm_rank(comm_world, &rank);
93+
if (nprocs < 4) {
94+
if (rank ==0) {
95+
fprintf(stderr, "Test requires at least 4 processes\n");
96+
}
97+
MPI_Abort(comm_world, -1);
98+
}
99+
90100
MPI_Comm_create_from_group (group1, "my_world", MPI_INFO_NULL, MPI_ERRORS_RETURN, &comm_world1);
91101
MPI_Group_free (&group1);
92102

93-
int rank, buffer;
94103
MPI_Comm_rank(comm_world, &rank);
95104

96105
/* Check MPI_Waitall */

sessions/sessions_test4.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* this test brought up an issue with the MPI-4 Standard.
3+
* See issue https://github.com/mpi-forum/mpi-issues/issues/534
4+
* Disable this test till the Forum decided how to handle use of MPI_GROUP_NULL.
5+
*/
16
#include <stdio.h>
27
#include <stdlib.h>
38
#include <string.h>
@@ -76,4 +81,4 @@ int main (int argc, char *argv[])
7681
}
7782

7883

79-
}
84+
}

0 commit comments

Comments
 (0)