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

Diagnostics for LockGeometry #2299

Closed
wants to merge 3 commits into from
Closed

Diagnostics for LockGeometry #2299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f49df45
turn on Verbosity, kill some unnecessary tests and add lots of LockGe…
eisenhauer Jun 2, 2020
205c6da
Turn off test rerunning
eisenhauer Jun 2, 2020
5dfa080
Temporary verbosity additions in FFS marshalling
eisenhauer Jun 2, 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
2 changes: 1 addition & 1 deletion scripts/dashboard/adios_common.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ if(NOT dashboard_model)
endif()

if(NOT DEFINED ADIOS_TEST_REPEAT)
set(ADIOS_TEST_REPEAT 5)
set(ADIOS_TEST_REPEAT 0)
endif()

if((CMAKE_VERSION VERSION_GREATER 3.16.20191201 ) AND
Expand Down
12 changes: 11 additions & 1 deletion source/adios2/toolkit/sst/cp/ffs_marshal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -900,6 +900,8 @@ static void IssueReadRequests(SstStream Stream, FFSArrayRequest Reqs)
char tmpstr[256] = {0};
sprintf(tmpstr, "Request to rank %d, bytes", i);
TAU_SAMPLE_COUNTER(tmpstr, (double)DataSize);
CP_verbose(Stream, "remote read request to node %d, buffer %p\n", i,
Info->WriterInfo[i].RawBuffer);
Info->WriterInfo[i].ReadHandle = SstReadRemoteMemory(
Stream, i, Stream->ReaderTimestep, 0, DataSize,
Info->WriterInfo[i].RawBuffer, DP_TimestepInfo);
Expand Down Expand Up @@ -1465,6 +1467,11 @@ extern SstStatusValue SstFFSPerformGets(SstStream Stream)

if (Ret == SstSuccess)
{
for (int i = 0; i < Stream->WriterCohortSize; i++)
{
CP_verbose(Stream, "Filling read requests node %d, buffer %p\n", i,
Info->WriterInfo[i].RawBuffer);
}
FillReadRequests(Stream, Info->PendingVarRequests);
}
else
Expand Down Expand Up @@ -1778,8 +1785,11 @@ extern void FFSClearTimestepData(SstStream Stream)
struct FFSReaderMarshalBase *Info = Stream->ReaderMarshalData;
for (int i = 0; i < Stream->WriterCohortSize; i++)
{
if (Info->WriterInfo[i].RawBuffer)
if (Info->WriterInfo[i].RawBuffer) {
CP_verbose(Stream, "freeing rawbuffer node %d, buffer %p\n", i,
Info->WriterInfo[i].RawBuffer);
free(Info->WriterInfo[i].RawBuffer);
}
}
memset(Info->WriterInfo, 0,
sizeof(Info->WriterInfo[0]) * Stream->WriterCohortSize);
Expand Down
6 changes: 3 additions & 3 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 @@ -101,14 +101,14 @@ endif()
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")
# list(APPEND SPECIAL_TESTS "KillReadersSerialized.3x2;KillReaders3Max.3x6;KillWriter_2x2;KillWriterTimeout_2x2")
endif()

set (SIMPLE_MPI_TESTS "")
set (SIMPLE_MPI_FORTRAN_TESTS "")
if (ADIOS2_HAVE_MPI)
set (SIMPLE_MPI_TESTS "2x1;1x2;3x5;5x3;DelayedReader_3x5;3x5LockGeometry;2x1.Local;1x2.Local;3x5.Local;5x3.Local;1x1.LocalVarying;5x3.LocalVarying;2x1ZeroDataVar;2x1ZeroDataR64;2x2.NoData;2x2.HalfNoData;2x1.SharedNothing;2x1.SharedIO;2x1.SharedVar;2x1.SharedNothingSync;2x1.SharedIOSync;2x1.SharedVarSync;3x5EarlyExit")
list (APPEND SPECIAL_TESTS "2x1.NoPreload;2x3.ForcePreload;PreciousTimestep.3x2;PreciousTimestepDiscard.3x2")
set (SIMPLE_MPI_TESTS "2x1;1x2;3x5;5x3;DelayedReader_3x5;3x5LockGeometry;3x5LockGeometry2;3x5LockGeometry3;3x5LockGeometry4;3x5LockGeometry5;1x2LockGeometry;1x2LockGeometry2;1x2LockGeometry3;1x2LockGeometry4;1x2LockGeometry5;2x1.Local;1x2.Local;3x5.Local;5x3.Local;1x1.LocalVarying;5x3.LocalVarying;2x1ZeroDataVar;2x1ZeroDataR64;2x2.NoData;2x2.HalfNoData;2x1.SharedNothing;2x1.SharedIO;2x1.SharedVar;2x1.SharedNothingSync;2x1.SharedIOSync;2x1.SharedVarSync;3x5EarlyExit")
# list (APPEND SPECIAL_TESTS "2x1.NoPreload;2x3.ForcePreload;PreciousTimestep.3x2;PreciousTimestepDiscard.3x2")
if (ADIOS2_HAVE_Fortran)
set (SIMPLE_MPI_FORTRAN_TESTS "FtoC.3x5;CtoF.3x5;FtoF.3x5")
endif()
Expand Down
9 changes: 9 additions & 0 deletions testing/adios2/engine/staging-common/TestSupp.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,15 @@ set (2x3.ForcePreload_CMD "run_test.py.$<CONFIG> -nw 2 -nr 3 --rarg=PreloadMode=
set (1x2_CMD "run_test.py.$<CONFIG> -nw 1 -nr 2")
set (3x5_CMD "run_test.py.$<CONFIG> -nw 3 -nr 5")
set (3x5LockGeometry_CMD "run_test.py.$<CONFIG> -nw 3 -nr 5 --warg=--num_steps --warg=50 --warg=--ms_delay --warg=10 --rarg=--num_steps --rarg=50 --warg=--lock_geometry --rarg=--lock_geometry")
set (3x5LockGeometry2_CMD "run_test.py.$<CONFIG> -nw 3 -nr 5 --warg=--num_steps --warg=50 --warg=--ms_delay --warg=10 --rarg=--num_steps --rarg=50 --warg=--lock_geometry --rarg=--lock_geometry")
set (3x5LockGeometry3_CMD "run_test.py.$<CONFIG> -nw 3 -nr 5 --warg=--num_steps --warg=50 --warg=--ms_delay --warg=10 --rarg=--num_steps --rarg=50 --warg=--lock_geometry --rarg=--lock_geometry")
set (3x5LockGeometry4_CMD "run_test.py.$<CONFIG> -nw 3 -nr 5 --warg=--num_steps --warg=50 --warg=--ms_delay --warg=10 --rarg=--num_steps --rarg=50 --warg=--lock_geometry --rarg=--lock_geometry")
set (3x5LockGeometry5_CMD "run_test.py.$<CONFIG> -nw 3 -nr 5 --warg=--num_steps --warg=50 --warg=--ms_delay --warg=10 --rarg=--num_steps --rarg=50 --warg=--lock_geometry --rarg=--lock_geometry")
set (1x2LockGeometry_CMD "run_test.py.$<CONFIG> -nw 1 -nr 2 --warg=--num_steps --warg=50 --warg=--ms_delay --warg=10 --rarg=--num_steps --rarg=50 --warg=--lock_geometry --rarg=--lock_geometry")
set (1x2LockGeometry2_CMD "run_test.py.$<CONFIG> -nw 1 -nr 2 --warg=--num_steps --warg=50 --warg=--ms_delay --warg=10 --rarg=--num_steps --rarg=50 --warg=--lock_geometry --rarg=--lock_geometry")
set (1x2LockGeometry3_CMD "run_test.py.$<CONFIG> -nw 1 -nr 2 --warg=--num_steps --warg=50 --warg=--ms_delay --warg=10 --rarg=--num_steps --rarg=50 --warg=--lock_geometry --rarg=--lock_geometry")
set (1x2LockGeometry4_CMD "run_test.py.$<CONFIG> -nw 1 -nr 2 --warg=--num_steps --warg=50 --warg=--ms_delay --warg=10 --rarg=--num_steps --rarg=50 --warg=--lock_geometry --rarg=--lock_geometry")
set (1x2LockGeometry5_CMD "run_test.py.$<CONFIG> -nw 1 -nr 2 --warg=--num_steps --warg=50 --warg=--ms_delay --warg=10 --rarg=--num_steps --rarg=50 --warg=--lock_geometry --rarg=--lock_geometry")
set (1x1EarlyExit_CMD "run_test.py.$<CONFIG> -nw 1 -nr 1 --warg=--num_steps --warg=50 --rarg=--num_steps --rarg=5 --rarg=--early_exit")
set (3x5EarlyExit_CMD "run_test.py.$<CONFIG> -nw 3 -nr 5 --warg=--num_steps --warg=50 --rarg=--num_steps --rarg=5 --rarg=--early_exit")
set (3x5LockGeometry_TIMEOUT 60)
Expand Down
11 changes: 8 additions & 3 deletions testing/adios2/engine/staging-common/run_test.py.gen.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,9 @@ def do_simple_test(writer_cmd, reader_cmd, reader_delay, file_test):

return_code = 0

# if "--lock_geometry" in writer_cmd:
# my_env["SstVerbose"] = "1"
if writer_cmd is not None:
if "--lock_geometry" in writer_cmd:
my_env["SstVerbose"] = "1"

print("TestDriver: Doing simple with file_test = " + str(file_test))
sys.stdout.flush()
Expand Down Expand Up @@ -107,6 +108,10 @@ def do_simple_mpmd_test(writer_cmd, reader_cmd):

mpiexec_cmd = ['@MPIEXEC_EXECUTABLE@']

if writer_cmd is not None:
if "--lock_geometry" in writer_cmd:
my_env["SstVerbose"] = "1"

if '@MPIEXEC_EXTRA_FLAGS@':
mpiexec_cmd.extend('@MPIEXEC_EXTRA_FLAGS@'.split(';'))
print("TestDriver: Doing MPMD simple \n")
Expand Down Expand Up @@ -175,7 +180,7 @@ def do_kill_writer_test(writer_cmd, reader_cmd, interval):
def do_kill_readers_test(writer_cmd, reader_cmd, duration, interval):
return_code = 0
my_env = os.environ
# my_env["SstCPVerbose"] = "1"
# my_env["SstVerbose"] = "1"
writer = subprocess.Popen(writer_cmd, env=my_env)
start = time.time()
timeout = time.time() + duration
Expand Down