Skip to content

Commit 0790002

Browse files
eisenhauereisenhauer
authored
Merge pull request #4317 from eisenhauer/Deprecated
Updating very old tests
2 parents 85c9eb0 + 41b9f02 commit 0790002

19 files changed

+96
-339
lines changed

examples/simulations/heatTransfer/heat_bp3.xml renamed to examples/simulations/heatTransfer/heat_bp5.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
====================================-->
1212

1313
<io name="writer">
14-
<engine type="BP3">
14+
<engine type="BP5">
1515

1616
<!-- for vectorized memory operations, make sure your system
1717
enables threads-->
@@ -62,7 +62,7 @@
6262
=======================================-->
6363

6464
<io name="readerInput">
65-
<engine type="BP3">
65+
<engine type="BP5">
6666

6767
<!-- for vectorized memory operations, make sure your system
6868
enables threads-->
@@ -93,7 +93,7 @@
9393
=======================================-->
9494

9595
<io name="readerOutput">
96-
<engine type="BP3">
96+
<engine type="BP5">
9797

9898
<!-- for vectorized memory operations, make sure your system
9999
enables threads-->

examples/simulations/heatTransfer/heat_bp3_zfp.xml renamed to examples/simulations/heatTransfer/heat_bp5_zfp.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</operation>
1919
</variable>
2020

21-
<engine type="BP3">
21+
<engine type="BP5">
2222

2323
<!-- for vectorized memory operations, make sure your system
2424
enables threads-->
@@ -69,7 +69,7 @@
6969
=======================================-->
7070

7171
<io name="readerInput">
72-
<engine type="BP3">
72+
<engine type="BP5">
7373

7474
<!-- for vectorized memory operations, make sure your system
7575
enables threads-->
@@ -100,7 +100,7 @@
100100
=======================================-->
101101

102102
<io name="readerOutput">
103-
<engine type="BP3">
103+
<engine type="BP5">
104104

105105
<!-- for vectorized memory operations, make sure your system
106106
enables threads-->

examples/simulations/heatTransfer/heat_sst_bp.xml renamed to examples/simulations/heatTransfer/heat_sst.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
<io name="writer">
1414
<engine type="SST">
15-
<parameter key="MarshalMethod" value="BP"/>
1615
</engine>
1716
</io>
1817

@@ -23,7 +22,6 @@
2322

2423
<io name="readerInput">
2524
<engine type="SST">
26-
<parameter key="MarshalMethod" value="BP"/>
2725
</engine>
2826
</io>
2927

‎examples/simulations/heatTransfer/heat_sst_ffs.xml‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎examples/simulations/heatTransfer/heat_sst_ffs_rdma.xml‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

examples/simulations/heatTransfer/heat_sst_bp_rdma.xml renamed to examples/simulations/heatTransfer/heat_sst_rdma.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
<io name="writer">
1414
<engine type="SST">
15-
<parameter key="MarshalMethod" value="BP"/>
1615
<!--parameter key="DataTransport" value="rdma"-->
1716
</engine>
1817
</io>
@@ -24,7 +23,6 @@
2423

2524
<io name="readerInput">
2625
<engine type="SST">
27-
<parameter key="MarshalMethod" value="BP"/>
2826
<!--parameter key="DataTransport" value="rdma"-->
2927
</engine>
3028
</io>

‎testing/examples/heatTransfer/CMakeLists.txt‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,11 @@ endif()
1717

1818
if(ADIOS2_RUN_MPI_MPMD_TESTS)
1919
if(ADIOS2_HAVE_SST)
20-
include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTBPMxM.cmake)
21-
include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTBPMxN.cmake)
22-
include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTBPMx1.cmake)
23-
include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTFFSMxM.cmake)
24-
include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTFFSMxN.cmake)
25-
include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTFFSMx1.cmake)
20+
include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTMxM.cmake)
21+
include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTMxN.cmake)
22+
include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTMx1.cmake)
2623
if(ADIOS2_SST_HAVE_LIBFABRIC)
27-
# include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTBPRDMAMxN.cmake)
28-
# include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTFFSRDMAMxN.cmake)
24+
# include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTRDMAMxN.cmake)
2925
endif()
3026
endif()
3127
if(NOT MSVC)

‎testing/examples/heatTransfer/TestBPFileMx1.cmake‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,38 +5,38 @@
55

66
include(ADIOSFunctions)
77

8-
add_test(NAME HeatTransfer.BP3.Mx1.Write
8+
add_test(NAME HeatTransfer.BP5.Mx1.Write
99
COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_EXTRA_FLAGS}
1010
${MPIEXEC_NUMPROC_FLAG} 4
1111
$<TARGET_FILE:adios2_simulations_heatTransferWrite>
12-
${PROJECT_SOURCE_DIR}/examples/simulations/heatTransfer/heat_bp3.xml
12+
${PROJECT_SOURCE_DIR}/examples/simulations/heatTransfer/heat_bp5.xml
1313
WriteBPFileMx1.bp 2 2 10 10 10 10
1414
)
15-
set_tests_properties(HeatTransfer.BP3.Mx1.Write PROPERTIES PROCESSORS 4)
15+
set_tests_properties(HeatTransfer.BP5.Mx1.Write PROPERTIES PROCESSORS 4)
1616

17-
add_test(NAME HeatTransfer.BP3.Mx1.Read
17+
add_test(NAME HeatTransfer.BP5.Mx1.Read
1818
COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_EXTRA_FLAGS}
1919
${MPIEXEC_NUMPROC_FLAG} 1
2020
$<TARGET_FILE:adios2_simulations_heatTransferRead>
21-
${PROJECT_SOURCE_DIR}/examples/simulations/heatTransfer/heat_bp3.xml
21+
${PROJECT_SOURCE_DIR}/examples/simulations/heatTransfer/heat_bp5.xml
2222
WriteBPFileMx1.bp ReadBPFileMx1.bp 1 1
2323
)
2424

25-
add_test(NAME HeatTransfer.BP3.Mx1.Dump
25+
add_test(NAME HeatTransfer.BP5.Mx1.Dump
2626
COMMAND ${CMAKE_COMMAND}
2727
-DARG1=-d
2828
-DINPUT_FILE=ReadBPFileMx1.bp
2929
-DOUTPUT_FILE=DumpBPFileMx1.txt
3030
-P "${PROJECT_BINARY_DIR}/$<CONFIG>/bpls.cmake"
3131
)
3232

33-
add_test(NAME HeatTransfer.BP3.Mx1.Validate
33+
add_test(NAME HeatTransfer.BP5.Mx1.Validate
3434
COMMAND ${DIFF_COMMAND} -u -w
3535
${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
3636
DumpBPFileMx1.txt
3737
)
3838

39-
SetupTestPipeline(HeatTransfer.BP3.Mx1 "Write;Read;Dump;Validate" TRUE)
39+
SetupTestPipeline(HeatTransfer.BP5.Mx1 "Write;Read;Dump;Validate" TRUE)
4040

4141
#############################################################################
4242

‎testing/examples/heatTransfer/TestBPFileMx1_zfp.cmake‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,32 @@
55

66
include(ADIOSFunctions)
77

8-
add_test(NAME HeatTransfer.BP3.zfp.Mx1.Write
8+
add_test(NAME HeatTransfer.BP5.zfp.Mx1.Write
99
COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_EXTRA_FLAGS}
1010
${MPIEXEC_NUMPROC_FLAG} 4
1111
$<TARGET_FILE:adios2_simulations_heatTransferWrite>
12-
${PROJECT_SOURCE_DIR}/examples/simulations/heatTransfer/heat_bp3_zfp.xml
12+
${PROJECT_SOURCE_DIR}/examples/simulations/heatTransfer/heat_bp5_zfp.xml
1313
WriteBPFileMx1_zfp.bp 2 2 10 10 10 10
1414
)
15-
set_tests_properties(HeatTransfer.BP3.zfp.Mx1.Write PROPERTIES PROCESSORS 4)
15+
set_tests_properties(HeatTransfer.BP5.zfp.Mx1.Write PROPERTIES PROCESSORS 4)
1616

17-
add_test(NAME HeatTransfer.BP3.zfp.Mx1.Read
17+
add_test(NAME HeatTransfer.BP5.zfp.Mx1.Read
1818
COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_EXTRA_FLAGS}
1919
${MPIEXEC_NUMPROC_FLAG} 1
2020
$<TARGET_FILE:adios2_simulations_heatTransferRead>
21-
${PROJECT_SOURCE_DIR}/examples/simulations/heatTransfer/heat_bp3.xml
21+
${PROJECT_SOURCE_DIR}/examples/simulations/heatTransfer/heat_bp5.xml
2222
WriteBPFileMx1_zfp.bp ReadBPFileMx1_zfp.bp 1 1
2323
)
2424

25-
add_test(NAME HeatTransfer.BP3.zfp.Mx1.Dump
25+
add_test(NAME HeatTransfer.BP5.zfp.Mx1.Dump
2626
COMMAND ${CMAKE_COMMAND}
2727
-DARG1=-d
2828
-DINPUT_FILE=ReadBPFileMx1_zfp.bp
2929
-DOUTPUT_FILE=DumpBPFileMx1_zfp.txt
3030
-P "${PROJECT_BINARY_DIR}/$<CONFIG>/bpls.cmake"
3131
)
3232

33-
SetupTestPipeline(HeatTransfer.BP3.zfp.Mx1 "Write;Read;Dump" TRUE)
33+
SetupTestPipeline(HeatTransfer.BP5.zfp.Mx1 "Write;Read;Dump" TRUE)
3434

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

4545
add_test(NAME HeatTransfer.BP4.zfp.Mx1.Read
4646
COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_EXTRA_FLAGS}

‎testing/examples/heatTransfer/TestBPFileMxM.cmake‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,39 +6,39 @@
66
# SetupTestPipeline
77
include(ADIOSFunctions)
88

9-
add_test(NAME HeatTransfer.BP3.MxM.Write
9+
add_test(NAME HeatTransfer.BP5.MxM.Write
1010
COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_EXTRA_FLAGS}
1111
${MPIEXEC_NUMPROC_FLAG} 4
1212
$<TARGET_FILE:adios2_simulations_heatTransferWrite>
13-
${PROJECT_SOURCE_DIR}/examples/simulations/heatTransfer/heat_bp3.xml
13+
${PROJECT_SOURCE_DIR}/examples/simulations/heatTransfer/heat_bp5.xml
1414
WriteBPFileMxM.bp 2 2 10 10 10 10
1515
)
16-
set_tests_properties(HeatTransfer.BP3.MxM.Write PROPERTIES PROCESSORS 4)
16+
set_tests_properties(HeatTransfer.BP5.MxM.Write PROPERTIES PROCESSORS 4)
1717

18-
add_test(NAME HeatTransfer.BP3.MxM.Read
18+
add_test(NAME HeatTransfer.BP5.MxM.Read
1919
COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_EXTRA_FLAGS}
2020
${MPIEXEC_NUMPROC_FLAG} 4
2121
$<TARGET_FILE:adios2_simulations_heatTransferRead>
22-
${PROJECT_SOURCE_DIR}/examples/simulations/heatTransfer/heat_bp3.xml
22+
${PROJECT_SOURCE_DIR}/examples/simulations/heatTransfer/heat_bp5.xml
2323
WriteBPFileMxM.bp ReadBPFileMxM.bp 2 2
2424
)
25-
set_tests_properties(HeatTransfer.BP3.MxM.Read PROPERTIES PROCESSORS 4)
25+
set_tests_properties(HeatTransfer.BP5.MxM.Read PROPERTIES PROCESSORS 4)
2626

27-
add_test(NAME HeatTransfer.BP3.MxM.Dump
27+
add_test(NAME HeatTransfer.BP5.MxM.Dump
2828
COMMAND ${CMAKE_COMMAND}
2929
-DARG1=-d
3030
-DINPUT_FILE=ReadBPFileMxM.bp
3131
-DOUTPUT_FILE=DumpBPFileMxM.txt
3232
-P "${PROJECT_BINARY_DIR}/$<CONFIG>/bpls.cmake"
3333
)
3434

35-
add_test(NAME HeatTransfer.BP3.MxM.Validate
35+
add_test(NAME HeatTransfer.BP5.MxM.Validate
3636
COMMAND ${DIFF_COMMAND} -u -w
3737
${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
3838
DumpBPFileMxM.txt
3939
)
4040

41-
SetupTestPipeline(HeatTransfer.BP3.MxM "Write;Read;Dump;Validate" True)
41+
SetupTestPipeline(HeatTransfer.BP5.MxM "Write;Read;Dump;Validate" True)
4242

4343
#####################################################################
4444
add_test(NAME HeatTransfer.BP4.MxM.Write

0 commit comments

Comments
 (0)