diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1947eec9dac91e325c60c25db4bfc74c3e87a4ad..92f69faf49d24b3e1d9c8839cb9f6a35ca918b59 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,35 +7,33 @@ stages: build-intel: stage: build script: - - module load intel impi mkl cmake anaconda/3/2019.03 mpi4py + - module load intel impi cmake anaconda/3/2019.03 mpi4py - mkdir build_intel/ - cd build_intel/ - python -m venv sisso - source sisso/bin/activate - - pip install mpi4py mkl numpy scipy pandas pytest - - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MKLROOT/lib/intel64/ + - pip install numpy scipy pandas pytest - cmake -C ../cmake/toolchains/intel_py.cmake ../ - make - make install - cd ../ - pytest tests - tags: + tags: - docker build-gnu: stage: build script: - - module load gcc impi mkl cmake anaconda/3/2019.03 mpi4py + - module load gcc impi cmake anaconda/3/2019.03 mpi4py - mkdir build_gcc/ - cd build_gcc/ - python -m venv sisso - source sisso/bin/activate - - pip install mpi4py mkl numpy scipy pandas pytest - - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MKLROOT/lib/intel64/ + - pip install numpy scipy pandas pytest - cmake -C ../cmake/toolchains/gnu_py.cmake ../ - make - make install - cd ../ - pytest tests - tags: + tags: - docker diff --git a/cmake/toolchains/gnu_py.cmake b/cmake/toolchains/gnu_py.cmake index b2f9f9daa4725d7645e986ab0dbfa8d6f0b6b930..beb5f154b05d4ef1845a181a172a0abb03ec21fe 100644 --- a/cmake/toolchains/gnu_py.cmake +++ b/cmake/toolchains/gnu_py.cmake @@ -4,4 +4,4 @@ set(CMAKE_CXX_COMPILER g++ CACHE STRING "") set(CMAKE_CXX_FLAGS "-O2" CACHE STRING "") set(USE_PYTHON ON CACHE BOOL "") -#set(EXTERNAL_BOOST ON CACHE BOOL "") +set(EXTERNAL_BOOST OFF CACHE BOOL "") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 02d4f0bf3368a276a9d17d7de93fcfc5ad2ceeda..e63ca18a082d31d609d6fae3d5a63b06891c6abf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -35,7 +35,8 @@ install(TARGETS sisso++ DESTINATION ${CMAKE_CURRENT_LIST_DIR}/../bin/) if(USE_PYTHON) include(${CMAKE_CURRENT_LIST_DIR}/../cmake/TransferDocStrings.cmake) - set(CMAKE_INSTALL_RPATH "${Boost_LIBRARY_DIRS};${PYTHON_LIBDIR};${MPI_DIR}") + set(CMAKE_INSTALL_RPATH "${Boost_LIBRARY_DIRS};${PYTHON_PREFIX}/lib64/;${MPI_DIR}") + message(STATUS "CMAKE_INSTALL_RPATH = ${CMAKE_INSTALL_RPATH}") file(GLOB_RECURSE SISSOLIB_SOURCES *.cpp) list(REMOVE_ITEM SISSOLIB_SOURCES ${CMAKE_CURRENT_LIST_DIR}/main.cpp) list(REMOVE_ITEM SISSOLIB_SOURCES ${CMAKE_CURRENT_LIST_DIR}/python/bindings_docstring_keyed.cpp)