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

DIAGNOSTIC: Turn on SstVerbose for simple tests #2252

Closed
wants to merge 3 commits into from
Closed

DIAGNOSTIC: Turn on SstVerbose for simple tests #2252

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
b4be20b
No reruns, SST diagnostics added
eisenhauer May 18, 2020
4907f4b
remove mutex_debug in the hopes of getting heisen failures again
eisenhauer May 18, 2020
7a8b069
Re-add LockGeometry test for SST
eisenhauer May 19, 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
16 changes: 16 additions & 0 deletions source/adios2/toolkit/sst/dp/evpath_dp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,11 @@ static void EvpathPreloadHandler(CManager cm, CMConnection conn, void *msg_v,
}
Requests = Next;
}
Svcs->verbose(RS_Stream->CP_Stream,
"Done processing preload message from writer rank %d for "
"timestep %ld\n",
PreloadMsg->WriterRank, PreloadMsg->Timestep);

pthread_mutex_unlock(&RS_Stream->DataLock);
return;
}
Expand Down Expand Up @@ -912,6 +917,11 @@ static void *EvpathReadRemoteMemory(CP_Services Svcs, DP_RS_Stream Stream_v,
int HadPreload;
static long LastRequestedTimestep = -1;

Svcs->verbose(Stream->CP_Stream,
"EVPATH read request Timestep %d from Rank %d, WSR_Stream = "
"%p, DP_TimestepInfo %p\n",
Timestep, Rank, Stream->WriterContactInfo[Rank].WS_Stream,
DP_TimestepInfo);
pthread_mutex_lock(&Stream->DataLock);
if ((LastRequestedTimestep != -1) && (LastRequestedTimestep != Timestep))
{
Expand All @@ -936,6 +946,8 @@ static void *EvpathReadRemoteMemory(CP_Services Svcs, DP_RS_Stream Stream_v,
ret->CMcondition = -1;
Stream->ReadRequestsFromPreload++;
pthread_mutex_unlock(&Stream->DataLock);
Svcs->verbose(Stream->CP_Stream, "EVPATH satisfied with preload\n");

return ret;
}

Expand Down Expand Up @@ -1173,6 +1185,10 @@ static void SendPreloadMsgs(CP_Services Svcs, Evpath_WSR_Stream WSR_Stream,
if (WSR_Stream->ReaderRequestArray[i])
{
PreloadMsg.RS_Stream = WSR_Stream->ReaderContactInfo[i].RS_Stream;
Svcs->verbose(
WS_Stream->CP_Stream,
"EVPATH Preload message for timestep %ld, going to rank %d\n",
TS->Timestep);
CMwrite(WSR_Stream->ReaderContactInfo[i].Conn,
WS_Stream->PreloadFormat, &PreloadMsg);
}
Expand Down
5 changes: 1 addition & 4 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 @@ -91,7 +91,7 @@ if(ADIOS2_HAVE_MPI AND MPIEXEC_EXECUTABLE)
endforeach()
endif()

set (SIMPLE_TESTS "1x1;NoReaderNoWait;TimeoutOnOpen;1x1.NoData;1x1.Modes;1x1.Attrs;1x1.Local;1x1.SharedNothing;1x1.SharedIO;1x1.SharedVar;1x1.SharedNothingSync;1x1.SharedIOSync;1x1.SharedVarSync")
set (SIMPLE_TESTS "1x1;NoReaderNoWait;TimeoutOnOpen;1x1.NoData;1x1.Modes;1x1.Attrs;1x1.Local;1x1.SharedNothing;1x1.SharedIO;1x1.SharedVar;1x1.SharedNothingSync;1x1.SharedIOSync;1x1.SharedVarSync;1x1LockGeometry")

set (SIMPLE_FORTRAN_TESTS "")
if(ADIOS2_HAVE_Fortran)
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
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")
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
3 changes: 1 addition & 2 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,7 @@ 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"
my_env["SstVerbose"] = "1"

print("TestDriver: Doing simple with file_test = " + str(file_test))
sys.stdout.flush()
Expand Down