fixup! ci: openmpi use localhost

ornladios · Nov 15, 2023 · 31119d6 · 31119d6
1 parent 863d6d6
commit 31119d6
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 40 deletions.
diff --git a/scripts/ci/cmake/ci-ubuntu20.04-clang10-ompi.cmake b/scripts/ci/cmake/ci-ubuntu20.04-clang10-ompi.cmake
@@ -1,7 +1,3 @@
-include(ProcessorCount)
-ProcessorCount(NCPUS)
-math(EXPR N2CPUS "${NCPUS}*2")
-
 set(ENV{CC}  clang-10)
 set(ENV{CXX} clang++-10)
 set(ENV{FC}  gfortran-11)
@@ -37,7 +33,6 @@ CMAKE_CXX_FLAGS:STRING=-Wall
 CMAKE_Fortran_FLAGS:STRING=-Wall
 
 MPIEXEC_EXTRA_FLAGS:STRING=--allow-run-as-root --oversubscribe --mca btl_tcp_if_include lo
-MPIEXEC_MAX_NUMPROCS:STRING=${N2CPUS}
 ")
 
 set(CTEST_CMAKE_GENERATOR "Ninja")

diff --git a/scripts/ci/cmake/ci-ubuntu20.04-clang6-ompi.cmake b/scripts/ci/cmake/ci-ubuntu20.04-clang6-ompi.cmake
@@ -1,7 +1,3 @@
-include(ProcessorCount)
-ProcessorCount(NCPUS)
-math(EXPR N2CPUS "${NCPUS}*2")
-
 set(ENV{CC}  clang-6.0)
 set(ENV{CXX} clang++-6.0)
 set(ENV{FC}  gfortran-11)
@@ -38,7 +34,6 @@ CMAKE_CXX_FLAGS:STRING=-Wall
 CMAKE_Fortran_FLAGS:STRING=-Wall
 
 MPIEXEC_EXTRA_FLAGS:STRING=--allow-run-as-root --oversubscribe --mca btl_tcp_if_include lo
-MPIEXEC_MAX_NUMPROCS:STRING=${N2CPUS}
 ")
 
 # We have a dedicated build for this setup without MPI

diff --git a/scripts/ci/cmake/ci-ubuntu20.04-clang6-static-ompi.cmake b/scripts/ci/cmake/ci-ubuntu20.04-clang6-static-ompi.cmake
@@ -1,7 +1,3 @@
-include(ProcessorCount)
-ProcessorCount(NCPUS)
-math(EXPR N2CPUS "${NCPUS}*2")
-
 set(ENV{CC}  clang-6.0)
 set(ENV{CXX} clang++-6.0)
 set(ENV{FC}  gfortran-11)
@@ -39,7 +35,6 @@ CMAKE_CXX_FLAGS:STRING=-Wall
 CMAKE_Fortran_FLAGS:STRING=-Wall
 
 MPIEXEC_EXTRA_FLAGS:STRING=--allow-run-as-root --oversubscribe --mca btl_tcp_if_include lo
-MPIEXEC_MAX_NUMPROCS:STRING=${N2CPUS}
 ")
 
 set(CTEST_CMAKE_GENERATOR "Ninja")

diff --git a/scripts/ci/cmake/ci-ubuntu20.04-gcc10-ompi.cmake b/scripts/ci/cmake/ci-ubuntu20.04-gcc10-ompi.cmake
@@ -1,7 +1,3 @@
-include(ProcessorCount)
-ProcessorCount(NCPUS)
-math(EXPR N2CPUS "${NCPUS}*2")
-
 set(ENV{CC}  gcc)
 set(ENV{CXX} g++)
 set(ENV{FC}  gfortran)
@@ -37,7 +33,6 @@ CMAKE_CXX_FLAGS:STRING=-Wall
 CMAKE_Fortran_FLAGS:STRING=-Wall
 
 MPIEXEC_EXTRA_FLAGS:STRING=--allow-run-as-root --oversubscribe --mca btl_tcp_if_include lo
-MPIEXEC_MAX_NUMPROCS:STRING=${N2CPUS}
 ")
 
 # We have a dedicated build for this setup without MPI

diff --git a/scripts/ci/cmake/ci-ubuntu20.04-gcc11-ompi.cmake b/scripts/ci/cmake/ci-ubuntu20.04-gcc11-ompi.cmake
@@ -1,7 +1,3 @@
-include(ProcessorCount)
-ProcessorCount(NCPUS)
-math(EXPR N2CPUS "${NCPUS}*2")
-
 set(ENV{CC}  gcc)
 set(ENV{CXX} g++)
 set(ENV{FC}  gfortran)
@@ -37,7 +33,6 @@ CMAKE_CXX_FLAGS:STRING=-Wall
 CMAKE_Fortran_FLAGS:STRING=-Wall
 
 MPIEXEC_EXTRA_FLAGS:STRING=--allow-run-as-root --oversubscribe --mca btl_tcp_if_include lo
-MPIEXEC_MAX_NUMPROCS:STRING=${N2CPUS}
 ")
 
 set(CTEST_CMAKE_GENERATOR "Ninja")

diff --git a/scripts/ci/cmake/ci-ubuntu20.04-gcc8-ompi.cmake b/scripts/ci/cmake/ci-ubuntu20.04-gcc8-ompi.cmake
@@ -1,7 +1,3 @@
-include(ProcessorCount)
-ProcessorCount(NCPUS)
-math(EXPR N2CPUS "${NCPUS}*2")
-
 set(ENV{CC}  gcc)
 set(ENV{CXX} g++)
 set(ENV{FC}  gfortran)
@@ -37,7 +33,6 @@ CMAKE_CXX_FLAGS:STRING=-Wall
 CMAKE_Fortran_FLAGS:STRING=-Wall
 
 MPIEXEC_EXTRA_FLAGS:STRING=--allow-run-as-root --oversubscribe --mca btl_tcp_if_include lo
-MPIEXEC_MAX_NUMPROCS:STRING=${N2CPUS}
 ")
 
 set(CTEST_CMAKE_GENERATOR "Ninja")

diff --git a/scripts/ci/cmake/ci-ubuntu20.04-gcc8-static-ompi.cmake b/scripts/ci/cmake/ci-ubuntu20.04-gcc8-static-ompi.cmake
@@ -1,7 +1,3 @@
-include(ProcessorCount)
-ProcessorCount(NCPUS)
-math(EXPR N2CPUS "${NCPUS}*2")
-
 set(ENV{CC}  gcc)
 set(ENV{CXX} g++)
 set(ENV{FC}  gfortran)
@@ -39,7 +35,6 @@ CMAKE_CXX_FLAGS:STRING=-Wall
 CMAKE_Fortran_FLAGS:STRING=-Wall
 
 MPIEXEC_EXTRA_FLAGS:STRING=--allow-run-as-root --oversubscribe --mca btl_tcp_if_include lo
-MPIEXEC_MAX_NUMPROCS:STRING=${N2CPUS}
 ")
 
 set(CTEST_CMAKE_GENERATOR "Ninja")

diff --git a/scripts/ci/cmake/ci-ubuntu20.04-gcc9-ompi.cmake b/scripts/ci/cmake/ci-ubuntu20.04-gcc9-ompi.cmake
@@ -1,7 +1,3 @@
-include(ProcessorCount)
-ProcessorCount(NCPUS)
-math(EXPR N2CPUS "${NCPUS}*2")
-
 set(ENV{CC}  gcc)
 set(ENV{CXX} g++)
 set(ENV{FC}  gfortran)
@@ -37,7 +33,6 @@ CMAKE_CXX_FLAGS:STRING=-Wall
 CMAKE_Fortran_FLAGS:STRING=-Wall
 
 MPIEXEC_EXTRA_FLAGS:STRING=--allow-run-as-root --oversubscribe --mca btl_tcp_if_include lo
-MPIEXEC_MAX_NUMPROCS:STRING=${N2CPUS}
 ")
 
 set(CTEST_CMAKE_GENERATOR "Ninja")

diff --git a/scripts/ci/gh-actions/run.sh b/scripts/ci/gh-actions/run.sh
@@ -89,6 +89,9 @@ fi
 # Make sure staging tests use localhost
 export ADIOS2_IP=127.0.0.1
 
+# We already paralelize with mpi (MGARD uses omp)
+export OMP_NUM_THREADS=1
+
 # Load any additional setup scripts
 if [ -f gha/scripts/ci/setup-run/ci-${GH_YML_JOBNAME}.sh ]
 then