From bd10480ae4b83a54b71e31622042ea23d988fbfc Mon Sep 17 00:00:00 2001
From: Thomas <purcell@fhi-berlin.mpg.de>
Date: Mon, 4 Jan 2021 14:15:57 +0100
Subject: [PATCH] See if new locations fixes artifact issues
---
.gitlab-ci.yml | 116 ++++++++++++++++----------------
CMakeLists.txt | 5 +-
cmake/boost/boost_configure.sh | 4 +-
cmake/coin-Clp/clp_configure.sh | 2 +-
4 files changed, 63 insertions(+), 64 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 92eb932f..e3f18eab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,35 +28,35 @@ build-intel:
when: always
paths:
- bin/sisso++
- - build_intel/external/boost/lib/libboost_filesystem.so
- - build_intel/external/boost/lib/libboost_mpi_python.so
- - build_intel/external/boost/lib/libboost_mpi.so
- - build_intel/external/boost/lib/libboost_numpy37.so
- - build_intel/external/boost/lib/libboost_python37.so
- - build_intel/external/boost/lib/libboost_serialization.so
- - build_intel/external/boost/lib/libboost_system.so
- - build_intel/external/boost/lib/libboost_wserialization.so
- - build_intel/external/boost/lib/libboost_filesystem.so.1.68.0
- - build_intel/external/boost/lib/libboost_mpi_python.so.1.68.0
- - build_intel/external/boost/lib/libboost_mpi.so.1.68.0
- - build_intel/external/boost/lib/libboost_numpy37.so.1.68.0
- - build_intel/external/boost/lib/libboost_python37.so.1.68.0
- - build_intel/external/boost/lib/libboost_serialization.so.1.68.0
- - build_intel/external/boost/lib/libboost_system.so.1.68.0
- - build_intel/external/boost/lib/libboost_wserialization.so.1.68.0
- - build_intel/external/boost/lib/mpi.so
- - build_intel/external/coin-Clp/bin/lib/libClp.so
- - build_intel/external/coin-Clp/bin/lib/libClpSolver.so
- - build_intel/external/coin-Clp/bin/lib/libCoinUtils.so
- - build_intel/external/coin-Clp/bin/lib/libOsiClp.so
- - build_intel/external/coin-Clp/bin/lib/libOsiCommonTests.so
- - build_intel/external/coin-Clp/bin/lib/libOsi.so
- - build_intel/external/coin-Clp/bin/lib/libClp.so.1
- - build_intel/external/coin-Clp/bin/lib/libClpSolver.so.1
- - build_intel/external/coin-Clp/bin/lib/libCoinUtils.so.1
- - build_intel/external/coin-Clp/bin/lib/libOsiClp.so.1
- - build_intel/external/coin-Clp/bin/lib/libOsiCommonTests.so.1
- - build_intel/external/coin-Clp/bin/lib/libOsi.so.1
+ - lib/boost/libboost_filesystem.so
+ - lib/boost/libboost_mpi_python.so
+ - lib/boost/libboost_mpi.so
+ - lib/boost/libboost_numpy37.so
+ - lib/boost/libboost_python37.so
+ - lib/boost/libboost_serialization.so
+ - lib/boost/libboost_system.so
+ - lib/boost/libboost_wserialization.so
+ - lib/boost/libboost_filesystem.so.1.68.0
+ - lib/boost/libboost_mpi_python.so.1.68.0
+ - lib/boost/libboost_mpi.so.1.68.0
+ - lib/boost/libboost_numpy37.so.1.68.0
+ - lib/boost/libboost_python37.so.1.68.0
+ - lib/boost/libboost_serialization.so.1.68.0
+ - lib/boost/libboost_system.so.1.68.0
+ - lib/boost/libboost_wserialization.so.1.68.0
+ - lib/boost/mpi.so
+ - lib/coin-or/libClp.so
+ - lib/coin-or/libClpSolver.so
+ - lib/coin-or/libCoinUtils.so
+ - lib/coin-or/libOsiClp.so
+ - lib/coin-or/libOsiCommonTests.so
+ - lib/coin-or/libOsi.so
+ - lib/coin-or/libClp.so.1
+ - lib/coin-or/libClpSolver.so.1
+ - lib/coin-or/libCoinUtils.so.1
+ - lib/coin-or/libOsiClp.so.1
+ - lib/coin-or/libOsiCommonTests.so.1
+ - lib/coin-or/libOsi.so.1
expire_in: 1 days
test-intel-py:
@@ -96,35 +96,35 @@ build-gnu:
when: always
paths:
- bin/sisso++
- - build_gcc/external/boost/lib/libboost_filesystem.so
- - build_gcc/external/boost/lib/libboost_numpy37.so
- - build_gcc/external/boost/lib/libboost_system.so
- - build_gcc/external/boost/lib/libboost_filesystem.so.1.68.0
- - build_gcc/external/boost/lib/libboost_numpy37.so.1.68.0
- - build_gcc/external/boost/lib/libboost_system.so.1.68.0
- - build_gcc/external/boost/lib/libboost_mpi.so
- - build_gcc/external/boost/lib/libboost_python37.so
- - build_gcc/external/boost/lib/libboost_wserialization.so
- - build_gcc/external/boost/lib/libboost_mpi.so.1.68.0
- - build_gcc/external/boost/lib/libboost_python37.so.1.68.0
- - build_gcc/external/boost/lib/libboost_wserialization.so.1.68.0
- - build_gcc/external/boost/lib/mpi.so
- - build_gcc/external/boost/lib/libboost_mpi_python.so
- - build_gcc/external/boost/lib/libboost_serialization.so
- - build_gcc/external/boost/lib/libboost_mpi_python.so.1.68.0
- - build_gcc/external/boost/lib/libboost_serialization.so.1.68.0
- - build_gcc/external/coin-Clp/bin/lib/libClp.so
- - build_gcc/external/coin-Clp/bin/lib/libClpSolver.so
- - build_gcc/external/coin-Clp/bin/lib/libCoinUtils.so
- - build_gcc/external/coin-Clp/bin/lib/libOsiClp.so
- - build_gcc/external/coin-Clp/bin/lib/libOsiCommonTests.so
- - build_gcc/external/coin-Clp/bin/lib/libOsi.so
- - build_gcc/external/coin-Clp/bin/lib/libClp.so.1
- - build_gcc/external/coin-Clp/bin/lib/libClpSolver.so.1
- - build_gcc/external/coin-Clp/bin/lib/libCoinUtils.so.1
- - build_gcc/external/coin-Clp/bin/lib/libOsiClp.so.1
- - build_gcc/external/coin-Clp/bin/lib/libOsiCommonTests.so.1
- - build_gcc/external/coin-Clp/bin/lib/libOsi.so.1
+ - lib/boost/libboost_filesystem.so
+ - lib/boost/libboost_numpy37.so
+ - lib/boost/libboost_system.so
+ - lib/boost/libboost_filesystem.so.1.68.0
+ - lib/boost/libboost_numpy37.so.1.68.0
+ - lib/boost/libboost_system.so.1.68.0
+ - lib/boost/libboost_mpi.so
+ - lib/boost/libboost_python37.so
+ - lib/boost/libboost_wserialization.so
+ - lib/boost/libboost_mpi.so.1.68.0
+ - lib/boost/libboost_python37.so.1.68.0
+ - lib/boost/libboost_wserialization.so.1.68.0
+ - lib/boost/mpi.so
+ - lib/boost/libboost_mpi_python.so
+ - lib/boost/libboost_serialization.so
+ - lib/boost/libboost_mpi_python.so.1.68.0
+ - lib/boost/libboost_serialization.so.1.68.0
+ - lib/coin-or/libClp.so
+ - lib/coin-or/libClpSolver.so
+ - lib/coin-or/libCoinUtils.so
+ - lib/coin-or/libOsiClp.so
+ - lib/coin-or/libOsiCommonTests.so
+ - lib/coin-or/libOsi.so
+ - lib/coin-or/libClp.so.1
+ - lib/coin-or/libClpSolver.so.1
+ - lib/coin-or/libCoinUtils.so.1
+ - lib/coin-or/libOsiClp.so.1
+ - lib/coin-or/libOsiCommonTests.so.1
+ - lib/coin-or/libOsi.so.1
test-gnu-py:
stage: test
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c207bd39..a79f1caa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -153,7 +153,7 @@ else(EXTERNAL_BOOST)
set(Boost_SHA1 "18863a7cae4d58ae85eb63d400f774f60a383411")
set(Boost_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/external/boost)
set(Boost_INCLUDE_DIRS ${Boost_INSTALL_DIR}/include)
- set(Boost_LIBRARY_DIRS ${Boost_INSTALL_DIR}/lib)
+ set(Boost_LIBRARY_DIRS ${CMAKE_CURRENT_LIST_DIR}/lib)
set(ENV{BOOST_ROOT} ${Boost_INSTALL_DIR})
string(COMPARE EQUAL ${CMAKE_CXX_COMPILER_ID} "AppleClang" AP_CLANG_COMP)
@@ -296,7 +296,7 @@ get_filename_component(MPI_DIR ${MPI_LIBRARY} DIRECTORY)
set(COIN_CLP_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/external/coin-Clp/build/")
set(COIN_CLP_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/external/coin-Clp/bin/")
set(COIN_CLP_INCLUDE_DIRS "${COIN_CLP_INSTALL_DIR}/include/;${COIN_CLP_INSTALL_DIR}/include/coin")
-set(COIN_CLP_LIBRARY_DIRS "${COIN_CLP_INSTALL_DIR}/lib")
+set(COIN_CLP_LIBRARY_DIRS "${CMAKE_CURRENT_LIST_DIR}/lib")
set(COIN_CLP_BLAS_LAPACK_LIBS "-L${LAPACK_DIR}")
set(COIN_CLP_URL "https://www.coin-or.org/download/source/Clp/Clp-1.17.6.tgz")
@@ -338,4 +338,3 @@ include_directories(${COIN_CLP_INCLUDE_DIRS})
include_directories(${CMAKE_CURRENT_LIST_DIR}/src)
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/src)
-
diff --git a/cmake/boost/boost_configure.sh b/cmake/boost/boost_configure.sh
index cbbe82e3..2e1d0bf9 100644
--- a/cmake/boost/boost_configure.sh
+++ b/cmake/boost/boost_configure.sh
@@ -1,14 +1,14 @@
#! /usr/bin/bash
if [ "$#" -eq 2 ]; then
- ./bootstrap.sh --with-toolset=$2 --with-libraries=mpi,serialization,system,filesystem --prefix=$1
+ ./bootstrap.sh --with-toolset=$2 --with-libraries=mpi,serialization,system,filesystem --prefix=$1 --libdir=`pwd`"/../../../../lib/boost/"
if [ "$2" = "intel-linux" ]; then
echo "using mpi : mpiicpc ;" >> project-config.jam
else
echo "using mpi : mpicxx ;" >> project-config.jam
fi
elif [ "$#" -eq 6 ]; then
- ./bootstrap.sh --with-toolset=$2 --with-libraries=mpi,serialization,system,filesystem --prefix=$1
+ ./bootstrap.sh --with-toolset=$2 --with-libraries=mpi,serialization,system,filesystem --prefix=$1 --libdir=`pwd`"/../../../../lib/boost/"
if [ "$2" = "intel-linux" ]; then
echo "using mpi : mpiicpc ;" >> project-config.jam
else
diff --git a/cmake/coin-Clp/clp_configure.sh b/cmake/coin-Clp/clp_configure.sh
index d27c1843..a752d159 100644
--- a/cmake/coin-Clp/clp_configure.sh
+++ b/cmake/coin-Clp/clp_configure.sh
@@ -1,2 +1,2 @@
#! /usr/bin/bash
-../src/external_Clp/configure -C CXX=$3 --prefix=$1 --with-lapack-lib="$2" --with-blas-lib="$2"
\ No newline at end of file
+../src/external_Clp/configure -C CXX=$3 --prefix=$1 --with-lapack-lib="$2" --with-blas-lib="$2" --libdir=`pwd`"/../../../../lib/coin-or"
--
GitLab