Skip to content
Snippets Groups Projects
Commit 47be9ca9 authored by Thomas Purcell's avatar Thomas Purcell
Browse files

Update cmake to see if tests will work

might fail due to mpi4py
parent ff704993
No related tags found
No related merge requests found
......@@ -7,7 +7,7 @@ stages:
build-intel:
stage: build
script:
- module load intel impi mkl cmake anaconda/3/2019.03
- module load intel impi mkl cmake anaconda/3/2019.03 mpi4py
- mkdir build_intel/
- cd build_intel/
- python -m venv sisso
......@@ -17,13 +17,15 @@ build-intel:
- cmake -C ../cmake/toolchains/intel_py.cmake ../
- make
- make install
- cd ../
- pytest tests
tags:
- docker
build-gnu:
stage: build
script:
- module load gcc impi mkl cmake anaconda/3/2019.03
- module load gcc impi mkl cmake anaconda/3/2019.03 mpi4py
- mkdir build_gcc/
- cd build_gcc/
- python -m venv sisso
......@@ -33,5 +35,7 @@ build-gnu:
- cmake -C ../cmake/toolchains/gnu_py.cmake ../
- make
- make install
- cd ../
- pytest tests
tags:
- docker
......@@ -280,9 +280,12 @@ get_filename_component(LAPACK_DIR ${LAPACK_LIBRARY} DIRECTORY)
find_package(MPI REQUIRED)
include_directories(${MPI_CXX_INCLUDE_DIRS})
set(MPI_LIBRARIES, ${MPI_CXX_LIBRARIES})
list(GET MPI_CXX_LIBRARIES 0 MPI_LIBRARY)
get_filename_component(MPI_DIR ${MPI_LIBRARY} DIRECTORY)
# Set CMAKE_INSTALL_RPATH
set(CMAKE_INSTALL_RPATH ${Boost_LIBARY_DIRS};${LAPACK_DIR})
set(CMAKE_INSTALL_RPATH ${Boost_LIBARY_DIRS};${LAPACK_DIR};${PYTHON_LIBDIR};${MPI_DIR})
include_directories(${CMAKE_CURRENT_LIST_DIR}/src)
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/src)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment