Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 1ec3e465 authored by Mathieu Faverge's avatar Mathieu Faverge
Browse files

Restore hiepacs image as it now includes OpenMPI 4 and Julia

parent b329bdb5
No related branches found
No related tags found
1 merge request!40Fix issue with Julia user driver
--- ---
image: hpclib/hiepacs-openmpi image: hpclib/hiepacs
stages: stages:
- build - build
......
# Add OpenMPI to the environment # Add OpenMPI to the environment
export PATH=$OPENMPI_DIR/bin:$PATH # export PATH=$OPENMPI_DIR/bin:$PATH
export LD_RUN_PATH=$OPENMPI_DIR/lib:$LD_RUN_PATH # export LD_RUN_PATH=$OPENMPI_DIR/lib:$LD_RUN_PATH
export LD_LIBRARY_PATH=$OPENMPI_DIR/lib:$LD_LIBRARY_PATH # export LD_LIBRARY_PATH=$OPENMPI_DIR/lib:$LD_LIBRARY_PATH
export INCLUDE_PATH=$OPENMPI_DIR/include:$INCLUDE_PATH # export INCLUDE_PATH=$OPENMPI_DIR/include:$INCLUDE_PATH
export PKG_CONFIG_PATH=$OPENMPI_DIR/lib/pkgconfig:$PKG_CONFIG_PATH # export PKG_CONFIG_PATH=$OPENMPI_DIR/lib/pkgconfig:$PKG_CONFIG_PATH
...@@ -89,7 +89,7 @@ foreach( version ${RUNTYPE} ) ...@@ -89,7 +89,7 @@ foreach( version ${RUNTYPE} )
set( tests_short_list ${SPM_TESTS} ) set( tests_short_list ${SPM_TESTS} )
endif() endif()
if( version STREQUAL "mpi" ) 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_full_list ${SPM_MPI_TESTS} )
set( tests_short_list ${SPM_MPI_TESTS} ) set( tests_short_list ${SPM_MPI_TESTS} )
endif() endif()
......
...@@ -96,7 +96,7 @@ foreach (_file ${EXAMPLES}) ...@@ -96,7 +96,7 @@ foreach (_file ${EXAMPLES})
set( exe "") set( exe "")
endif() endif()
if( version STREQUAL "mpi" ) if( version STREQUAL "mpi" )
set( exe mpiexec -np 4 --host localhost:4 ) set( exe ${MPIEXEC_EXECUTABLE} -np 4 --host localhost:4 )
endif() endif()
add_test(${version}_fortran_${_name_we} ${exe} ./${_name_we}) add_test(${version}_fortran_${_name_we} ${exe} ./${_name_we})
......
...@@ -130,7 +130,7 @@ if ( Julia_ENABLE_TESTS ) ...@@ -130,7 +130,7 @@ if ( Julia_ENABLE_TESTS )
if (SPM_WITH_MPI) if (SPM_WITH_MPI)
set( _test_name_ mpi_${_test_suffix_} ) 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_} set_tests_properties( ${_test_name_}
PROPERTIES ENVIRONMENT "${Julia_ENVIRONEMENT}" ) PROPERTIES ENVIRONMENT "${Julia_ENVIRONEMENT}" )
endif() endif()
......
...@@ -71,7 +71,7 @@ if (Python3_Interpreter_FOUND) ...@@ -71,7 +71,7 @@ if (Python3_Interpreter_FOUND)
if (SPM_WITH_MPI) if (SPM_WITH_MPI)
set( _test_name_ mpi_${_test_suffix_} ) 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_} set_tests_properties( ${_test_name_}
PROPERTIES ENVIRONMENT "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}") PROPERTIES ENVIRONMENT "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}")
endif() endif()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment