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

Update Cmake

See if pytests will actually work
parent b1d372d8
No related branches found
No related tags found
No related merge requests found
...@@ -7,35 +7,33 @@ stages: ...@@ -7,35 +7,33 @@ stages:
build-intel: build-intel:
stage: build stage: build
script: 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/ - mkdir build_intel/
- cd build_intel/ - cd build_intel/
- python -m venv sisso - python -m venv sisso
- source sisso/bin/activate - source sisso/bin/activate
- pip install mpi4py mkl numpy scipy pandas pytest - pip install numpy scipy pandas pytest
- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MKLROOT/lib/intel64/
- cmake -C ../cmake/toolchains/intel_py.cmake ../ - cmake -C ../cmake/toolchains/intel_py.cmake ../
- make - make
- make install - make install
- cd ../ - cd ../
- pytest tests - pytest tests
tags: tags:
- docker - docker
build-gnu: build-gnu:
stage: build stage: build
script: 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/ - mkdir build_gcc/
- cd build_gcc/ - cd build_gcc/
- python -m venv sisso - python -m venv sisso
- source sisso/bin/activate - source sisso/bin/activate
- pip install mpi4py mkl numpy scipy pandas pytest - pip install numpy scipy pandas pytest
- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MKLROOT/lib/intel64/
- cmake -C ../cmake/toolchains/gnu_py.cmake ../ - cmake -C ../cmake/toolchains/gnu_py.cmake ../
- make - make
- make install - make install
- cd ../ - cd ../
- pytest tests - pytest tests
tags: tags:
- docker - docker
...@@ -4,4 +4,4 @@ ...@@ -4,4 +4,4 @@
set(CMAKE_CXX_COMPILER g++ CACHE STRING "") set(CMAKE_CXX_COMPILER g++ CACHE STRING "")
set(CMAKE_CXX_FLAGS "-O2" CACHE STRING "") set(CMAKE_CXX_FLAGS "-O2" CACHE STRING "")
set(USE_PYTHON ON CACHE BOOL "") set(USE_PYTHON ON CACHE BOOL "")
#set(EXTERNAL_BOOST ON CACHE BOOL "") set(EXTERNAL_BOOST OFF CACHE BOOL "")
...@@ -35,7 +35,8 @@ install(TARGETS sisso++ DESTINATION ${CMAKE_CURRENT_LIST_DIR}/../bin/) ...@@ -35,7 +35,8 @@ install(TARGETS sisso++ DESTINATION ${CMAKE_CURRENT_LIST_DIR}/../bin/)
if(USE_PYTHON) if(USE_PYTHON)
include(${CMAKE_CURRENT_LIST_DIR}/../cmake/TransferDocStrings.cmake) 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) 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}/main.cpp)
list(REMOVE_ITEM SISSOLIB_SOURCES ${CMAKE_CURRENT_LIST_DIR}/python/bindings_docstring_keyed.cpp) list(REMOVE_ITEM SISSOLIB_SOURCES ${CMAKE_CURRENT_LIST_DIR}/python/bindings_docstring_keyed.cpp)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment