From 6ca6ec9e5c8d67a3a9e34983acf2ec15654ff3c2 Mon Sep 17 00:00:00 2001
From: Incardona Pietro <incardon@mpi-cbg.de>
Date: Tue, 27 Apr 2021 20:08:09 +0200
Subject: [PATCH] Fixing CUDA in develop for expressions
---
src/Vector/cuda/vector_dist_cuda_func_test.cu | 2 +-
src/Vector/vector_dist_kernel.hpp | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/Vector/cuda/vector_dist_cuda_func_test.cu b/src/Vector/cuda/vector_dist_cuda_func_test.cu
index 53bfc9235..b0f330f6a 100644
--- a/src/Vector/cuda/vector_dist_cuda_func_test.cu
+++ b/src/Vector/cuda/vector_dist_cuda_func_test.cu
@@ -8,7 +8,7 @@
#include "Vector/cuda/vector_dist_cuda_funcs.cuh"
#include "Vector/util/vector_dist_funcs.hpp"
#include "Decomposition/CartDecomposition.hpp"
-#include "util/cuda/scan_cuda.cuh"
+//#include "util/cuda/scan_cuda.cuh"
#include "Vector/vector_dist.hpp"
#include "util/cuda/scan_ofp.cuh"
diff --git a/src/Vector/vector_dist_kernel.hpp b/src/Vector/vector_dist_kernel.hpp
index 435515570..c7cfb01c6 100644
--- a/src/Vector/vector_dist_kernel.hpp
+++ b/src/Vector/vector_dist_kernel.hpp
@@ -194,6 +194,11 @@ public:
return v_prp.template get<id>(vec_key.getKey());
}
+ __device__ __host__ int getOriginKey(int vec_key)
+ {
+ return vec_key;
+ }
+
/*! \brief Get the property of an element
*
* see the vector_dist iterator usage to get an element key
--
GitLab