Activate some OP tests, and add some optional (stupid) operations

diff --git a/src/smpi/mpi/smpi_op.cpp b/src/smpi/mpi/smpi_op.cpp
index d8fcfe5..3e5bace 100644 (file)
--- a/src/smpi/mpi/smpi_op.cpp
+++ b/src/smpi/mpi/smpi_op.cpp
@@ -136,6 +136,7 @@ static void prod_func(void *a, void *b, int *length, MPI_Datatype * datatype)
 static void land_func(void *a, void *b, int *length, MPI_Datatype * datatype)
 {
   APPLY_BASIC_OP_LOOP(LAND_OP)
+  APPLY_FLOAT_OP_LOOP(LAND_OP)
   APPLY_BOOL_OP_LOOP(LAND_OP)
   APPLY_END_OP_LOOP(LAND_OP)
 }
@@ -143,6 +144,7 @@ static void land_func(void *a, void *b, int *length, MPI_Datatype * datatype)
 static void lor_func(void *a, void *b, int *length, MPI_Datatype * datatype)
 {
   APPLY_BASIC_OP_LOOP(LOR_OP)
+  APPLY_FLOAT_OP_LOOP(LOR_OP)
   APPLY_BOOL_OP_LOOP(LOR_OP)
   APPLY_END_OP_LOOP(LOR_OP)
 }
@@ -150,6 +152,7 @@ static void lor_func(void *a, void *b, int *length, MPI_Datatype * datatype)
 static void lxor_func(void *a, void *b, int *length, MPI_Datatype * datatype)
 {
   APPLY_BASIC_OP_LOOP(LXOR_OP)
+  APPLY_FLOAT_OP_LOOP(LXOR_OP)
   APPLY_BOOL_OP_LOOP(LXOR_OP)
   APPLY_END_OP_LOOP(LXOR_OP)
 }

diff --git a/teshsuite/smpi/mpich3-test/coll/CMakeLists.txt b/teshsuite/smpi/mpich3-test/coll/CMakeLists.txt
index 3fd1c54..d85adf5 100644 (file)
--- a/teshsuite/smpi/mpich3-test/coll/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/coll/CMakeLists.txt
@@ -18,13 +18,14 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
         # icallgather icallgatherv icallreduce
         # icalltoall icalltoallv icalltoallw icbarrier icbcast
         # icgather icgatherv icreduce icscatter icscatterv
-        # opband opbor opbxor opland oplor oplxor opmax opmaxloc
-        # opmin opminloc opprod opsum nonblocking3
+         opband opbor opbxor opland oplor oplxor opmax opmaxloc
+         opmin opminloc opprod opsum 
+         #nonblocking3
           op_commutative red3 red4 redscat2 redscat3 redscatbkinter redscatblk3
           redscat red_scat_block red_scat_block2 allgatherv4 allred
         # redscatinter
           reduce_local scantst scatter2 scatter3 scattern scatterv
-        # uoplong
+         uoplong
          )
     add_executable(${test} EXCLUDE_FROM_ALL ${test}.c)
     add_dependencies(tests ${test})

diff --git a/teshsuite/smpi/mpich3-test/coll/testlist b/teshsuite/smpi/mpich3-test/coll/testlist
index 69fdc0e..6a84bf2 100644 (file)
--- a/teshsuite/smpi/mpich3-test/coll/testlist
+++ b/teshsuite/smpi/mpich3-test/coll/testlist
@@ -112,24 +112,24 @@ scatterv 4
 #icalltoallw 7
 # the opxxx tests look at optional types, and are included for MPICH testing.
 # MPI implementations may instead signal errors for these types
-#opland 4
-#oplor 4
-#oplxor 4
-#oplxor 5
-#opband 4
-#opbor 4
-#opbxor 4
-#opbxor 5
-#opprod 5
-#opprod 6
-#opsum 4
-#opmin 4
-#opminloc 4
-#opmax 5
-#opmaxloc 5
-#uoplong 4
-#uoplong 11
-#uoplong 16
+opland 4
+oplor 4
+oplxor 4
+oplxor 5
+opband 4
+opbor 4
+opbxor 4
+opbxor 5
+opprod 5
+opprod 6
+opsum 4
+opmin 4
+opminloc 4
+opmax 5
+opmaxloc 5
+uoplong 4
+uoplong 11
+uoplong 16
 nonblocking 4
 nonblocking 5
 nonblocking 10