From b908ce5785d35aa9593aeb70f2bcc3356197c1b1 Mon Sep 17 00:00:00 2001 From: Pietro Incardona <incardon@mpi-cbg.de> Date: Tue, 8 Sep 2020 17:55:41 +0200 Subject: [PATCH] Fixing installation problems --- CHANGELOG.md | 18 +++++++++++++++++- configure | 2 +- script/install_SUITESPARSE.sh | 2 +- src/Vector/cuda/vector_dist_cuda_func_test.cu | 7 +++++++ 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc227344e..4a0ceac39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,23 @@ # Change Log All notable changes to this project will be documented in this file. -## [2.0.0] February 2018 (Codename Elisa) +## [3.0.0] 2020 (Codename Sparsity) + +- Upgrading all the dependencies: BOOST,PETSC,SUITESPARSE,OPENBLAS +- Adding CPU and GPU sparse grids. Look at the examples SparseGrid in the forlder examples +- Improving performance of GPU function remove_marked + +### Fixed + +- Several installation bugs on PETSC installation + +### Changed + +- Name for GoogleCharts has been changed please look at the examples + +## [1.X ] End of life (Theese versions are not enymore supported) + +## [2.0.0] February 2019 (Codename Elisa) ### Added diff --git a/configure b/configure index aa45dd306..c4a589648 100755 --- a/configure +++ b/configure @@ -480,7 +480,7 @@ do conf_options="$conf_options -DEIGEN3_ROOT=$ac_optarg" ;; boost) - conf_options="$conf_options -DBOOST_ROOT=$ac_optarg" + conf_options="$conf_options -DBOOST_ROOT=$ac_optarg -DBoost_NO_BOOST_CMAKE=ON" ;; action_on_error) conf_options="$conf_options -DACTION_ON_ERROR=$ac_optarg" diff --git a/script/install_SUITESPARSE.sh b/script/install_SUITESPARSE.sh index ccd024ce5..d2ceafc15 100755 --- a/script/install_SUITESPARSE.sh +++ b/script/install_SUITESPARSE.sh @@ -35,7 +35,7 @@ if [ x"$platform" == x"cygwin" ]; then fi echo "Compiling SuiteSparse without CUDA (old variable $CUDA)" -LDLIBS="$STS_LIB -lm" LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$1/OPENBLAS/lib" make -j $2 "CUDA=no" "BLAS=-L$1/OPENBLAS/lib -lopenblas -pthread" "LAPACK=-lopenblas" +LDLIBS="$STS_LIB -lm" LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$1/OPENBLAS/lib" make library -j $2 "CUDA=no" "BLAS=-L$1/OPENBLAS/lib -lopenblas -pthread" "LAPACK=-lopenblas" if [ $? != 0 ]; then echo "Failed to compile SuiteSparse" exit 1 diff --git a/src/Vector/cuda/vector_dist_cuda_func_test.cu b/src/Vector/cuda/vector_dist_cuda_func_test.cu index 06c0ccecc..fc9c28eea 100644 --- a/src/Vector/cuda/vector_dist_cuda_func_test.cu +++ b/src/Vector/cuda/vector_dist_cuda_func_test.cu @@ -1217,6 +1217,13 @@ void vector_dist_remove_marked_type() remove_marked<prp>(vd); BOOST_REQUIRE_EQUAL(vd.size_local(),size_old); + + // Now we try to remove all + vd.getPropVector().template fill<prp>(1); + + remove_marked<prp>(vd); + + BOOST_REQUIRE_EQUAL(vd.size_local(),0); } BOOST_AUTO_TEST_CASE(vector_dist_remove_marked) -- GitLab