Skip to content

Updating very old tests #4317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eisenhauer merged 4 commits into from
Aug 22, 2024
Merged

Updating very old tests #4317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b6aef86
Updating very old tests
eisenhauer Aug 21, 2024
f19a995
Missed these
eisenhauer Aug 21, 2024
69ec01a
wrong mpi flag
eisenhauer Aug 22, 2024
41b9f02
fixup
eisenhauer Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...les/simulations/heatTransfer/heat_bp3.xml → ...les/simulations/heatTransfer/heat_bp5.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
====================================-->

<io name="writer">
<engine type="BP3">
<engine type="BP5">

<!-- for vectorized memory operations, make sure your system
enables threads-->
Expand Down Expand Up @@ -62,7 +62,7 @@
=======================================-->

<io name="readerInput">
<engine type="BP3">
<engine type="BP5">

<!-- for vectorized memory operations, make sure your system
enables threads-->
Expand Down Expand Up @@ -93,7 +93,7 @@
=======================================-->

<io name="readerOutput">
<engine type="BP3">
<engine type="BP5">

<!-- for vectorized memory operations, make sure your system
enables threads-->
Expand Down
6 changes: 3 additions & 3 deletions ...simulations/heatTransfer/heat_bp3_zfp.xml → ...simulations/heatTransfer/heat_bp5_zfp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</operation>
</variable>

<engine type="BP3">
<engine type="BP5">

<!-- for vectorized memory operations, make sure your system
enables threads-->
Expand Down Expand Up @@ -69,7 +69,7 @@
=======================================-->

<io name="readerInput">
<engine type="BP3">
<engine type="BP5">

<!-- for vectorized memory operations, make sure your system
enables threads-->
Expand Down Expand Up @@ -100,7 +100,7 @@
=======================================-->

<io name="readerOutput">
<engine type="BP3">
<engine type="BP5">

<!-- for vectorized memory operations, make sure your system
enables threads-->
Expand Down
2 changes: 0 additions & 2 deletions .../simulations/heatTransfer/heat_sst_bp.xml → ...les/simulations/heatTransfer/heat_sst.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

<io name="writer">
<engine type="SST">
<parameter key="MarshalMethod" value="BP"/>
</engine>
</io>

Expand All @@ -23,7 +22,6 @@

<io name="readerInput">
<engine type="SST">
<parameter key="MarshalMethod" value="BP"/>
</engine>
</io>

Expand Down
40 changes: 0 additions & 40 deletions examples/simulations/heatTransfer/heat_sst_ffs.xml
View file
Open in desktop

This file was deleted.

42 changes: 0 additions & 42 deletions examples/simulations/heatTransfer/heat_sst_ffs_rdma.xml
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions ...lations/heatTransfer/heat_sst_bp_rdma.xml → ...imulations/heatTransfer/heat_sst_rdma.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

<io name="writer">
<engine type="SST">
<parameter key="MarshalMethod" value="BP"/>
<!--parameter key="DataTransport" value="rdma"-->
</engine>
</io>
Expand All @@ -24,7 +23,6 @@

<io name="readerInput">
<engine type="SST">
<parameter key="MarshalMethod" value="BP"/>
<!--parameter key="DataTransport" value="rdma"-->
</engine>
</io>
Expand Down
12 changes: 4 additions & 8 deletions testing/examples/heatTransfer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,11 @@ endif()

if(ADIOS2_RUN_MPI_MPMD_TESTS)
if(ADIOS2_HAVE_SST)
include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTBPMxM.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTBPMxN.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTBPMx1.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTFFSMxM.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTFFSMxN.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTFFSMx1.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTMxM.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTMxN.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTMx1.cmake)
if(ADIOS2_SST_HAVE_LIBFABRIC)
# include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTBPRDMAMxN.cmake)
# include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTFFSRDMAMxN.cmake)
# include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTRDMAMxN.cmake)
endif()
endif()
if(NOT MSVC)
Expand Down
16 changes: 8 additions & 8 deletions testing/examples/heatTransfer/TestBPFileMx1.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,38 +5,38 @@

include(ADIOSFunctions)

add_test(NAME HeatTransfer.BP3.Mx1.Write
add_test(NAME HeatTransfer.BP5.Mx1.Write
COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_EXTRA_FLAGS}
${MPIEXEC_NUMPROC_FLAG} 4
$<TARGET_FILE:adios2_simulations_heatTransferWrite>
${PROJECT_SOURCE_DIR}/examples/simulations/heatTransfer/heat_bp3.xml
${PROJECT_SOURCE_DIR}/examples/simulations/heatTransfer/heat_bp5.xml
WriteBPFileMx1.bp 2 2 10 10 10 10
)
set_tests_properties(HeatTransfer.BP3.Mx1.Write PROPERTIES PROCESSORS 4)
set_tests_properties(HeatTransfer.BP5.Mx1.Write PROPERTIES PROCESSORS 4)

add_test(NAME HeatTransfer.BP3.Mx1.Read
add_test(NAME HeatTransfer.BP5.Mx1.Read
COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_EXTRA_FLAGS}
${MPIEXEC_NUMPROC_FLAG} 1
$<TARGET_FILE:adios2_simulations_heatTransferRead>
${PROJECT_SOURCE_DIR}/examples/simulations/heatTransfer/heat_bp3.xml
${PROJECT_SOURCE_DIR}/examples/simulations/heatTransfer/heat_bp5.xml
WriteBPFileMx1.bp ReadBPFileMx1.bp 1 1
)

add_test(NAME HeatTransfer.BP3.Mx1.Dump
add_test(NAME HeatTransfer.BP5.Mx1.Dump
COMMAND ${CMAKE_COMMAND}
-DARG1=-d
-DINPUT_FILE=ReadBPFileMx1.bp
-DOUTPUT_FILE=DumpBPFileMx1.txt
-P "${PROJECT_BINARY_DIR}/$<CONFIG>/bpls.cmake"
)

add_test(NAME HeatTransfer.BP3.Mx1.Validate
add_test(NAME HeatTransfer.BP5.Mx1.Validate
COMMAND ${DIFF_COMMAND} -u -w
${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
DumpBPFileMx1.txt
)

SetupTestPipeline(HeatTransfer.BP3.Mx1 "Write;Read;Dump;Validate" TRUE)
SetupTestPipeline(HeatTransfer.BP5.Mx1 "Write;Read;Dump;Validate" TRUE)

#############################################################################

Expand Down
16 changes: 8 additions & 8 deletions testing/examples/heatTransfer/TestBPFileMx1_zfp.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,32 @@

include(ADIOSFunctions)

add_test(NAME HeatTransfer.BP3.zfp.Mx1.Write
add_test(NAME HeatTransfer.BP5.zfp.Mx1.Write
COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_EXTRA_FLAGS}
${MPIEXEC_NUMPROC_FLAG} 4
$<TARGET_FILE:adios2_simulations_heatTransferWrite>
${PROJECT_SOURCE_DIR}/examples/simulations/heatTransfer/heat_bp3_zfp.xml
${PROJECT_SOURCE_DIR}/examples/simulations/heatTransfer/heat_bp5_zfp.xml
WriteBPFileMx1_zfp.bp 2 2 10 10 10 10
)
set_tests_properties(HeatTransfer.BP3.zfp.Mx1.Write PROPERTIES PROCESSORS 4)
set_tests_properties(HeatTransfer.BP5.zfp.Mx1.Write PROPERTIES PROCESSORS 4)

add_test(NAME HeatTransfer.BP3.zfp.Mx1.Read
add_test(NAME HeatTransfer.BP5.zfp.Mx1.Read
COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_EXTRA_FLAGS}
${MPIEXEC_NUMPROC_FLAG} 1
$<TARGET_FILE:adios2_simulations_heatTransferRead>
${PROJECT_SOURCE_DIR}/examples/simulations/heatTransfer/heat_bp3.xml
${PROJECT_SOURCE_DIR}/examples/simulations/heatTransfer/heat_bp5.xml
WriteBPFileMx1_zfp.bp ReadBPFileMx1_zfp.bp 1 1
)

add_test(NAME HeatTransfer.BP3.zfp.Mx1.Dump
add_test(NAME HeatTransfer.BP5.zfp.Mx1.Dump
COMMAND ${CMAKE_COMMAND}
-DARG1=-d
-DINPUT_FILE=ReadBPFileMx1_zfp.bp
-DOUTPUT_FILE=DumpBPFileMx1_zfp.txt
-P "${PROJECT_BINARY_DIR}/$<CONFIG>/bpls.cmake"
)

SetupTestPipeline(HeatTransfer.BP3.zfp.Mx1 "Write;Read;Dump" TRUE)
SetupTestPipeline(HeatTransfer.BP5.zfp.Mx1 "Write;Read;Dump" TRUE)

#############################################################################
add_test(NAME HeatTransfer.BP4.zfp.Mx1.Write
Expand All @@ -40,7 +40,7 @@ add_test(NAME HeatTransfer.BP4.zfp.Mx1.Write
${PROJECT_SOURCE_DIR}/examples/simulations/heatTransfer/heat_bp4_zfp.xml
WriteBPFile4Mx1_zfp.bp 2 2 10 10 10 10
)
set_tests_properties(HeatTransfer.BP3.zfp.Mx1.Write PROPERTIES PROCESSORS 4)
set_tests_properties(HeatTransfer.BP5.zfp.Mx1.Write PROPERTIES PROCESSORS 4)

add_test(NAME HeatTransfer.BP4.zfp.Mx1.Read
COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_EXTRA_FLAGS}
Expand Down
18 changes: 9 additions & 9 deletions testing/examples/heatTransfer/TestBPFileMxM.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,39 +6,39 @@
# SetupTestPipeline
include(ADIOSFunctions)

add_test(NAME HeatTransfer.BP3.MxM.Write
add_test(NAME HeatTransfer.BP5.MxM.Write
COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_EXTRA_FLAGS}
${MPIEXEC_NUMPROC_FLAG} 4
$<TARGET_FILE:adios2_simulations_heatTransferWrite>
${PROJECT_SOURCE_DIR}/examples/simulations/heatTransfer/heat_bp3.xml
${PROJECT_SOURCE_DIR}/examples/simulations/heatTransfer/heat_bp5.xml
WriteBPFileMxM.bp 2 2 10 10 10 10
)
set_tests_properties(HeatTransfer.BP3.MxM.Write PROPERTIES PROCESSORS 4)
set_tests_properties(HeatTransfer.BP5.MxM.Write PROPERTIES PROCESSORS 4)

add_test(NAME HeatTransfer.BP3.MxM.Read
add_test(NAME HeatTransfer.BP5.MxM.Read
COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_EXTRA_FLAGS}
${MPIEXEC_NUMPROC_FLAG} 4
$<TARGET_FILE:adios2_simulations_heatTransferRead>
${PROJECT_SOURCE_DIR}/examples/simulations/heatTransfer/heat_bp3.xml
${PROJECT_SOURCE_DIR}/examples/simulations/heatTransfer/heat_bp5.xml
WriteBPFileMxM.bp ReadBPFileMxM.bp 2 2
)
set_tests_properties(HeatTransfer.BP3.MxM.Read PROPERTIES PROCESSORS 4)
set_tests_properties(HeatTransfer.BP5.MxM.Read PROPERTIES PROCESSORS 4)

add_test(NAME HeatTransfer.BP3.MxM.Dump
add_test(NAME HeatTransfer.BP5.MxM.Dump
COMMAND ${CMAKE_COMMAND}
-DARG1=-d
-DINPUT_FILE=ReadBPFileMxM.bp
-DOUTPUT_FILE=DumpBPFileMxM.txt
-P "${PROJECT_BINARY_DIR}/$<CONFIG>/bpls.cmake"
)

add_test(NAME HeatTransfer.BP3.MxM.Validate
add_test(NAME HeatTransfer.BP5.MxM.Validate
COMMAND ${DIFF_COMMAND} -u -w
${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
DumpBPFileMxM.txt
)

SetupTestPipeline(HeatTransfer.BP3.MxM "Write;Read;Dump;Validate" True)
SetupTestPipeline(HeatTransfer.BP5.MxM "Write;Read;Dump;Validate" True)

#####################################################################
add_test(NAME HeatTransfer.BP4.MxM.Write
Expand Down
18 changes: 9 additions & 9 deletions testing/examples/heatTransfer/TestBPFileMxN.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,39 +6,39 @@
# SetupTestPipeline
include(ADIOSFunctions)

add_test(NAME HeatTransfer.BP3.MxN.Write
add_test(NAME HeatTransfer.BP5.MxN.Write
COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_EXTRA_FLAGS}
${MPIEXEC_NUMPROC_FLAG} 4
$<TARGET_FILE:adios2_simulations_heatTransferWrite>
${PROJECT_SOURCE_DIR}/examples/simulations/heatTransfer/heat_bp3.xml
${PROJECT_SOURCE_DIR}/examples/simulations/heatTransfer/heat_bp5.xml
WriteBPFileMxN.bp 2 2 10 10 10 10
)
set_tests_properties(HeatTransfer.BP3.MxN.Write PROPERTIES PROCESSORS 4)
set_tests_properties(HeatTransfer.BP5.MxN.Write PROPERTIES PROCESSORS 4)

add_test(NAME HeatTransfer.BP3.MxN.Read
add_test(NAME HeatTransfer.BP5.MxN.Read
COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_EXTRA_FLAGS}
${MPIEXEC_NUMPROC_FLAG} 3
$<TARGET_FILE:adios2_simulations_heatTransferRead>
${PROJECT_SOURCE_DIR}/examples/simulations/heatTransfer/heat_bp3.xml
${PROJECT_SOURCE_DIR}/examples/simulations/heatTransfer/heat_bp5.xml
WriteBPFileMxN.bp ReadBPFileMxN.bp 1 3
)
set_tests_properties(HeatTransfer.BP3.MxN.Read PROPERTIES PROCESSORS 3)
set_tests_properties(HeatTransfer.BP5.MxN.Read PROPERTIES PROCESSORS 3)

add_test(NAME HeatTransfer.BP3.MxN.Dump
add_test(NAME HeatTransfer.BP5.MxN.Dump
COMMAND ${CMAKE_COMMAND}
-DARG1=-d
-DINPUT_FILE=ReadBPFileMxN.bp
-DOUTPUT_FILE=DumpBPFileMxN.txt
-P "${PROJECT_BINARY_DIR}/$<CONFIG>/bpls.cmake"
)

add_test(NAME HeatTransfer.BP3.MxN.Validate
add_test(NAME HeatTransfer.BP5.MxN.Validate
COMMAND ${DIFF_COMMAND} -u -w
${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
DumpBPFileMxN.txt
)

SetupTestPipeline(HeatTransfer.BP3.MxN "Write;Read;Dump;Validate" True)
SetupTestPipeline(HeatTransfer.BP5.MxN "Write;Read;Dump;Validate" True)

#####################################################################
add_test(NAME HeatTransfer.BP4.MxN.Write
Expand Down
Loading