From a5d65f162efdd21ef11e334b239bca4c43660049 Mon Sep 17 00:00:00 2001
From: Incardona Pietro <incardon@mpi-cbg.de>
Date: Wed, 17 Nov 2021 04:02:47 +0100
Subject: [PATCH] Fixing CUDA
---
configure | 27 ++++++++++-----------------
openfpm_data | 2 +-
openfpm_devices | 2 +-
openfpm_vcluster | 2 +-
4 files changed, 13 insertions(+), 20 deletions(-)
diff --git a/configure b/configure
index 29474677f..151643373 100755
--- a/configure
+++ b/configure
@@ -122,7 +122,6 @@ with_suitesparse
with_petsc
with_eigen
with_vcdevel
-enable_gpu
enable_asan
enable_garbageinj
enable_garbageinjv
@@ -197,9 +196,6 @@ do
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_useropt in
- gpu)
- conf_options="$conf_options -DENABLE_GPU=OFF"
- ;;
*) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
ac_unrecognized_sep=', ';;
esac
@@ -248,19 +244,6 @@ do
test_performance)
conf_options="$conf_options -DTEST_PERFORMANCE=ON"
;;
- gpu)
- if [ x"$CXX" == x"" ]; then
- conf_options="$conf_options"
- else
- conf_options="$conf_options -DCMAKE_CUDA_HOST_COMPILER=$(which $CXX)"
- fi
- if [ x"$CXXCUDA" == x"" ]; then
- conf_options="$conf_options"
- else
- conf_options="$conf_options -DCMAKE_CUDA_COMPILER=$(which $CXXCUDA)"
- fi
- conf_options="$conf_options -DENABLE_GPU=ON"
- ;;
asan)
conf_options="$conf_options -DENABLE_ASAN=ON"
;;
@@ -477,6 +460,16 @@ do
case $ac_useropt in
cuda_on_backend)
conf_options="$conf_options -DCUDA_ON_BACKEND=$ac_optarg"
+ if [ x"$ac_optarg" != x"CUDA" ]; then
+ conf_options="$conf_options"
+ else
+ conf_options="$conf_options -DCMAKE_CUDA_HOST_COMPILER=$(which $CXX)"
+ fi
+ if [ x"$CXXCUDA" == x"" ]; then
+ conf_options="$conf_options"
+ else
+ conf_options="$conf_options -DCMAKE_CUDA_COMPILER=$(which $CXXCUDA)"
+ fi
;;
libhilbert)
conf_options="$conf_options -DLIBHILBERT_ROOT=$ac_optarg"
diff --git a/openfpm_data b/openfpm_data
index 17a3db42f..2ce34b8e3 160000
--- a/openfpm_data
+++ b/openfpm_data
@@ -1 +1 @@
-Subproject commit 17a3db42f94fb549ed5b38b6c20ca5502cb90d4b
+Subproject commit 2ce34b8e3d4b48dde95d95a5f0a599df9ad89e85
diff --git a/openfpm_devices b/openfpm_devices
index 820a0a676..3d2666f28 160000
--- a/openfpm_devices
+++ b/openfpm_devices
@@ -1 +1 @@
-Subproject commit 820a0a676fc35b00ad4ba23dbb3cbde12fe30e8a
+Subproject commit 3d2666f289ddeb35b0d17eeff0bd7d00bc2b5c59
diff --git a/openfpm_vcluster b/openfpm_vcluster
index f1dbe16d7..440f7b738 160000
--- a/openfpm_vcluster
+++ b/openfpm_vcluster
@@ -1 +1 @@
-Subproject commit f1dbe16d77cebbf6666ce7982529009cdf7bb537
+Subproject commit 440f7b738e91eed5bc70c38cf73e997745218dfc
--
GitLab