From 1ec3e46523526276ce8280610f0e1583f2a17cbb Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Wed, 30 Sep 2020 15:38:29 +0200
Subject: [PATCH] Restore hiepacs image as it now includes OpenMPI 4 and Julia
---
.gitlab-ci.yml | 2 +-
.gitlab/env.sh | 10 +++++-----
tests/CMakeLists.txt | 2 +-
wrappers/fortran90/CMakeLists.txt | 2 +-
wrappers/julia/CMakeLists.txt | 2 +-
wrappers/python/CMakeLists.txt | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3c6f8358..e05637ee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
---
-image: hpclib/hiepacs-openmpi
+image: hpclib/hiepacs
stages:
- build
diff --git a/.gitlab/env.sh b/.gitlab/env.sh
index ba10ea46..83826702 100644
--- a/.gitlab/env.sh
+++ b/.gitlab/env.sh
@@ -1,6 +1,6 @@
# Add OpenMPI to the environment
-export PATH=$OPENMPI_DIR/bin:$PATH
-export LD_RUN_PATH=$OPENMPI_DIR/lib:$LD_RUN_PATH
-export LD_LIBRARY_PATH=$OPENMPI_DIR/lib:$LD_LIBRARY_PATH
-export INCLUDE_PATH=$OPENMPI_DIR/include:$INCLUDE_PATH
-export PKG_CONFIG_PATH=$OPENMPI_DIR/lib/pkgconfig:$PKG_CONFIG_PATH
+# export PATH=$OPENMPI_DIR/bin:$PATH
+# export LD_RUN_PATH=$OPENMPI_DIR/lib:$LD_RUN_PATH
+# export LD_LIBRARY_PATH=$OPENMPI_DIR/lib:$LD_LIBRARY_PATH
+# export INCLUDE_PATH=$OPENMPI_DIR/include:$INCLUDE_PATH
+# export PKG_CONFIG_PATH=$OPENMPI_DIR/lib/pkgconfig:$PKG_CONFIG_PATH
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 815e11c4..aa2a161b 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -89,7 +89,7 @@ foreach( version ${RUNTYPE} )
set( tests_short_list ${SPM_TESTS} )
endif()
if( version STREQUAL "mpi" )
- set( exe mpiexec -np 4 -host localhost:4 )
+ set( exe ${MPIEXEC_EXECUTABLE} -np 4 -host localhost:4 )
set( tests_full_list ${SPM_MPI_TESTS} )
set( tests_short_list ${SPM_MPI_TESTS} )
endif()
diff --git a/wrappers/fortran90/CMakeLists.txt b/wrappers/fortran90/CMakeLists.txt
index e960bda2..f968fa90 100644
--- a/wrappers/fortran90/CMakeLists.txt
+++ b/wrappers/fortran90/CMakeLists.txt
@@ -96,7 +96,7 @@ foreach (_file ${EXAMPLES})
set( exe "")
endif()
if( version STREQUAL "mpi" )
- set( exe mpiexec -np 4 --host localhost:4 )
+ set( exe ${MPIEXEC_EXECUTABLE} -np 4 --host localhost:4 )
endif()
add_test(${version}_fortran_${_name_we} ${exe} ./${_name_we})
diff --git a/wrappers/julia/CMakeLists.txt b/wrappers/julia/CMakeLists.txt
index 9d766200..8b9720f2 100644
--- a/wrappers/julia/CMakeLists.txt
+++ b/wrappers/julia/CMakeLists.txt
@@ -130,7 +130,7 @@ if ( Julia_ENABLE_TESTS )
if (SPM_WITH_MPI)
set( _test_name_ mpi_${_test_suffix_} )
- add_test( ${_test_name_} mpiexec -np 4 --host localhost:4 ${Julia_EXECUTABLE} ${_test_file_} )
+ add_test( ${_test_name_} ${MPIEXEC_EXECUTABLE} -np 4 --host localhost:4 ${Julia_EXECUTABLE} ${_test_file_} )
set_tests_properties( ${_test_name_}
PROPERTIES ENVIRONMENT "${Julia_ENVIRONEMENT}" )
endif()
diff --git a/wrappers/python/CMakeLists.txt b/wrappers/python/CMakeLists.txt
index 85bffef3..c5853782 100644
--- a/wrappers/python/CMakeLists.txt
+++ b/wrappers/python/CMakeLists.txt
@@ -71,7 +71,7 @@ if (Python3_Interpreter_FOUND)
if (SPM_WITH_MPI)
set( _test_name_ mpi_${_test_suffix_} )
- add_test( ${_test_name_} mpiexec -np 4 --host localhost:4 ${Python3_EXECUTABLE} ${_test_file_} )
+ add_test( ${_test_name_} ${MPIEXEC_EXECUTABLE} -np 4 --host localhost:4 ${Python3_EXECUTABLE} ${_test_file_} )
set_tests_properties( ${_test_name_}
PROPERTIES ENVIRONMENT "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}")
endif()
--
GitLab