Merge pull request #1019 from philip-davis/master

Add LibFabric tests
ornladios · Nov 28, 2018 · 1c3338b · 1c3338b
2 parents d83cddc + a752159
commit 1c3338b
Show file tree

Hide file tree

Showing 6 changed files with 175 additions and 83 deletions.
diff --git a/examples/heatTransfer/CMakeLists.txt b/examples/heatTransfer/CMakeLists.txt
@@ -24,6 +24,10 @@ if(ADIOS2_HAVE_SST)
   include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTFFSMxM.cmake)
   include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTFFSMxN.cmake)
   include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTFFSMx1.cmake)
+  if(ADIOS2_SST_HAVE_LIBFABRIC)
+    include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTBPRDMAMxN.cmake)
+    include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTFFSRDMAMxN.cmake)
+  endif()
 endif()
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/TestInsituMPIMxM.cmake)

diff --git a/examples/heatTransfer/TestSSTBPRDMAMxN.cmake b/examples/heatTransfer/TestSSTBPRDMAMxN.cmake
@@ -0,0 +1,37 @@
+#------------------------------------------------------------------------------#
+# Distributed under the OSI-approved Apache License, Version 2.0.  See
+# accompanying file Copyright.txt for details.
+#------------------------------------------------------------------------------#
+
+add_test(NAME HeatTransfer.SST.BP.RDMA.MxN
+  COMMAND ${MPIEXEC_EXECUTABLE}
+    ${MPIEXEC_NUMPROC_FLAG} 4
+      $<TARGET_FILE:heatTransfer_write_adios2>
+      ${CMAKE_CURRENT_SOURCE_DIR}/heat_sst_bp_rdma.xml
+      HeatTransfer.SST.BP.RDMA.Write.MxN 2 2 10 10 10 10
+  : ${MPIEXEC_NUMPROC_FLAG} 3
+      $<TARGET_FILE:heatTransfer_read>
+      ${CMAKE_CURRENT_SOURCE_DIR}/heat_sst_bp_rdma.xml
+      HeatTransfer.SST.BP.RDMA.Write.MxN.bp HeatTransfer.SST.BP.RDMA.Read.MxN 1 3
+)
+
+add_test(NAME HeatTransfer.SST.BP.RDMA.Dump.MxN
+  COMMAND ${CMAKE_COMMAND}
+    -DARGS=-d 
+    -DINPUT_FILE=HeatTransfer.SST.BP.RDMA.Read.MxN.bp
+    -DOUTPUT_FILE=HeatTransfer.SST.BP.RDMA.Dump.MxN.txt
+    -P "${PROJECT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bpls.cmake"
+)
+set_property(TEST HeatTransfer.SST.BP.RDMA.Dump.MxN
+  PROPERTY DEPENDS HeatTransfer.SST.BP.RDMA.Read.MxN
+)
+
+add_test(NAME HeatTransfer.SST.BP.RDMA.Validate.MxN
+  COMMAND ${CMAKE_COMMAND}
+    -E compare_files
+    ${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
+    ${CMAKE_CURRENT_BINARY_DIR}/HeatTransfer.SST.BP.RDMA.Dump.MxN.txt
+)
+set_property(TEST HeatTransfer.SST.BP.RDMA.Validate.MxN
+  PROPERTY DEPENDS HeatTransfer.SST.BP.RDMA.Dump.MxN
+)
diff --git a/examples/heatTransfer/TestSSTFFSRDMAMxN.cmake b/examples/heatTransfer/TestSSTFFSRDMAMxN.cmake
@@ -0,0 +1,37 @@
+#------------------------------------------------------------------------------#
+# Distributed under the OSI-approved Apache License, Version 2.0.  See
+# accompanying file Copyright.txt for details.
+#------------------------------------------------------------------------------#
+
+add_test(NAME HeatTransfer.SST.FFS.RDMA.MxN
+  COMMAND ${MPIEXEC_EXECUTABLE}
+    ${MPIEXEC_NUMPROC_FLAG} 4
+      $<TARGET_FILE:heatTransfer_write_adios2>
+      ${CMAKE_CURRENT_SOURCE_DIR}/heat_sst_ffs_rdma.xml
+      HeatTransfer.SST.FFS.RDMA.Write.MxN 2 2 10 10 10 10
+  : ${MPIEXEC_NUMPROC_FLAG} 3
+      $<TARGET_FILE:heatTransfer_read>
+      ${CMAKE_CURRENT_SOURCE_DIR}/heat_sst_ffs_rdma.xml
+      HeatTransfer.SST.FFS.RDMA.Write.MxN.bp HeatTransfer.SST.FFS.RDMA.Read.MxN 1 3
+)
+
+add_test(NAME HeatTransfer.SST.FFS.RDMA.Dump.MxN
+  COMMAND ${CMAKE_COMMAND}
+    -DARGS=-d 
+    -DINPUT_FILE=HeatTransfer.SST.FFS.RDMA.Read.MxN.bp
+    -DOUTPUT_FILE=HeatTransfer.SST.FFS.RDMA.Dump.MxN.txt
+    -P "${PROJECT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bpls.cmake"
+)
+set_property(TEST HeatTransfer.SST.FFS.RDMA.Dump.MxN
+  PROPERTY DEPENDS HeatTransfer.SST.FFS.RDMA.Read.MxN
+)
+
+add_test(NAME HeatTransfer.SST.FFS.RDMA.Validate.MxN
+  COMMAND ${CMAKE_COMMAND}
+    -E compare_files
+    ${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
+    ${CMAKE_CURRENT_BINARY_DIR}/HeatTransfer.SST.FFS.RDMA.Dump.MxN.txt
+)
+set_property(TEST HeatTransfer.SST.FFS.RDMA.Validate.MxN
+  PROPERTY DEPENDS HeatTransfer.SST.FFS.RDMA.Dump.MxN
+)
diff --git a/examples/heatTransfer/heat_sst_bp_rdma.xml b/examples/heatTransfer/heat_sst_bp_rdma.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<!-- Config XML file fo the  
+     - heatTransfer_write_adios2 
+     - heatTransfer_read
+     executables in build/bin -->
+
+<adios-config>
+
+    <!--====================================
+           Configuration for the Writer 
+        ====================================-->
+
+    <io name="writer">
+        <engine type="SST">
+            <parameter key="MarshalMethod" value="BP"/>
+            <parameter key="DataTransport" value="rdma" />
+        </engine>
+    </io>
+
+
+    <!--======================================
+           Configuration for the Reader Input
+        ======================================-->
+
+    <io name="readerInput">
+        <engine type="SST">
+            <parameter key="MarshalMethod" value="BP"/>
+            <parameter key="DataTransport" value="rdma" />
+        </engine>
+    </io>
+
+
+    <!--=======================================
+           Configuration for the Reader output
+        =======================================-->
+
+    <io name="readerOutput">
+        <engine type="BPFile">
+        </engine>
+    </io>
+
+</adios-config>
diff --git a/examples/heatTransfer/heat_sst_ffs_rdma.xml b/examples/heatTransfer/heat_sst_ffs_rdma.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<!-- Config XML file fo the  
+     - heatTransfer_write_adios2 
+     - heatTransfer_read
+     executables in build/bin -->
+
+<adios-config>
+
+    <!--====================================
+           Configuration for the Writer 
+        ====================================-->
+
+    <io name="writer">
+        <engine type="SST">
+            <parameter key="MarshalMethod" value="FFS"/>
+            <parameter key="DataTransport" value="rdma"/>
+        </engine>
+    </io>
+
+
+    <!--======================================
+           Configuration for the Reader Input
+        ======================================-->
+
+    <io name="readerInput">
+        <engine type="SST">
+            <parameter key="MarshalMethod" value="FFS"/>
+            <parameter key="DataTransport" value="rdma"/>
+        </engine>
+    </io>
+
+
+    <!--=======================================
+           Configuration for the Reader output
+        =======================================-->
+
+    <io name="readerOutput">
+        <engine type="BPFile">
+        </engine>
+    </io>
+
+</adios-config>