Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cpp_sisso
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
nomad-lab
cpp_sisso
Commits
47be9ca9
Commit
47be9ca9
authored
4 years ago
by
Thomas Purcell
Browse files
Options
Downloads
Patches
Plain Diff
Update cmake to see if tests will work
might fail due to mpi4py
parent
ff704993
Branches
feature/forcing-unit-test
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+6
-2
6 additions, 2 deletions
.gitlab-ci.yml
CMakeLists.txt
+4
-1
4 additions, 1 deletion
CMakeLists.txt
with
10 additions
and
3 deletions
.gitlab-ci.yml
+
6
−
2
View file @
47be9ca9
...
...
@@ -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
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
4
−
1
View file @
47be9ca9
...
...
@@ -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
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment