From bd6bb09b5d6fdf493917d60213f6db17df2ee497 Mon Sep 17 00:00:00 2001 From: Tom Lin Date: Mon, 25 Sep 2023 01:39:23 +0100 Subject: [PATCH] Fix MEM flag for CUDA, resolves #163 --- src/cuda/CUDAStream.cu | 8 +++++++- src/cuda/CUDAStream.h | 8 +------- src/cuda/model.cmake | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/cuda/CUDAStream.cu b/src/cuda/CUDAStream.cu index e1abe34..573d24e 100644 --- a/src/cuda/CUDAStream.cu +++ b/src/cuda/CUDAStream.cu @@ -42,7 +42,13 @@ CUDAStream::CUDAStream(const int ARRAY_SIZE, const int device_index) // Print out device information std::cout << "Using CUDA device " << getDeviceName(device_index) << std::endl; std::cout << "Driver: " << getDeviceDriver(device_index) << std::endl; - +#if defined(MANAGED) + std::cout << "Memory: MANAGED" << std::endl; +#elif defined(PAGEFAULT) + std::cout << "Memory: PAGEFAULT" << std::endl; +#else + std::cout << "Memory: DEFAULT" << std::endl; +#endif array_size = ARRAY_SIZE; // Allocate the host array for partial sums for dot kernels diff --git a/src/cuda/CUDAStream.h b/src/cuda/CUDAStream.h index bb3f866..5ff4f9b 100644 --- a/src/cuda/CUDAStream.h +++ b/src/cuda/CUDAStream.h @@ -13,13 +13,7 @@ #include "Stream.h" -#if defined(PAGEFAULT) - #define IMPLEMENTATION_STRING "CUDA - Page Fault" -#elif defined(MANAGED) - #define IMPLEMENTATION_STRING "CUDA - Managed Memory" -#else - #define IMPLEMENTATION_STRING "CUDA" -#endif +#define IMPLEMENTATION_STRING "CUDA" #define TBSIZE 1024 #define DOT_NUM_BLOCKS 1024 diff --git a/src/cuda/model.cmake b/src/cuda/model.cmake index 8c6b568..6202b2d 100644 --- a/src/cuda/model.cmake +++ b/src/cuda/model.cmake @@ -29,7 +29,7 @@ macro(setup) endif() enable_language(CUDA) - register_definitions(MEM=${MEM}) + register_definitions(${MEM}) # add -forward-unknown-to-host-compiler for compatibility reasons set(CMAKE_CUDA_FLAGS ${CMAKE_CUDA_FLAGS} "-forward-unknown-to-host-compiler -arch=${CUDA_ARCH}" ${CUDA_EXTRA_FLAGS})