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

See if this fixes the gcc decripency

tests were using 4.8 not 7+
parent 8600ebbc
Branches
Tags 3.13.1
No related merge requests found
...@@ -22,7 +22,7 @@ build-intel: ...@@ -22,7 +22,7 @@ build-intel:
build-gnu: build-gnu:
stage: build stage: build
script: script:
- module load gcc/8 impi mkl cmake anaconda/3/2019.03 mpi4py git - module load gcc impi mkl cmake anaconda/3/2019.03 mpi4py git
- mkdir build_gcc/ - mkdir build_gcc/
- cd build_gcc/ - cd build_gcc/
- conda create -p sisso/ python=3.7 mkl numpy scipy pandas pytest - conda create -p sisso/ python=3.7 mkl numpy scipy pandas pytest
......
...@@ -297,7 +297,7 @@ if(USE_PARAMS) ...@@ -297,7 +297,7 @@ if(USE_PARAMS)
PREFIX "external/eigen" PREFIX "external/eigen"
GIT_REPOSITORY "https://gitlab.com/libeigen/eigen.git" GIT_REPOSITORY "https://gitlab.com/libeigen/eigen.git"
GIT_TAG "3.3" GIT_TAG "3.3"
CMAKE_ARGS "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER};-DCMAKE_INSTALL_PREFIX=${EIGEN_INSTALL_DIR};-DINCLUDE_INSTALL_DIR=${EIGEN_INCLUDE_DIRS};" CMAKE_ARGS "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER};-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER};-DCMAKE_INSTALL_PREFIX=${EIGEN_INSTALL_DIR};-DINCLUDE_INSTALL_DIR=${EIGEN_INCLUDE_DIRS};"
BINARY_DIR "${EIGEN_BUILD_DIR}" BINARY_DIR "${EIGEN_BUILD_DIR}"
INSTALL_DIR "${EIGEN_INSTALL_DIR}" INSTALL_DIR "${EIGEN_INSTALL_DIR}"
) )
...@@ -317,7 +317,7 @@ if(USE_PARAMS) ...@@ -317,7 +317,7 @@ if(USE_PARAMS)
PREFIX "external/glog" PREFIX "external/glog"
GIT_REPOSITORY "https://github.com/google/glog.git" GIT_REPOSITORY "https://github.com/google/glog.git"
GIT_TAG "v0.4.0" GIT_TAG "v0.4.0"
CMAKE_ARGS "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER};-DWITH_GFLAGS=OFF;-DBUILD_SHARED_LIBS=ON;-DCMAKE_INSTALL_BINDIR=${GLOG_BIN_DIRS};-DCMAKE_INSTALL_INCLUDEDIR=${GLOG_INCLUDE_DIRS};-DCMAKE_INSTALL_LIBDIR=${GLOG_LIBRARY_DIRS}" CMAKE_ARGS "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER};-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER};-DWITH_GFLAGS=OFF;-DBUILD_SHARED_LIBS=ON;-DCMAKE_INSTALL_BINDIR=${GLOG_BIN_DIRS};-DCMAKE_INSTALL_INCLUDEDIR=${GLOG_INCLUDE_DIRS};-DCMAKE_INSTALL_LIBDIR=${GLOG_LIBRARY_DIRS}"
BINARY_DIR "${GLOG_BUILD_DIR}" BINARY_DIR "${GLOG_BUILD_DIR}"
INSTALL_DIR "${GLOG_INSTALL_DIR}" INSTALL_DIR "${GLOG_INSTALL_DIR}"
) )
...@@ -339,7 +339,7 @@ if(USE_PARAMS) ...@@ -339,7 +339,7 @@ if(USE_PARAMS)
PREFIX "external/ceres" PREFIX "external/ceres"
GIT_REPOSITORY "https://ceres-solver.googlesource.com/ceres-solver.git" GIT_REPOSITORY "https://ceres-solver.googlesource.com/ceres-solver.git"
GIT_TAG "1.14.0" GIT_TAG "1.14.0"
CMAKE_ARGS "-DCMAKE_INSTALL_PREFIX=${CERES_INSTALL_DIR};-DGFLAGS=OFF;-DMINIGLOG=OFF;-DBUILD_SHARED_LIBS=ON;-DSUITESPARSE=OFF;-DCXSPARSE=OFF;-DEIGENSPARSE=OFF;-DEIGEN_INCLUDE_DIR_HINTS=${EIGEN_INCLUDE_DIRS};-DGLOG_INCLUDE_DIR_HINTS=${GLOG_INCLUDE_DIRS};-DGLOG_LIBRARY_DIR_HINTS=${GLOG_LIBRARY_DIRS};-DLIB_SUFFIX=''" CMAKE_ARGS "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER};-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER};-DCMAKE_INSTALL_PREFIX=${CERES_INSTALL_DIR};-DGFLAGS=OFF;-DMINIGLOG=OFF;-DBUILD_SHARED_LIBS=ON;-DSUITESPARSE=OFF;-DCXSPARSE=OFF;-DEIGENSPARSE=OFF;-DEIGEN_INCLUDE_DIR_HINTS=${EIGEN_INCLUDE_DIRS};-DGLOG_INCLUDE_DIR_HINTS=${GLOG_INCLUDE_DIRS};-DGLOG_LIBRARY_DIR_HINTS=${GLOG_LIBRARY_DIRS};-DLIB_SUFFIX=''"
BINARY_DIR "${CERES_BUILD_DIR}" BINARY_DIR "${CERES_BUILD_DIR}"
) )
if(NOT GLOG_FOUND) if(NOT GLOG_FOUND)
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
# Basic Flags # # Basic Flags #
############### ###############
set(CMAKE_CXX_COMPILER g++ CACHE STRING "") set(CMAKE_CXX_COMPILER g++ CACHE STRING "")
set(CMAKE_CXX_COMPILER gcc CACHE STRING "")
set(CMAKE_CXX_FLAGS "-O2" CACHE STRING "") set(CMAKE_CXX_FLAGS "-O2" CACHE STRING "")
set(USE_PARAMS OFF CACHE BOOL "") set(USE_PARAMS OFF CACHE BOOL "")
set(USE_PYTHON OFF CACHE BOOL "") set(USE_PYTHON OFF CACHE BOOL "")
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
# Basic Flags # # Basic Flags #
############### ###############
set(CMAKE_CXX_COMPILER g++ CACHE STRING "") set(CMAKE_CXX_COMPILER g++ CACHE STRING "")
set(CMAKE_CXX_COMPILER gcc CACHE STRING "")
set(CMAKE_CXX_FLAGS "-O2" CACHE STRING "") set(CMAKE_CXX_FLAGS "-O2" CACHE STRING "")
set(USE_PYTHON OFF CACHE BOOL "") set(USE_PYTHON OFF CACHE BOOL "")
set(USE_PARAMS ON CACHE BOOL "") set(USE_PARAMS ON CACHE BOOL "")
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
# Basic Flags # # Basic Flags #
############### ###############
set(CMAKE_CXX_COMPILER g++ CACHE STRING "") set(CMAKE_CXX_COMPILER g++ CACHE STRING "")
set(CMAKE_CXX_COMPILER gcc 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(USE_PARAMS ON CACHE BOOL "") set(USE_PARAMS ON CACHE BOOL "")
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
# Basic Flags # # Basic Flags #
############### ###############
set(CMAKE_CXX_COMPILER g++ CACHE STRING "") set(CMAKE_CXX_COMPILER g++ CACHE STRING "")
set(CMAKE_CXX_COMPILER gcc CACHE STRING "")
set(CMAKE_CXX_FLAGS "-O2" CACHE STRING "") set(CMAKE_CXX_FLAGS "-O2" CACHE STRING "")
set(USE_PARAMS OFF CACHE BOOL "") set(USE_PARAMS OFF CACHE BOOL "")
set(USE_PYTHON ON CACHE BOOL "") set(USE_PYTHON ON CACHE BOOL "")
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
# Basic Flags # # Basic Flags #
############### ###############
set(CMAKE_CXX_COMPILER icpc CACHE STRING "") set(CMAKE_CXX_COMPILER icpc CACHE STRING "")
set(CMAKE_CXX_COMPILER icc CACHE STRING "")
set(CMAKE_CXX_FLAGS "-O3" CACHE STRING "") set(CMAKE_CXX_FLAGS "-O3" CACHE STRING "")
set(USE_PARAMS OFF CACHE BOOL "") set(USE_PARAMS OFF CACHE BOOL "")
set(USE_PYTHON OFF CACHE BOOL "") set(USE_PYTHON OFF CACHE BOOL "")
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
# Basic Flags # # Basic Flags #
############### ###############
set(CMAKE_CXX_COMPILER icpc CACHE STRING "") set(CMAKE_CXX_COMPILER icpc CACHE STRING "")
set(CMAKE_CXX_COMPILER icc CACHE STRING "")
set(CMAKE_CXX_FLAGS "-O3" CACHE STRING "") set(CMAKE_CXX_FLAGS "-O3" CACHE STRING "")
set(USE_PARAMS ON CACHE BOOL "") set(USE_PARAMS ON CACHE BOOL "")
set(USE_PYTHON OFF CACHE BOOL "") set(USE_PYTHON OFF CACHE BOOL "")
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
# Basic Flags # # Basic Flags #
############### ###############
set(CMAKE_CXX_COMPILER icpc CACHE STRING "") set(CMAKE_CXX_COMPILER icpc CACHE STRING "")
set(CMAKE_CXX_COMPILER icc CACHE STRING "")
set(CMAKE_CXX_FLAGS "-O3" CACHE STRING "") set(CMAKE_CXX_FLAGS "-O3" CACHE STRING "")
set(USE_PARAMS ON CACHE BOOL "") set(USE_PARAMS ON CACHE BOOL "")
set(USE_PYTHON ON CACHE BOOL "") set(USE_PYTHON ON CACHE BOOL "")
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
# Basic Flags # # Basic Flags #
############### ###############
set(CMAKE_CXX_COMPILER icpc CACHE STRING "") set(CMAKE_CXX_COMPILER icpc CACHE STRING "")
set(CMAKE_CXX_COMPILER icc CACHE STRING "")
set(CMAKE_CXX_FLAGS "-O3" CACHE STRING "") set(CMAKE_CXX_FLAGS "-O3" CACHE STRING "")
set(USE_PARAMS OFF CACHE BOOL "") set(USE_PARAMS OFF CACHE BOOL "")
set(USE_PYTHON ON CACHE BOOL "") set(USE_PYTHON ON CACHE BOOL "")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment