Skip to content

Commit d24cc6a

Browse files
author
Dong H. Ahn
committed
test: cleanup
Remove BG deadwoods from test programs Add misaligned header comments Refactor printing of launcher path
1 parent 5bfca23 commit d24cc6a

File tree

3 files changed

+12
-62
lines changed

3 files changed

+12
-62
lines changed

‎test/src/fe_launch_middleware.cxx‎

Lines changed: 8 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,31 @@
11
/*
2-
* $Header: $
32
*--------------------------------------------------------------------------------
4-
* Copyright (c) 2008-2010, Lawrence Livermore National Security, LLC. Produced
5-
*at
3+
* Copyright (c) 2008, Lawrence Livermore National Security, LLC. Produced at
64
* the Lawrence Livermore National Laboratory. Written by Dong H. Ahn
7-
*<[email protected]>.
8-
* LLNL-CODE-409469. All rights reserved.
5+
* <[email protected]>. LLNL-CODE-409469. All rights reserved.
96
*
107
* This file is part of LaunchMON. For details, see
118
* https://computing.llnl.gov/?set=resources&page=os_projects
129
*
1310
* Please also read LICENSE.txt -- Our Notice and GNU Lesser General Public
14-
*License.
11+
* License.
1512
*
1613
*
1714
* This program is free software; you can redistribute it and/or modify it under
18-
*the
19-
* terms of the GNU General Public License (as published by the Free Software
20-
* Foundation) version 2.1 dated February 1999.
15+
* the terms of the GNU General Public License (as published by the Free
16+
* Software Foundation) version 2.1 dated February 1999.
2117
*
2218
* This program is distributed in the hope that it will be useful, but WITHOUT
23-
*ANY
24-
* WARRANTY; without even the IMPLIED WARRANTY OF MERCHANTABILITY or
19+
* ANY WARRANTY; without even the IMPLIED WARRANTY OF MERCHANTABILITY or
2520
* FITNESS FOR A PARTICULAR PURPOSE. See the terms and conditions of the GNU
2621
* General Public License for more details.
2722
*
2823
* You should have received a copy of the GNU Lesser General Public License
29-
*along
30-
* with this program; if not, write to the Free Software Foundation, Inc., 59
31-
*Temple
24+
* along with this program; if not, write to the Free Software Foundation,
25+
* Inc., 59 Temple
3226
* Place, Suite 330, Boston, MA 02111-1307 USA
3327
*--------------------------------------------------------------------------------
3428
*
35-
*
36-
*
3729
* Update Log:
3830
* Jul 18 2018 DHA: Add IBM JSM Spectrum support
3931
* Jun 01 2012 DHA: Copied from 0.8-middleware-support branch and merged
@@ -142,17 +134,7 @@ int main(int argc, char *argv[]) {
142134
launcher_argv[4] = strdup(argv[2]);
143135
launcher_argv[5] = strdup("--exe");
144136
launcher_argv[6] = strdup(argv[1]);
145-
// manually fill the block
146-
// launcher_argv[7] = strdup("--block");
147-
// launcher_argv[8] = strdup("R00-M0-N04");
148-
// manually fill the corner
149-
// launcher_argv[9] = strdup("--corner");
150-
// launcher_argv[10] = strdup("R00-M0-N04-J07");
151-
// manually fill the shape
152-
// launcher_argv[11] = strdup("--shape");
153-
// launcher_argv[12] = strdup("1x1x1x1x1");
154137
launcher_argv[7] = NULL;
155-
fprintf(stdout, "[LMON_FE] launching the job/daemons via %s\n", mylauncher);
156138
} else if ((rmenv_str == std::string("RC_bgq_slurm"))) {
157139
launcher_argv = (char **)malloc(7 * sizeof(char *));
158140
launcher_argv[0] = strdup(mylauncher);
@@ -162,8 +144,6 @@ int main(int argc, char *argv[]) {
162144
launcher_argv[4] = strdup(argv[2]);
163145
launcher_argv[5] = strdup(argv[1]);
164146
launcher_argv[6] = NULL;
165-
fprintf(stdout, "[LMON_FE] launching the job/daemons via %s\n",
166-
"mylauncher");
167147
} else if ((rmenv_str == std::string("RC_bglrm")) ||
168148
(rmenv_str == std::string("RC_bgprm"))) {
169149
launcher_argv = (char **)malloc(8 * sizeof(char *));
@@ -175,7 +155,6 @@ int main(int argc, char *argv[]) {
175155
launcher_argv[5] = strdup("-exe");
176156
launcher_argv[6] = strdup(argv[1]);
177157
launcher_argv[7] = NULL;
178-
fprintf(stdout, "[LMON_FE] launching the job/daemons via %s\n", mylauncher);
179158
} else if (rmenv_str == std::string("RC_slurm")) {
180159
numprocs_opt = string("-n") + string(argv[2]);
181160
numnodes_opt = string("-N") + string(argv[3]);
@@ -205,15 +184,13 @@ int main(int argc, char *argv[]) {
205184
launcher_argv[5] = strdup(argv[2]);
206185
launcher_argv[6] = strdup(argv[1]);
207186
launcher_argv[7] = NULL;
208-
fprintf(stdout, "[LMON_FE] launching the job/daemons via %s\n", mylauncher);
209187
} else if (rmenv_str == std::string("RC_mpiexec_hydra")) {
210188
launcher_argv = (char **)malloc(5 * sizeof(char *));
211189
launcher_argv[0] = strdup(mylauncher);
212190
launcher_argv[1] = strdup("-n");
213191
launcher_argv[2] = strdup(argv[2]);
214192
launcher_argv[3] = strdup(argv[1]);
215193
launcher_argv[4] = NULL;
216-
fprintf(stdout, "[LMON_FE] launching the job/daemons via %s\n", mylauncher);
217194
} else if (rmenv_str == std::string("RC_ibm_spectrum")) {
218195
numprocs_opt = string("-p") + string(argv[2]);
219196
launcher_argv = (char **) malloc (4*sizeof(char*));

‎test/src/fe_launch_smoketest.cxx‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -168,18 +168,7 @@ int main(int argc, char *argv[]) {
168168
launcher_argv[4] = strdup(argv[2]);
169169
launcher_argv[5] = strdup("--exe");
170170
launcher_argv[6] = strdup(argv[1]);
171-
// manually fill the block
172-
// launcher_argv[7] = strdup("--block");
173-
// launcher_argv[8] = strdup("R00-M0-N04");
174-
// manually fill the corner
175-
// launcher_argv[9] = strdup("--corner");
176-
// launcher_argv[10] = strdup("R00-M0-N04-J07");
177-
// manually fill the shape
178-
// launcher_argv[11] = strdup("--shape");
179-
// launcher_argv[12] = strdup("1x1x1x1x1");
180-
// launcher_argv[13] = NULL;
181171
launcher_argv[7] = NULL;
182-
fprintf(stdout, "[LMON_FE] launching the job/daemons via %s\n", mylauncher);
183172
} else if ((rmenv_str == std::string("RC_bgq_slurm"))) {
184173
launcher_argv = (char **)malloc(7 * sizeof(char *));
185174
launcher_argv[0] = strdup(mylauncher);
@@ -189,8 +178,6 @@ int main(int argc, char *argv[]) {
189178
launcher_argv[4] = strdup(argv[2]);
190179
launcher_argv[5] = strdup(argv[1]);
191180
launcher_argv[6] = NULL;
192-
fprintf(stdout, "[LMON_FE] launching the job/daemons via %s\n",
193-
"mylauncher");
194181
} else if ((rmenv_str == std::string("RC_bglrm")) ||
195182
(rmenv_str == std::string("RC_bgprm"))) {
196183
launcher_argv = (char **)malloc(8 * sizeof(char *));
@@ -202,7 +189,6 @@ int main(int argc, char *argv[]) {
202189
launcher_argv[5] = strdup("-exe");
203190
launcher_argv[6] = strdup(argv[1]);
204191
launcher_argv[7] = NULL;
205-
fprintf(stdout, "[LMON_FE] launching the job/daemons via %s\n", mylauncher);
206192
} else if (rmenv_str == std::string("RC_slurm")) {
207193
numprocs_opt = string("-n") + string(argv[2]);
208194
numnodes_opt = string("-N") + string(argv[3]);
@@ -232,15 +218,13 @@ int main(int argc, char *argv[]) {
232218
launcher_argv[5] = strdup(argv[2]);
233219
launcher_argv[6] = strdup(argv[1]);
234220
launcher_argv[7] = NULL;
235-
fprintf(stdout, "[LMON_FE] launching the job/daemons via %s\n", mylauncher);
236221
} else if (rmenv_str == std::string("RC_mpiexec_hydra")) {
237222
launcher_argv = (char **)malloc(5 * sizeof(char *));
238223
launcher_argv[0] = strdup(mylauncher);
239224
launcher_argv[1] = strdup("-n");
240225
launcher_argv[2] = strdup(argv[2]);
241226
launcher_argv[3] = strdup(argv[1]);
242227
launcher_argv[4] = NULL;
243-
fprintf(stdout, "[LMON_FE] launching the job/daemons via %s\n", mylauncher);
244228
} else if (rmenv_str == std::string("RC_ibm_spectrum")) {
245229
numprocs_opt = string("-p") + string(argv[2]);
246230
launcher_argv = (char **) malloc (4*sizeof(char*));
@@ -254,6 +238,8 @@ int main(int argc, char *argv[]) {
254238
return EXIT_FAILURE;
255239
}
256240

241+
fprintf(stdout, "[LMON_FE] launching the job/daemons via %s\n", mylauncher);
242+
257243
if ((rc = LMON_fe_init(LMON_VERSION)) != LMON_OK) {
258244
fprintf(stdout, "[LMON FE] FAILED\n");
259245
return EXIT_FAILURE;

‎test/src/fe_launch_usrpayload_test.cxx‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -202,17 +202,7 @@ int main(int argc, char *argv[]) {
202202
launcher_argv[4] = strdup(argv[2]);
203203
launcher_argv[5] = strdup("--exe");
204204
launcher_argv[6] = strdup(argv[1]);
205-
// manually fill the block
206-
// launcher_argv[7] = strdup("--block");
207-
// launcher_argv[8] = strdup("R00-M0-N04");
208-
// manually fill the corner
209-
// launcher_argv[9] = strdup("--corner");
210-
// launcher_argv[10] = strdup("R00-M0-N04-J07");
211-
// manually fill the shape
212-
// launcher_argv[11] = strdup("--shape");
213-
// launcher_argv[12] = strdup("1x1x1x1x1");
214205
launcher_argv[7] = NULL;
215-
fprintf(stdout, "[LMON_FE] launching the job/daemons via %s\n", mylauncher);
216206
} else if ((rmenv_str == std::string("RC_bgq_slurm"))) {
217207
launcher_argv = (char **)malloc(7 * sizeof(char *));
218208
launcher_argv[0] = strdup(mylauncher);
@@ -222,8 +212,6 @@ int main(int argc, char *argv[]) {
222212
launcher_argv[4] = strdup(argv[2]);
223213
launcher_argv[5] = strdup(argv[1]);
224214
launcher_argv[6] = NULL;
225-
fprintf(stdout, "[LMON_FE] launching the job/daemons via %s\n",
226-
"mylauncher");
227215
} else if ((rmenv_str == std::string("RC_bglrm")) ||
228216
(rmenv_str == std::string("RC_bgprm"))) {
229217
launcher_argv = (char **)malloc(8 * sizeof(char *));
@@ -235,7 +223,6 @@ int main(int argc, char *argv[]) {
235223
launcher_argv[5] = strdup("-exe");
236224
launcher_argv[6] = strdup(argv[1]);
237225
launcher_argv[7] = NULL;
238-
fprintf(stdout, "[LMON_FE] launching the job/daemons via %s\n", mylauncher);
239226
} else if (rmenv_str == std::string("RC_slurm")) {
240227
numprocs_opt = string("-n") + string(argv[2]);
241228
numnodes_opt = string("-N") + string(argv[3]);
@@ -265,15 +252,13 @@ int main(int argc, char *argv[]) {
265252
launcher_argv[5] = strdup(argv[2]);
266253
launcher_argv[6] = strdup(argv[1]);
267254
launcher_argv[7] = NULL;
268-
fprintf(stdout, "[LMON_FE] launching the job/daemons via %s\n", mylauncher);
269255
} else if (rmenv_str == std::string("RC_mpiexec_hydra")) {
270256
launcher_argv = (char **)malloc(5 * sizeof(char *));
271257
launcher_argv[0] = strdup(mylauncher);
272258
launcher_argv[1] = strdup("-n");
273259
launcher_argv[2] = strdup(argv[2]);
274260
launcher_argv[3] = strdup(argv[1]);
275261
launcher_argv[4] = NULL;
276-
fprintf(stdout, "[LMON_FE] launching the job/daemons via %s\n", mylauncher);
277262
} else if (rmenv_str == std::string("RC_ibm_spectrum")) {
278263
numprocs_opt = string("-p") + string(argv[2]);
279264
launcher_argv = (char **) malloc (4*sizeof(char*));
@@ -283,6 +268,8 @@ int main(int argc, char *argv[]) {
283268
launcher_argv[3] = NULL;
284269
}
285270

271+
fprintf(stdout, "[LMON_FE] launching the job/daemons via %s\n", mylauncher);
272+
286273
if ((rc = LMON_fe_init(LMON_VERSION)) != LMON_OK) {
287274
fprintf(stdout, "[LMON FE] LMON_fe_init FAILED\n");
288275
return EXIT_FAILURE;

0 commit comments

Comments
 (0)