Skip to content
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

Jump to bottom

Restore LockGeometry Test, kill BP stream LocalVarying #2290

Merged
merged 2 commits into from
May 27, 2020
Merged

Restore LockGeometry Test, kill BP stream LocalVarying #2290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
668c126
Restore Lock Geometry Test for SST, add 1x1 version
eisenhauer May 25, 2020
a583415
Properly remove BP4_stream LocalVarying test
eisenhauer May 27, 2020
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
7 changes: 2 additions & 5 deletions testing/adios2/engine/staging-common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ if(ADIOS2_HAVE_Fortran)
set (SIMPLE_FORTRAN_TESTS "FtoC.1x1;CtoF.1x1;FtoF.1x1")
endif()

set (SPECIAL_TESTS "TimeoutReader.1x1;LatestReader.1x1;LatestReaderHold.1x1;DiscardWriter.1x1;1x1.NoPreload;1x1.ForcePreload")
set (SPECIAL_TESTS "TimeoutReader.1x1;LatestReader.1x1;LatestReaderHold.1x1;DiscardWriter.1x1;1x1.NoPreload;1x1.ForcePreload;1x1LockGeometry")
if (MPIEXEC_IS_BINARY)
# run_test.py can only kill readers/writers if mpiexec is not a shell script
list(APPEND SPECIAL_TESTS "KillReadersSerialized.3x2;KillReaders3Max.3x6;KillWriter_2x2;KillWriterTimeout_2x2")
Expand Down Expand Up @@ -147,9 +147,6 @@ LIST (APPEND SST_TESTS ${FFS_SST_TESTS} ${BP_SST_TESTS})
# Zero Data tests are unreliable with SST and BP marshaling
list (FILTER SST_TESTS EXCLUDE REGEX "2x1ZeroData.*BP")

# Temporarily exclude SST LockGeometry tests
list (FILTER SST_TESTS EXCLUDE REGEX "LockGeometry")

foreach(test ${SST_TESTS})
add_common_test(${test} SST)
endforeach()
Expand Down Expand Up @@ -246,7 +243,7 @@ if(NOT MSVC) # not on windows
# Fortran scalar reads don't work for BP4 streaming
list (FILTER BP4_STREAM_TESTS EXCLUDE REGEX "(FtoF|CtoF).*")
# Local Vars have a heisen failure for BP4 streaming
list (FILTER BP4_STREAM_TESTS EXCLUDE REGEX ".*LocalVarying$")
list (FILTER BP4_STREAM_TESTS EXCLUDE REGEX ".*LocalVarying.BPS$")
# The nobody-writes-data-in-a-timestep tests don't work for any BP file engine
list (FILTER BP4_STREAM_TESTS EXCLUDE REGEX ".*NoData.BPS$")

Expand Down
2 changes: 1 addition & 1 deletion testing/adios2/engine/staging-common/TestSupp.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ set (2x2.NoData_CMD "run_test.py.$<CONFIG> -nw 2 -nr 2 --warg=--no_data --rarg=-
set (2x2.HalfNoData_CMD "run_test.py.$<CONFIG> -nw 2 -nr 2 --warg=--no_data --warg=--no_data_node --warg=1 --rarg=--no_data --rarg=--no_data_node --rarg=1" )
set (1x1.ForcePreload_CMD "run_test.py.$<CONFIG> -nw 1 -nr 1 --rarg=PreloadMode=SstPreloadOn,RENGINE_PARAMS")
set (1x1Bulk_CMD "run_test.py.$<CONFIG> -nw 1 -nr 1 --warg=--nx --warg=10000 --warg=--num_steps --warg=101 --rarg=--num_steps --rarg=101")
set (1x1BulkLockGeometry_CMD "run_test.py.$<CONFIG> -nw 1 -nr 1 --warg=--num_steps --warg=101 --warg=--nx --warg=10000 --rarg=--num_steps --rarg=101 --warg=--lock_geometry --rarg=--lock_geometry")
set (1x1LockGeometry_CMD "run_test.py.$<CONFIG> -nw 1 -nr 1 --warg=--num_steps --warg=101 --warg=--nx --warg=50 --rarg=--num_steps --rarg=101 --warg=--lock_geometry --rarg=--lock_geometry --rarg=PreloadMode=SstPreloadNone,RENGINE_PARAMS")
set (2x1_CMD "run_test.py.$<CONFIG> -nw 2 -nr 1")
set (2x1ZeroDataVar_CMD "run_test.py.$<CONFIG> -nw 2 -nr 1 --warg=--zero_data_var")
set (2x1ZeroDataR64_CMD "run_test.py.$<CONFIG> -nw 2 -nr 1 -r $<TARGET_FILE:TestCommonReadR64> --warg=--zero_data_var")
Expand Down