From 8a066ac4fc93fb80affb3f039e8ffeb18a361d9f Mon Sep 17 00:00:00 2001 From: Deepak Rangarajan Date: Thu, 2 Jul 2020 15:14:29 -0400 Subject: [PATCH] Remove gpu stuff from csg.hpp --- include/csg.hpp | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/include/csg.hpp b/include/csg.hpp index 23819fa..6c41f0e 100644 --- a/include/csg.hpp +++ b/include/csg.hpp @@ -1,12 +1,6 @@ #ifndef CSG_H_ #define CSG_H_ -#if defined(CSG_USE_GPU) && !defined(CSG_GPU_HOST_DEVICE) -#define CSG_GPU_HOST_DEVICE __host__ __device__ -#else -#define CSG_GPU_HOST_DEVICE -#endif - #include #include #include @@ -14,17 +8,10 @@ namespace csg { -struct GPUable {}; -template struct IsGPUable : std::false_type {}; -template -struct IsGPUable< - D, typename std::enable_if::value>::type> - : std::true_type {}; - struct Tree; std::shared_ptr parse_csg(std::string); -class CsgIF : GPUable { +class CsgIF { public: CsgIF(std::shared_ptr a_state, bool is_internal_flow = false); CsgIF(const CsgIF &rhs); @@ -33,7 +20,6 @@ public: CsgIF &operator=(CsgIF &&rhs) = delete; ~CsgIF(); - CSG_GPU_HOST_DEVICE double operator()(double xx, double yy, double zz) const noexcept; inline double operator()(const std::array &p) const noexcept { -- GitLab