From 1b2e809e801b2781d03894f0feebde785a4dce66 Mon Sep 17 00:00:00 2001 From: Brian Van Klaveren Date: Mon, 29 Jul 2019 10:50:11 -0700 Subject: [PATCH 1/4] Switch to conda-forge and pin boost, eigen, pybind11 --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f55cc76a..8bb0ed65 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,12 +22,16 @@ install: - conda update -q conda # Useful for debugging any issues with conda - conda info -a - - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION boost fftw numpy pybind11 cmake gxx_linux-64 eigen + - conda create -q -n test-environment - source activate test-environment + - conda config --env --add channels conda-forge + - conda install python=$TRAVIS_PYTHON_VERSION boost<1.70 fftw numpy pybind11=2.2.* swig cmake compilers eigen=3.2.* - export BOOST_DIR=$CONDA_PREFIX - export EIGEN_DIR=$CONDA_PREFIX - export FFTW_DIR=$CONDA_PREFIX - export CMAKE_PREFIX_PATH=$CONDA_PREFIX + # For conda-forge's old glibc + - export LDFLAGS="-lrt ${LDFLAGS}" script: - mkdir build From daa278bf1c316b98dcaf2b6429dc98b0a12314c4 Mon Sep 17 00:00:00 2001 From: Brian Van Klaveren Date: Mon, 29 Jul 2019 10:55:26 -0700 Subject: [PATCH 2/4] Make it boost 1.69 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8bb0ed65..be52d430 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ install: - conda create -q -n test-environment - source activate test-environment - conda config --env --add channels conda-forge - - conda install python=$TRAVIS_PYTHON_VERSION boost<1.70 fftw numpy pybind11=2.2.* swig cmake compilers eigen=3.2.* + - conda install python=$TRAVIS_PYTHON_VERSION boost=1.69.* fftw numpy pybind11=2.2.* swig cmake compilers eigen=3.2.* - export BOOST_DIR=$CONDA_PREFIX - export EIGEN_DIR=$CONDA_PREFIX - export FFTW_DIR=$CONDA_PREFIX From 20400f6392de11d07e14418c6e1db7ef7403ace1 Mon Sep 17 00:00:00 2001 From: Brian Van Klaveren Date: Mon, 29 Jul 2019 13:00:05 -0700 Subject: [PATCH 3/4] Add a conda list command to print out environment --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index be52d430..f70bbff8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,7 @@ install: - source activate test-environment - conda config --env --add channels conda-forge - conda install python=$TRAVIS_PYTHON_VERSION boost=1.69.* fftw numpy pybind11=2.2.* swig cmake compilers eigen=3.2.* + - conda list - export BOOST_DIR=$CONDA_PREFIX - export EIGEN_DIR=$CONDA_PREFIX - export FFTW_DIR=$CONDA_PREFIX From 8fdfbfa235595b00e0eaa8d5fc4d8d33f8bffc3d Mon Sep 17 00:00:00 2001 From: Brian Van Klaveren Date: Mon, 29 Jul 2019 16:21:27 -0700 Subject: [PATCH 4/4] Switch to new CMake form for boost --- .travis.yml | 2 +- tests/CMakeLists.txt | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index f70bbff8..1097770e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ install: - conda create -q -n test-environment - source activate test-environment - conda config --env --add channels conda-forge - - conda install python=$TRAVIS_PYTHON_VERSION boost=1.69.* fftw numpy pybind11=2.2.* swig cmake compilers eigen=3.2.* + - conda install python=$TRAVIS_PYTHON_VERSION boost=1.70.* fftw numpy pybind11=2.2.* swig cmake compilers eigen=3.2.* - conda list - export BOOST_DIR=$CONDA_PREFIX - export EIGEN_DIR=$CONDA_PREFIX diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 1f78168c..6414a953 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -8,6 +8,10 @@ # (4) Addition of the test executable via add_test. ### Core tests, which rely only on boost-test and ndarray. +set(Boost_NO_BOOST_CMAKE OFF) +set(Boost_USE_STATIC_LIBS OFF) +set(BUILD_SHARED_LIBS ON) + find_package(Boost COMPONENTS unit_test_framework REQUIRED) include_directories( @@ -17,12 +21,12 @@ include_directories( add_executable(ndarray ndarray.cc) add_dependencies(ndarray preprocess_includes2) -target_link_libraries(ndarray ${Boost_LIBRARIES}) +target_link_libraries(ndarray Boost::unit_test_framework) add_test(test_ndarray ndarray) add_executable(views views.cc) add_dependencies(views preprocess_includes2) -target_link_libraries(views ${Boost_LIBRARIES}) +target_link_libraries(views Boost::unit_test_framework) add_test(test_views views) @@ -34,7 +38,7 @@ if(NDARRAY_EIGEN) add_executable(ndarray-eigen ndarray-eigen.cc) add_dependencies(ndarray-eigen preprocess_includes2) - target_link_libraries(ndarray-eigen ${Boost_LIBRARIES}) + target_link_libraries(ndarray-eigen Boost::unit_test_framework) add_test(test_ndarray_eigen ndarray-eigen) endif(NDARRAY_EIGEN) @@ -45,7 +49,7 @@ if(NDARRAY_FFTW) add_executable(ndarray-fft ndarray-fft.cc) add_dependencies(ndarray-fft preprocess_includes2) - target_link_libraries(ndarray-fft ${Boost_LIBRARIES} ${FFTW_LIBRARIES}) + target_link_libraries(ndarray-fft Boost::unit_test_framework ${FFTW_LIBRARIES}) add_test(test_ndarray-fft ndarray-fft) endif(NDARRAY_FFTW)