From 7386d3fb08debd9e9b5aa320c6a4c1d9026d8d54 Mon Sep 17 00:00:00 2001
From: Thomas Purcell <purcell@fhi-berlin.mpg.de>
Date: Wed, 22 Jul 2020 15:27:32 +0200
Subject: [PATCH] Update Cmake
See if pytests will actually work
---
.gitlab-ci.yml | 14 ++++++--------
cmake/toolchains/gnu_py.cmake | 2 +-
src/CMakeLists.txt | 3 ++-
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1947eec9..92f69faf 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 b2f9f9da..beb5f154 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 02d4f0bf..e63ca18a 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)
--
GitLab