Skip to content

Commit 87b6cbe

Browse files
rfvanderjeffhammond
authored andcommitted
cleaning up FENIX directories via global Makefile, and fixing runfenix.in to make sure ULFM sees the whole path to mpirun
1 parent cbecef1 commit 87b6cbe

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,10 @@ clean:
260260
cd MPI1/PIC-static; $(MAKE) clean
261261
cd MPI1/AMR; $(MAKE) clean
262262
cd FENIX/Stencil; $(MAKE) clean
263+
cd FENIX/Transpose; $(MAKE) clean
264+
cd FENIX/Sparse; $(MAKE) clean
265+
cd FENIX/Synch_p2p; $(MAKE) clean
266+
cd FENIX/AMR; $(MAKE) clean
263267
cd FG_MPI/DGEMM; $(MAKE) clean
264268
cd FG_MPI/Nstream; $(MAKE) clean
265269
cd FG_MPI/Reduce; $(MAKE) clean
@@ -342,6 +346,7 @@ veryclean: clean
342346
cd MPI1/Stencil; $(MAKE) veryclean
343347
cd MPI1/AMR; $(MAKE) veryclean
344348
cd FENIX/Stencil; $(MAKE) veryclean
349+
cd FENIX/AMR; $(MAKE) veryclean
345350
cd OPENMP/Stencil; $(MAKE) veryclean
346351
cd SERIAL/Stencil; $(MAKE) veryclean
347352
cd SERIAL/AMR; $(MAKE) veryclean

scripts/small/runfenix.in

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ NUMITERS=10
44
NUMKILLS=1
55
FREQ=4
66
SEPLINE="==============================================================="
7-
MPIRUN=mpirun
7+
MPIRUN=`which mpirun`
88

9-
$MPIRUN -am ft-enable-mpi -bind-to-core -np $NUMPROCS FENIX/Stencil/stencil $NUMITERS 1000 $NUMSPARES $NUMKILLS $FREQ 0; echo $SEPLINE
10-
$MPIRUN -am ft-enable-mpi -bind-to-core -np $NUMPROCS FENIX/AMR/amr $NUMITERS 1000 100 1 20 5 1 $NUMSPARES $NUMKILLS $FREQ 0; echo $SEPLINE
11-
$MPIRUN -am ft-enable-mpi -bind-to-core -np $NUMPROCS FENIX/Transpose/transpose $NUMITERS 1000 $NUMSPARES $NUMKILLS $FREQ 0; echo $SEPLINE
12-
$MPIRUN -am ft-enable-mpi -bind-to-core -np $NUMPROCS FENIX/Synch_p2p/p2p $NUMITERS 1000 1000 $NUMSPARES $NUMKILLS $FREQ 0; echo $SEPLINE
9+
$MPIRUN -am ft-enable-mpi -bind-to-core -np $NUMPROCS FENIX/Stencil/stencil $NUMITERS 1000 $NUMSPARES $NUMKILLS $FREQ 0; echo $SEPLINE
10+
$MPIRUN -am ft-enable-mpi -bind-to-core -np $NUMPROCS FENIX/AMR/amr $NUMITERS 1000 100 1 20 5 1 $NUMSPARES $NUMKILLS $FREQ 0 HIGH_WATER; echo $SEPLINE
11+
$MPIRUN -am ft-enable-mpi -bind-to-core -np $NUMPROCS FENIX/Transpose/transpose $NUMITERS 1000 $NUMSPARES $NUMKILLS $FREQ 0; echo $SEPLINE
12+
$MPIRUN -am ft-enable-mpi -bind-to-core -np $NUMPROCS FENIX/Synch_p2p/p2p $NUMITERS 1000 1000 $NUMSPARES $NUMKILLS $FREQ 0; echo $SEPLINE

0 commit comments

Comments
 (0)