From 6f4586005d7f0f8f922b544c30e5d26a00528a52 Mon Sep 17 00:00:00 2001 From: Pietro Incardona Date: Tue, 26 Mar 2019 13:39:53 +0100 Subject: [PATCH] Sparse_cl passing the test --- src/Vector/cuda/vector_dist_gpu_MP_tests.cu | 4 ++-- src/Vector/vector_dist_comm.hpp | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Vector/cuda/vector_dist_gpu_MP_tests.cu b/src/Vector/cuda/vector_dist_gpu_MP_tests.cu index 1d456af6..c9af9178 100644 --- a/src/Vector/cuda/vector_dist_gpu_MP_tests.cu +++ b/src/Vector/cuda/vector_dist_gpu_MP_tests.cu @@ -673,7 +673,7 @@ BOOST_AUTO_TEST_CASE( vector_dist_multiphase_kernel_test_simplified ) BOOST_AUTO_TEST_CASE( vector_dist_multiphase_kernel_cl_test ) { -/* if (create_vcluster().getProcessingUnits() > 24) + if (create_vcluster().getProcessingUnits() > 24) {return;} // The domain @@ -777,7 +777,7 @@ BOOST_AUTO_TEST_CASE( vector_dist_multiphase_kernel_cl_test ) } } - BOOST_REQUIRE_EQUAL(match,true);*/ + BOOST_REQUIRE_EQUAL(match,true); } BOOST_AUTO_TEST_SUITE_END() diff --git a/src/Vector/vector_dist_comm.hpp b/src/Vector/vector_dist_comm.hpp index e219a461..9dc91855 100644 --- a/src/Vector/vector_dist_comm.hpp +++ b/src/Vector/vector_dist_comm.hpp @@ -20,14 +20,14 @@ #include "Vector/util/vector_dist_funcs.hpp" #include "cuda/vector_dist_comm_util_funcs.cuh" -#define NO_POSITION 1 -#define WITH_POSITION 2 -#define NO_CHANGE_ELEMENTS 4 +constexpr int NO_POSITION = 1; +constexpr int WITH_POSITION = 2; +constexpr int NO_CHANGE_ELEMENTS = 4; -#define BIND_DEC_TO_GHOST 1 +constexpr int BIND_DEC_TO_GHOST = 1; -#define RUN_ON_DEVICE 1024 -#define MAP_LOCAL 2 +constexpr int RUN_ON_DEVICE = 1024; +constexpr int MAP_LOCAL = 2; /*! \brief compute the communication options from the ghost_get/put options * -- GitLab