From 2ce34b8e3d4b48dde95d95a5f0a599df9ad89e85 Mon Sep 17 00:00:00 2001
From: Incardona Pietro <incardon@mpi-cbg.de>
Date: Wed, 17 Nov 2021 04:02:04 +0100
Subject: [PATCH] Fixing CUDA
---
src/CMakeLists.txt | 2 ++
src/Grid/grid_sm.hpp | 2 +-
src/util/cuda/moderngpu/context_reduced.hxx | 2 ++
src/util/test/zmorton_unit_tests.cpp | 1 -
4 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3b2773f1..02cd1e71 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -98,6 +98,8 @@ set_property(TARGET mem_map PROPERTY CUDA_ARCHITECTURES 60 75)
if (CUDA_FOUND)
+ target_include_directories(mem_map PUBLIC ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES})
+
add_executable(isolation
isolation.cu
)
diff --git a/src/Grid/grid_sm.hpp b/src/Grid/grid_sm.hpp
index a0588a17..c66623b3 100755
--- a/src/Grid/grid_sm.hpp
+++ b/src/Grid/grid_sm.hpp
@@ -100,7 +100,7 @@ public:
template<unsigned int dim>
struct ite_gpu
{
-#ifdef CUDA_GPU
+#if defined(CUDIFY_USE_CUDA)
dim3 thr;
dim3 wthr;
diff --git a/src/util/cuda/moderngpu/context_reduced.hxx b/src/util/cuda/moderngpu/context_reduced.hxx
index 0d3f37e0..ade424ae 100644
--- a/src/util/cuda/moderngpu/context_reduced.hxx
+++ b/src/util/cuda/moderngpu/context_reduced.hxx
@@ -11,6 +11,8 @@
#include <cstdarg>
#include <string>
+#include <cuda_runtime.h>
+
namespace mgpu {
enum memory_space_t {
diff --git a/src/util/test/zmorton_unit_tests.cpp b/src/util/test/zmorton_unit_tests.cpp
index 133cc747..c35e26fc 100644
--- a/src/util/test/zmorton_unit_tests.cpp
+++ b/src/util/test/zmorton_unit_tests.cpp
@@ -11,7 +11,6 @@
#define BOOST_TEST_DYN_LINK
#include <boost/test/unit_test.hpp>
-#include "util/cuda_util.hpp"
#include "util/zmorton.hpp"
template<typename T>
--
GitLab