Skip to content
Snippets Groups Projects
Commit a5d65f16 authored by Pietro Incardona's avatar Pietro Incardona
Browse files

Fixing CUDA

parent e5d55779
No related branches found
No related tags found
No related merge requests found
Pipeline #3887 failed
...@@ -122,7 +122,6 @@ with_suitesparse ...@@ -122,7 +122,6 @@ with_suitesparse
with_petsc with_petsc
with_eigen with_eigen
with_vcdevel with_vcdevel
enable_gpu
enable_asan enable_asan
enable_garbageinj enable_garbageinj
enable_garbageinjv enable_garbageinjv
...@@ -197,9 +196,6 @@ do ...@@ -197,9 +196,6 @@ do
ac_useropt_orig=$ac_useropt ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_useropt in 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_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
ac_unrecognized_sep=', ';; ac_unrecognized_sep=', ';;
esac esac
...@@ -248,19 +244,6 @@ do ...@@ -248,19 +244,6 @@ do
test_performance) test_performance)
conf_options="$conf_options -DTEST_PERFORMANCE=ON" 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) asan)
conf_options="$conf_options -DENABLE_ASAN=ON" conf_options="$conf_options -DENABLE_ASAN=ON"
;; ;;
...@@ -477,6 +460,16 @@ do ...@@ -477,6 +460,16 @@ do
case $ac_useropt in case $ac_useropt in
cuda_on_backend) cuda_on_backend)
conf_options="$conf_options -DCUDA_ON_BACKEND=$ac_optarg" 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) libhilbert)
conf_options="$conf_options -DLIBHILBERT_ROOT=$ac_optarg" conf_options="$conf_options -DLIBHILBERT_ROOT=$ac_optarg"
......
openfpm_data @ 2ce34b8e
Subproject commit 17a3db42f94fb549ed5b38b6c20ca5502cb90d4b Subproject commit 2ce34b8e3d4b48dde95d95a5f0a599df9ad89e85
openfpm_devices @ 3d2666f2
Subproject commit 820a0a676fc35b00ad4ba23dbb3cbde12fe30e8a Subproject commit 3d2666f289ddeb35b0d17eeff0bd7d00bc2b5c59
openfpm_vcluster @ 440f7b73
Subproject commit f1dbe16d77cebbf6666ce7982529009cdf7bb537 Subproject commit 440f7b738e91eed5bc70c38cf73e997745218dfc
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment