From 4ad227b930f7b96db0ded484bb7e61c7c6b79198 Mon Sep 17 00:00:00 2001
From: Pietro Incardona <incardon@mpi-cbg.de>
Date: Wed, 12 Dec 2018 14:28:50 +0100
Subject: [PATCH] Fixing BOOST detection
---
src/CMakeLists.txt | 2 +-
src/memory/CudaMemory.cu | 10 ++++++++++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 37e86de..2739013 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,7 +4,6 @@ else()
set(CUDA_SOURCES )
endif()
-target_include_directories (pdata PUBLIC ${Boost_INCLUDE_DIRS})
add_executable(mem main.cpp memory/HeapMemory.cpp ${CUDA_SOURCES} Memleak_check.cpp)
@@ -19,6 +18,7 @@ endif()
target_include_directories (mem PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories (mem PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/config)
+target_include_directories (mem PUBLIC ${Boost_INCLUDE_DIRS})
target_include_directories (ofpmmemory PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories (ofpmmemory PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/config)
diff --git a/src/memory/CudaMemory.cu b/src/memory/CudaMemory.cu
index a3e88a8..4acab31 100644
--- a/src/memory/CudaMemory.cu
+++ b/src/memory/CudaMemory.cu
@@ -47,6 +47,10 @@ bool CudaMemory::allocate(size_t sz)
this->sz = sz;
+#ifdef FILL_CUDA_MEMORY_WITH_MINUS_ONE
+ CUDA_SAFE_CALL(cudaMemset(dm,-1,sz))
+#endif
+
return true;
}
@@ -217,8 +221,14 @@ bool CudaMemory::resize(size_t sz)
if (dm != NULL)
{
if (this->sz < sz)
+ {
CUDA_SAFE_CALL(cudaMalloc(&tdm,sz));
+#ifdef FILL_CUDA_MEMORY_WITH_MINUS_ONE
+ CUDA_SAFE_CALL(cudaMemset(tdm,-1,sz));
+#endif
+ }
+
//! copy from the old buffer to the new one
CUDA_SAFE_CALL(cudaMemcpy(tdm,dm,CudaMemory::size(),cudaMemcpyDeviceToDevice));
--
GitLab