Try again
mpich doesn't support --oversubscribe Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
parent
ae5f4c5d53
commit
9ef92cc8ef
GPG Key ID:
8B7F1DA0E2C9FDBB
@ -1,5 +1,5 @@
|
||||
diff --git a/mpi/Makefile.am b/mpi/Makefile.am
|
||||
index 8e43fac..cfab245 100644
|
||||
index 8e43fac..a44100e 100644
|
||||
--- a/mpi/Makefile.am
|
||||
+++ b/mpi/Makefile.am
|
||||
@@ -50,24 +50,24 @@ CHECKOPTS = --verbose --random --maxsize=$(CHECKSIZE) -c=$(NUMCHECK) $(CHECK_PL_
|
||||
@ -7,33 +7,33 @@ index 8e43fac..cfab245 100644
|
||||
|
||||
check-local: mpi-bench$(EXEEXT)
|
||||
- perl -w $(CHECK) $(CHECKOPTS) --mpi "$(MPIRUN) -np 1 `pwd`/mpi-bench"
|
||||
+ perl -w $(CHECK) $(CHECKOPTS) --mpi "$(MPIRUN) --oversubscribe -np 1 `pwd`/mpi-bench"
|
||||
+ perl -w $(CHECK) $(CHECKOPTS) --mpi "$(MPIRUN) $(MPIARGS) -np 1 `pwd`/mpi-bench"
|
||||
@echo "--------------------------------------------------------------"
|
||||
@echo " MPI FFTW transforms passed "$(NUMCHECK)" tests, 1 CPU"
|
||||
@echo "--------------------------------------------------------------"
|
||||
- perl -w $(CHECK) $(CHECKOPTS) --mpi "$(MPIRUN) -np 2 `pwd`/mpi-bench"
|
||||
+ perl -w $(CHECK) $(CHECKOPTS) --mpi "$(MPIRUN) --oversubscribe -np 2 `pwd`/mpi-bench"
|
||||
+ perl -w $(CHECK) $(CHECKOPTS) --mpi "$(MPIRUN) $(MPIARGS) -np 2 `pwd`/mpi-bench"
|
||||
@echo "--------------------------------------------------------------"
|
||||
@echo " MPI FFTW transforms passed "$(NUMCHECK)" tests, 2 CPUs"
|
||||
@echo "--------------------------------------------------------------"
|
||||
- perl -w $(CHECK) $(CHECKOPTS) --mpi "$(MPIRUN) -np 3 `pwd`/mpi-bench"
|
||||
+ perl -w $(CHECK) $(CHECKOPTS) --mpi "$(MPIRUN) --oversubscribe -np 3 `pwd`/mpi-bench"
|
||||
+ perl -w $(CHECK) $(CHECKOPTS) --mpi "$(MPIRUN) $(MPIARGS) -np 3 `pwd`/mpi-bench"
|
||||
@echo "--------------------------------------------------------------"
|
||||
@echo " MPI FFTW transforms passed "$(NUMCHECK)" tests, 3 CPUs"
|
||||
@echo "--------------------------------------------------------------"
|
||||
- perl -w $(CHECK) $(CHECKOPTS) --mpi "$(MPIRUN) -np 4 `pwd`/mpi-bench"
|
||||
+ perl -w $(CHECK) $(CHECKOPTS) --mpi "$(MPIRUN) --oversubscribe -np 4 `pwd`/mpi-bench"
|
||||
+ perl -w $(CHECK) $(CHECKOPTS) --mpi "$(MPIRUN) $(MPIARGS) -np 4 `pwd`/mpi-bench"
|
||||
@echo "--------------------------------------------------------------"
|
||||
@echo " MPI FFTW transforms passed "$(NUMCHECK)" tests, 4 CPUs"
|
||||
@echo "--------------------------------------------------------------"
|
||||
if SMP
|
||||
- perl -w $(CHECK) $(CHECKOPTS) --mpi --nthreads=2 "$(MPIRUN) -np 3 `pwd`/mpi-bench"
|
||||
+ perl -w $(CHECK) $(CHECKOPTS) --mpi --nthreads=2 "$(MPIRUN) --oversubscribe -np 3 `pwd`/mpi-bench"
|
||||
+ perl -w $(CHECK) $(CHECKOPTS) --mpi --nthreads=2 "$(MPIRUN) $(MPIARGS) -np 3 `pwd`/mpi-bench"
|
||||
@echo "--------------------------------------------------------------"
|
||||
@echo " MPI FFTW threaded transforms passed "$(NUMCHECK)" tests!"
|
||||
@echo "--------------------------------------------------------------"
|
||||
diff --git a/mpi/Makefile.in b/mpi/Makefile.in
|
||||
index 0041d0f..4939198 100644
|
||||
index 0041d0f..9f994b3 100644
|
||||
--- a/mpi/Makefile.in
|
||||
+++ b/mpi/Makefile.in
|
||||
@@ -990,23 +990,23 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES \
|
||||
@ -41,27 +41,27 @@ index 0041d0f..4939198 100644
|
||||
|
||||
@MPI_TRUE@check-local: mpi-bench$(EXEEXT)
|
||||
-@MPI_TRUE@ perl -w $(CHECK) $(CHECKOPTS) --mpi "$(MPIRUN) -np 1 `pwd`/mpi-bench"
|
||||
+@MPI_TRUE@ perl -w $(CHECK) $(CHECKOPTS) --mpi "$(MPIRUN) --oversubscribe -np 1 `pwd`/mpi-bench"
|
||||
+@MPI_TRUE@ perl -w $(CHECK) $(CHECKOPTS) --mpi "$(MPIRUN) $(MPIARGS) -np 1 `pwd`/mpi-bench"
|
||||
@MPI_TRUE@ @echo "--------------------------------------------------------------"
|
||||
@MPI_TRUE@ @echo " MPI FFTW transforms passed "$(NUMCHECK)" tests, 1 CPU"
|
||||
@MPI_TRUE@ @echo "--------------------------------------------------------------"
|
||||
-@MPI_TRUE@ perl -w $(CHECK) $(CHECKOPTS) --mpi "$(MPIRUN) -np 2 `pwd`/mpi-bench"
|
||||
+@MPI_TRUE@ perl -w $(CHECK) $(CHECKOPTS) --mpi "$(MPIRUN) --oversubscribe -np 2 `pwd`/mpi-bench"
|
||||
+@MPI_TRUE@ perl -w $(CHECK) $(CHECKOPTS) --mpi "$(MPIRUN) $(MPIARGS) -np 2 `pwd`/mpi-bench"
|
||||
@MPI_TRUE@ @echo "--------------------------------------------------------------"
|
||||
@MPI_TRUE@ @echo " MPI FFTW transforms passed "$(NUMCHECK)" tests, 2 CPUs"
|
||||
@MPI_TRUE@ @echo "--------------------------------------------------------------"
|
||||
-@MPI_TRUE@ perl -w $(CHECK) $(CHECKOPTS) --mpi "$(MPIRUN) -np 3 `pwd`/mpi-bench"
|
||||
+@MPI_TRUE@ perl -w $(CHECK) $(CHECKOPTS) --mpi "$(MPIRUN) --oversubscribe -np 3 `pwd`/mpi-bench"
|
||||
+@MPI_TRUE@ perl -w $(CHECK) $(CHECKOPTS) --mpi "$(MPIRUN) $(MPIARGS) -np 3 `pwd`/mpi-bench"
|
||||
@MPI_TRUE@ @echo "--------------------------------------------------------------"
|
||||
@MPI_TRUE@ @echo " MPI FFTW transforms passed "$(NUMCHECK)" tests, 3 CPUs"
|
||||
@MPI_TRUE@ @echo "--------------------------------------------------------------"
|
||||
-@MPI_TRUE@ perl -w $(CHECK) $(CHECKOPTS) --mpi "$(MPIRUN) -np 4 `pwd`/mpi-bench"
|
||||
+@MPI_TRUE@ perl -w $(CHECK) $(CHECKOPTS) --mpi "$(MPIRUN) --oversubscribe -np 4 `pwd`/mpi-bench"
|
||||
+@MPI_TRUE@ perl -w $(CHECK) $(CHECKOPTS) --mpi "$(MPIRUN) $(MPIARGS) -np 4 `pwd`/mpi-bench"
|
||||
@MPI_TRUE@ @echo "--------------------------------------------------------------"
|
||||
@MPI_TRUE@ @echo " MPI FFTW transforms passed "$(NUMCHECK)" tests, 4 CPUs"
|
||||
@MPI_TRUE@ @echo "--------------------------------------------------------------"
|
||||
-@MPI_TRUE@@SMP_TRUE@ perl -w $(CHECK) $(CHECKOPTS) --mpi --nthreads=2 "$(MPIRUN) -np 3 `pwd`/mpi-bench"
|
||||
+@MPI_TRUE@@SMP_TRUE@ perl -w $(CHECK) $(CHECKOPTS) --mpi --nthreads=2 "$(MPIRUN) --oversubscribe -np 3 `pwd`/mpi-bench"
|
||||
+@MPI_TRUE@@SMP_TRUE@ perl -w $(CHECK) $(CHECKOPTS) --mpi --nthreads=2 "$(MPIRUN) $(MPIARGS) -np 3 `pwd`/mpi-bench"
|
||||
@MPI_TRUE@@SMP_TRUE@ @echo "--------------------------------------------------------------"
|
||||
@MPI_TRUE@@SMP_TRUE@ @echo " MPI FFTW threaded transforms passed "$(NUMCHECK)" tests!"
|
||||
@MPI_TRUE@@SMP_TRUE@ @echo "--------------------------------------------------------------"
|
||||
|
||||
@ -410,10 +410,15 @@ export OMPI_MCA_btl="^vader"
|
||||
%endif
|
||||
for mpi in %{mpi_list} ; do
|
||||
module load mpi/${mpi}-%{_arch}
|
||||
export MPIARGS=
|
||||
if [ "$mpi" = "openmpi" ]; then
|
||||
export MPIARGS=--oversubscribe
|
||||
fi
|
||||
for ver in single double long ; do
|
||||
export LD_LIBRARY_PATH=$bdir/$ver/.libs:$bdir/$ver/threads/.libs
|
||||
make %{?_smp_mflags} -C ${mpi}-${ver}/mpi check
|
||||
done
|
||||
unset MPIARGS
|
||||
module unload mpi/${mpi}-%{_arch}
|
||||
done
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user