summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2020-10-08 23:57:56 +0200
committerbartus2020-10-08 23:57:56 +0200
commitcc99d8a172ce5e3d4f3b27473d65430a0ff4b3ca (patch)
tree414b3e7ad2451e5c182a7bd7a1c03a433ecde322
parente66bf4166909150d43ebb349b1b0732e1b2a8004 (diff)
downloadaur-cc99d8a172ce5e3d4f3b27473d65430a0ff4b3ca.tar.gz
Switch thrust to the one packaged with cuda.
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD3
2 files changed, 1 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c28526bc2fda..ef04810d704e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -21,7 +21,6 @@ pkgbase = chronoengine
makedepends = swig
makedepends = cuda<=10.2.89
makedepends = blaze
- makedepends = thrust
makedepends = oce
makedepends = mumps
makedepends = blas
diff --git a/PKGBUILD b/PKGBUILD
index 6b48541ecff7..8b0cffb55350 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,7 +18,6 @@ makedepends+=(python swig) # MODULE_PYTHON
makedepends+=('cuda<=10.2.89') # MODULE_GRANULAR
# MODULE_PARALLEL optional
makedepends+=(blaze) # MODULE_PARALLEL required
-makedepends+=(thrust) # MODULE_PARALLEL required
#makedepends+=(opencascade)# MODULE_CASCADE (version<=7.2)
# use oce (opencascade comunitiy edition)
makedepends+=(oce) # MODULE_CASCADE
@@ -58,7 +57,7 @@ CMAKE_FLAGS=( -DENABLE_MODULE_POSTPROCESS=ON
-DCASCADE_INCLUDE_DIR=/opt/oce/include/oce
-DENABLE_MODULE_OPENGL=ON
-DENABLE_MODULE_PARALLEL=ON
- -DTHRUST_INCLUDE_DIR=/opt/thrust
+ -DTHRUST_INCLUDE_DIR=/opt/cuda/targets/x86_64-linux/include
-DENABLE_MODULE_MKL=ON
-DINTEL_ROOT=/opt/intel/mkl
-DENABLE_MODULE_COSIMULATION=ON