Skip to content

Commit 5bfca23

Browse files
author
Dong H. Ahn
committed
test: Add IBM Spectrum support into test programs
1 parent ce8b1be commit 5bfca23

15 files changed

+70
-2
lines changed

‎test/src/fe_launch_middleware.cxx‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
*
3636
*
3737
* Update Log:
38+
* Jul 18 2018 DHA: Add IBM JSM Spectrum support
3839
* Jun 01 2012 DHA: Copied from 0.8-middleware-support branch and merged
3940
* with 1.0-BGQ
4041
* Aug 03 2020 DHA: Created file.
@@ -213,6 +214,13 @@ int main(int argc, char *argv[]) {
213214
launcher_argv[3] = strdup(argv[1]);
214215
launcher_argv[4] = NULL;
215216
fprintf(stdout, "[LMON_FE] launching the job/daemons via %s\n", mylauncher);
217+
} else if (rmenv_str == std::string("RC_ibm_spectrum")) {
218+
numprocs_opt = string("-p") + string(argv[2]);
219+
launcher_argv = (char **) malloc (4*sizeof(char*));
220+
launcher_argv[0] = strdup(mylauncher);
221+
launcher_argv[1] = strdup(numprocs_opt.c_str());
222+
launcher_argv[2] = strdup(argv[1]);
223+
launcher_argv[3] = NULL;
216224
}
217225

218226
fprintf(stderr, "[LMON_FE] launching the job/daemons via %s\n", mylauncher);

‎test/src/fe_launch_smoketest.cxx‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
* ./fe_launch_smoketest.debug /bin/hostname 9 5 pdebug `pwd`/be_kicker.debug
3030
*
3131
* Update Log:
32+
* Jul 16 2018 DHA: Add IBM JSM Spectrum support.
3233
* Oct 25 2011 DHA: Added BGQ support.
3334
* Oct 21 2011 DHA: Added dynamic RM support.
3435
* Nov 12 2009 DHA: Change BG mpirun options to cover /P running under
@@ -240,6 +241,17 @@ int main(int argc, char *argv[]) {
240241
launcher_argv[3] = strdup(argv[1]);
241242
launcher_argv[4] = NULL;
242243
fprintf(stdout, "[LMON_FE] launching the job/daemons via %s\n", mylauncher);
244+
} else if (rmenv_str == std::string("RC_ibm_spectrum")) {
245+
numprocs_opt = string("-p") + string(argv[2]);
246+
launcher_argv = (char **) malloc (4*sizeof(char*));
247+
launcher_argv[0] = strdup(mylauncher);
248+
launcher_argv[1] = strdup(numprocs_opt.c_str());
249+
launcher_argv[2] = strdup(argv[1]);
250+
launcher_argv[3] = NULL;
251+
} else {
252+
fprintf(stdout, "[LMON FE] Unknown Resource Manger: %s\n",
253+
rmenv_str.c_str());
254+
return EXIT_FAILURE;
243255
}
244256

245257
if ((rc = LMON_fe_init(LMON_VERSION)) != LMON_OK) {

‎test/src/fe_launch_usrpayload_test.cxx‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
*--------------------------------------------------------------------------------
2828
*
2929
* Update Log:
30+
* Jul 16 2018 DHA: Add IBM JSM Spectrum support.
3031
* Mar 04 2008 DHA: Added generic BlueGene support
3132
* Jun 17 2008 DHA: Added BlueGene support
3233
* Jun 12 2008 DHA: Added GNU build system support
@@ -273,6 +274,13 @@ int main(int argc, char *argv[]) {
273274
launcher_argv[3] = strdup(argv[1]);
274275
launcher_argv[4] = NULL;
275276
fprintf(stdout, "[LMON_FE] launching the job/daemons via %s\n", mylauncher);
277+
} else if (rmenv_str == std::string("RC_ibm_spectrum")) {
278+
numprocs_opt = string("-p") + string(argv[2]);
279+
launcher_argv = (char **) malloc (4*sizeof(char*));
280+
launcher_argv[0] = strdup(mylauncher);
281+
launcher_argv[1] = strdup(numprocs_opt.c_str());
282+
launcher_argv[2] = strdup(argv[1]);
283+
launcher_argv[3] = NULL;
276284
}
277285

278286
if ((rc = LMON_fe_init(LMON_VERSION)) != LMON_OK) {

‎test/src/test.attach_1.in‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
# Attach the tool to a running program and unlock the hang.
3131
#
3232
# Update Log:
33+
# Jul 16 2018 DHA: Add IBM JSM support.
3334
# May 04 2016 DHA: Add test in-tree and installed support
3435
# Oct 21 2011 DHA: Added dynamic RM detection support.
3536
# Dec 17 2009 DHA: Added minimum WAITAMOUNT
@@ -84,6 +85,9 @@ elif test "x$RM_TYPE" = "xRC_orte" ; then
8485
elif test "x$RM_TYPE" = "xRC_mpiexec_hydra" ; then
8586
WAITAMOUNT=`expr $WAITAMOUNT`
8687
$MPI_JOB_LAUNCHER_PATH -n $NUMTASKS `pwd`/hang_on_SIGUSR1@EXE@ &
88+
elif test "x$RM_TYPE" = "xRC_ibm_spectrum" ; then
89+
WAITAMOUNT=`expr $WAITAMOUNT`
90+
$MPI_JOB_LAUNCHER_PATH -p $NUMTASKS `pwd`/hang_on_SIGUSR1@EXE@ &
8791
else
8892
echo "This RM is not supported yet"
8993
fi

‎test/src/test.attach_1_mem_fetcher.in‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
# Attach the tool to a running program and unlock the hang.
3131
#
3232
# Update Log:
33+
# Jul 16 2018 DHA: Add IBM JSM support.
3334
# May 04 2016 DHA: Add test in-tree and installed support
3435
# Oct 21 2011 DHA: Added dynamic RM detection support.
3536
# Dec 17 2009 DHA: Added minimum WAITAMOUNT
@@ -82,6 +83,9 @@ elif test "x$RM_TYPE" = "xRC_orte" ; then
8283
elif test "x$RM_TYPE" = "xRC_mpiexec_hydra" ; then
8384
WAITAMOUNT=`expr $WAITAMOUNT`
8485
$MPI_JOB_LAUNCHER_PATH -n $NUMTASKS `pwd`/hang_on_SIGUSR1@EXE@ &
86+
elif test "x$RM_TYPE" = "xRC_ibm_spectrum" ; then
87+
WAITAMOUNT=`expr $WAITAMOUNT`
88+
$MPI_JOB_LAUNCHER_PATH -p $NUMTASKS `pwd`/hang_on_SIGUSR1@EXE@ &
8589
else
8690
echo "This RM is not supported yet"
8791
fi

‎test/src/test.attach_1_pdebugmax.in‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
# Attach the tool to a running program and unlock the hang.
3131
#
3232
# Update Log:
33+
# Jul 16 2018 DHA: Add IBM JSM support.
3334
# May 04 2016 DHA: Add test in-tree and installed support
3435
# Oct 21 2011 DHA: Added dynamic RM detection support.
3536
# Mar 06 2009 DHA: Changed bglrm to bgrm
@@ -71,6 +72,9 @@ elif test "x$RM_TYPE" = "xRC_orte" ; then
7172
elif test "x$RM_TYPE" = "xRC_mpiexec_hydra" ; then
7273
WAITAMOUNT=`expr $WAITAMOUNT`
7374
$MPI_JOB_LAUNCHER_PATH -n $NUMTASKS `pwd`/hang_on_SIGUSR1@EXE@ &
75+
elif test "x$RM_TYPE" = "xRC_ibm_spectrum" ; then
76+
WAITAMOUNT=`expr $WAITAMOUNT`
77+
$MPI_JOB_LAUNCHER_PATH -p $NUMTASKS `pwd`/hang_on_SIGUSR1@EXE@ &
7478
else
7579
echo "This RM is not supported yet"
7680
fi

‎test/src/test.attach_1_remote.in‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
# of its associated job.
3232
#
3333
# Update Log:
34+
# Jul 16 2018 DHA: Add IBM JSM support.
3435
# May 04 2016 DHA: Add test in-tree and installed support
3536
# Oct 21 2011 DHA: Added dynamic RM detection support.
3637
# Dec 17 2009 DHA: Added minimum waittime
@@ -77,6 +78,9 @@ elif test "x$RM_TYPE" = "xRC_orte" ; then
7778
elif test "x$RM_TYPE" = "xRC_mpiexec_hydra" ; then
7879
WAITAMOUNT=`expr $WAITAMOUNT`
7980
$MPI_JOB_LAUNCHER_PATH -n $NUMTASKS `pwd`/hang_on_SIGUSR1@EXE@ &
81+
elif test "x$RM_TYPE" = "xRC_ibm_spectrum" ; then
82+
WAITAMOUNT=`expr $WAITAMOUNT`
83+
$MPI_JOB_LAUNCHER_PATH -p $NUMTASKS `pwd`/hang_on_SIGUSR1@EXE@ &
8084
else
8185
echo "This RM is not supported yet"
8286
fi

‎test/src/test.attach_2_uneven.in‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
# number of processors per node, and unlock the hang.
3232
#
3333
# Update Log:
34+
# Jul 16 2018 DHA: Add IBM JSM support.
3435
# May 04 2016 DHA: Add test in-tree and installed support
3536
# Oct 21 2011 DHA: Added dynamic RM detection support.
3637
# Mar 06 2009 DHA: Changed bglrm to bgrm
@@ -82,6 +83,9 @@ elif test "x$RM_TYPE" = "xRC_orte" ; then
8283
elif test "x$RM_TYPE" = "xRC_mpiexec_hydra" ; then
8384
WAITAMOUNT=`expr $WAITAMOUNT`
8485
$MPI_JOB_LAUNCHER_PATH -n $NUMTASKS `pwd`/hang_on_SIGUSR1@EXE@ &
86+
elif test "x$RM_TYPE" = "xRC_ibm_spectrum" ; then
87+
WAITAMOUNT=`expr $WAITAMOUNT`
88+
$MPI_JOB_LAUNCHER_PATH -p $NUMTASKS `pwd`/hang_on_SIGUSR1@EXE@ &
8589
else
8690
echo "This RM is not supported yet"
8791
fi

‎test/src/test.attach_4_detach.in‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
# and kill the BE daemons.
3232
#
3333
# Update Log:
34+
# Jul 16 2018 DHA: Add IBM JSM support.
3435
# May 04 2016 DHA: Add test in-tree and installed support
3536
# Aug 02 2012 DHA: Created file.
3637
#
@@ -75,6 +76,9 @@ elif test "x$RM_TYPE" = "xRC_orte" ; then
7576
elif test "x$RM_TYPE" = "xRC_mpiexec_hydra" ; then
7677
WAITAMOUNT=`expr $WAITAMOUNT`
7778
$MPI_JOB_LAUNCHER_PATH -n $NUMTASKS `pwd`/hang_on_SIGUSR1@EXE@ &
79+
elif test "x$RM_TYPE" = "xRC_ibm_spectrum" ; then
80+
WAITAMOUNT=`expr $WAITAMOUNT`
81+
$MPI_JOB_LAUNCHER_PATH -p $NUMTASKS `pwd`/hang_on_SIGUSR1@EXE@ &
7882
else
7983
echo "This RM is not supported yet"
8084
fi

‎test/src/test.attach_4_kill.in‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
# and kill the BE daemons.
3232
#
3333
# Update Log:
34+
# Jul 16 2018 DHA: Add IBM JSM support.
3435
# May 04 2016 DHA: Add test in-tree and installed support
3536
# Jun 05 2012 DHA: Added subtest support
3637
# Oct 21 2011 DHA: Added dynamic RM detection support.
@@ -80,6 +81,9 @@ elif test "x$RM_TYPE" = "xRC_orte" ; then
8081
elif test "x$RM_TYPE" = "xRC_mpiexec_hydra" ; then
8182
WAITAMOUNT=`expr $WAITAMOUNT`
8283
$MPI_JOB_LAUNCHER_PATH -n $NUMTASKS `pwd`/hang_on_SIGUSR1@EXE@ &
84+
elif test "x$RM_TYPE" = "xRC_ibm_spectrum" ; then
85+
WAITAMOUNT=`expr $WAITAMOUNT`
86+
$MPI_JOB_LAUNCHER_PATH -p $NUMTASKS `pwd`/hang_on_SIGUSR1@EXE@ &
8387
else
8488
echo "This RM is not supported yet"
8589
fi

0 commit comments

Comments
 (0)