diff --git a/CMakeLists.txt b/CMakeLists.txt index 3df90c43fbf5d4090743fae362e15213f924b969..b4016e501bcdb61c22f38ce41197108dfeee0584 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,7 +77,9 @@ find_package(Eigen3) find_package(SuiteSparse OPTIONAL_COMPONENTS UMFPACK) find_package(Vc) find_package(OpenMP) -find_package(HIP) +if (CUDA_ON_BACKEND STREQUAL "HIP" AND NOT HIP_FOUND) + find_package(HIP) +endif() set(CMAKE_SKIP_BUILD_RPATH TRUE) diff --git a/openfpm_data b/openfpm_data index e63938e7f2c2a91c62039aed9bee60084df97290..07c4a63ec75906c1a7e5f10e32b3c45579edb684 160000 --- a/openfpm_data +++ b/openfpm_data @@ -1 +1 @@ -Subproject commit e63938e7f2c2a91c62039aed9bee60084df97290 +Subproject commit 07c4a63ec75906c1a7e5f10e32b3c45579edb684 diff --git a/openfpm_devices b/openfpm_devices index 0f02536f28319252481cd7f2cee683f3128d8060..30b4d75653fb2f7bfe53b43cee1bf7c360cb0420 160000 --- a/openfpm_devices +++ b/openfpm_devices @@ -1 +1 @@ -Subproject commit 0f02536f28319252481cd7f2cee683f3128d8060 +Subproject commit 30b4d75653fb2f7bfe53b43cee1bf7c360cb0420 diff --git a/openfpm_io b/openfpm_io index 6142d9418c872c2a487e23fcbc57aade3e44fb1e..5ed87d3a63d74e802c3264801b6b83458649b38e 160000 --- a/openfpm_io +++ b/openfpm_io @@ -1 +1 @@ -Subproject commit 6142d9418c872c2a487e23fcbc57aade3e44fb1e +Subproject commit 5ed87d3a63d74e802c3264801b6b83458649b38e diff --git a/openfpm_numerics b/openfpm_numerics index a0073269fa164fba2ca246540d5b9ee29d3659d7..17468b109c6e19cc84049c05e9ad0a236becb854 160000 --- a/openfpm_numerics +++ b/openfpm_numerics @@ -1 +1 @@ -Subproject commit a0073269fa164fba2ca246540d5b9ee29d3659d7 +Subproject commit 17468b109c6e19cc84049c05e9ad0a236becb854 diff --git a/openfpm_vcluster b/openfpm_vcluster index 2102684c8d2cbfd71be5bf797ac36954984c35c2..9b29a91aa47a3a1ea64d2f7881e991747c49d6fb 160000 --- a/openfpm_vcluster +++ b/openfpm_vcluster @@ -1 +1 @@ -Subproject commit 2102684c8d2cbfd71be5bf797ac36954984c35c2 +Subproject commit 9b29a91aa47a3a1ea64d2f7881e991747c49d6fb diff --git a/script/install_BOOST.sh b/script/install_BOOST.sh index d080b347e8710c4caa5098d820ec6b15796827d0..3562de29af41262a50415eb0a2d27bd0ad0f78f1 100755 --- a/script/install_BOOST.sh +++ b/script/install_BOOST.sh @@ -1,6 +1,6 @@ #!/bin/bash -source discover_os +source script/discover_os discover_os # check if the directory $1/BOOST exist @@ -12,7 +12,7 @@ fi rm boost_1_75_0.tar.bz2 wget http://ppmcore.mpi-cbg.de/upload/boost_1_75_0.tar.bz2 -tar -xvf boost_1_75_0.tar.bz2 +tar -xf boost_1_75_0.tar.bz2 cd boost_1_75_0 if [ x"$4" != x"" ]; then if [ -f $HOME/user-config.jam ]; then @@ -30,15 +30,15 @@ mkdir $1/BOOST if [ x"$platform" == x"osx" ]; then if [ x"$arch" == x"arm64" ]; then if [ x"$3" == x"" ]; then - ./b2 -j $2 install --prefix=$1/BOOST address-model=64 architecture=arm abi=aapcs binary-format=mach-o toolset=clang + ./b2 -j $2 install --prefix=$1/BOOST address-model=64 architecture=arm abi=aapcs binary-format=mach-o toolset=clang -sNO_LZMA=1 -sNO_ZSTD=1 else - ./b2 -j $2 install --prefix=$1/BOOST address-model=64 architecture=arm abi=aapcs binary-format=mach-o toolset=$3 + ./b2 -j $2 install --prefix=$1/BOOST address-model=64 architecture=arm abi=aapcs binary-format=mach-o toolset=$3 -sNO_LZMA=1 -sNO_ZSTD=1 fi else - ./b2 -j $2 install --prefix=$1/BOOST address-model=64 architecture=x86 abi=sysv binary-format=mach-o toolset=clang + ./b2 -j $2 install --prefix=$1/BOOST address-model=64 architecture=x86 abi=sysv binary-format=mach-o toolset=clang -sNO_LZMA=1 -sNO_ZSTD=1 fi else - ./b2 -j $2 install --prefix=$1/BOOST + ./b2 -j $2 install --prefix=$1/BOOST -sNO_LZMA=1 -sNO_ZSTD=1 fi rm -rf boost_1_75_0