separate OpenCL code and CUDA code in 'BaseGpuModelSpecifics.hpp'; re…

…move BH dependency for current codebase (without OpenCL)
OHDSI · Nov 2, 2023 · a2b3a95 · a2b3a95
1 parent f0b272e
commit a2b3a95
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -41,7 +41,6 @@ Imports:
     survival,
     bit64
 LinkingTo: Rcpp,
-    BH (>= 1.51.0),
     RcppEigen (>= 0.3.2),
     RcppParallel
 Suggests:

diff --git a/src/cyclops/engine/BaseGpuModelSpecifics.hpp b/src/cyclops/engine/BaseGpuModelSpecifics.hpp
@@ -5,14 +5,21 @@
 #ifndef BASEGPUMODELSPECIFICS_HPP
 #define BASEGPUMODELSPECIFICS_HPP
 
+#ifdef HAVE_OPENCL
 #include <boost/compute/algorithm/reduce.hpp>
+#endif // HAVE_OPENCL
+
+#ifdef HAVE_CUDA
 #include <thrust/device_vector.h>
+#endif //HAVE_CUDA
 
 #include "ModelSpecifics.hpp"
 
 namespace bsccs {
 
+#ifdef HAVE_OPENCL
     namespace compute = boost::compute;
+#endif // HAVE_OPENCL
 
     namespace detail {
 
@@ -24,6 +31,7 @@ namespace bsccs {
             static const int maxBlockSize = 256;
         }; // namespace constant
 
+#ifdef HAVE_OPENCL
         template <typename DeviceVec, typename HostVec>
         DeviceVec allocateAndCopyToDevice(const HostVec& hostVec, const compute::context& context, compute::command_queue& queue) {
             DeviceVec deviceVec(hostVec.size(), context);
@@ -36,6 +44,7 @@ namespace bsccs {
             deviceVec.resize(hostVec.size());
             compute::copy(std::begin(hostVec), std::end(hostVec), std::begin(deviceVec), queue);
         }
+#endif // HAVE_OPENCL
 
         template <typename HostVec, typename DeviceVec>
         void compare(const HostVec& host, const DeviceVec& device, const std::string& error, double tolerance = 1E-10) {
@@ -69,6 +78,7 @@ namespace bsccs {
         SourceCode(std::string body, std::string name) : body(body), name(name) { }
     };
 
+#ifdef HAVE_OPENCL
     template <typename RealType>
     class AllGpuColumns {
     public:
@@ -466,6 +476,6 @@ namespace bsccs {
         int multiprocessors = device.get_info<cl_uint>(CL_DEVICE_MAX_COMPUTE_UNITS)*4/5;
 
     };
-
+#endif // HAVE_OPENCL
 }
 #endif //BASEGPUMODELSPECIFICS_HPP