From 9a3e11919f7751dace866d99a7797e4c760dd976 Mon Sep 17 00:00:00 2001 From: Pietro Incardona <incardon@mpi-cbg.de> Date: Thu, 23 Apr 2020 01:46:40 +0200 Subject: [PATCH] Latest modules --- openfpm_data | 2 +- src/CMakeLists.txt | 1 + src/Vector/cuda/vector_dist_comm_util_funcs.cuh | 4 ++-- src/Vector/cuda/vector_dist_cuda_func_test.cu | 2 +- src/Vector/vector_dist_comm.hpp | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/openfpm_data b/openfpm_data index 5e00d1f0f..e91db651a 160000 --- a/openfpm_data +++ b/openfpm_data @@ -1 +1 @@ -Subproject commit 5e00d1f0f7fbbd4e4649c41284dc83d3df393222 +Subproject commit e91db651a61479ae33ef2a66c3cfce70315e16b6 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 018f8d6d3..189910a18 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,6 @@ cmake_minimum_required(VERSION 3.8 FATAL_ERROR) +add_definitions(-DSCAN_WITH_CUB) ########################### Executables diff --git a/src/Vector/cuda/vector_dist_comm_util_funcs.cuh b/src/Vector/cuda/vector_dist_comm_util_funcs.cuh index 1ae16b0d5..1809b44a6 100644 --- a/src/Vector/cuda/vector_dist_comm_util_funcs.cuh +++ b/src/Vector/cuda/vector_dist_comm_util_funcs.cuh @@ -92,7 +92,7 @@ struct labelParticlesGhost_impl<dim,St,prop,Memory,layout_base,Decomposition,tru // scan //sc.scan_(proc_id_out,starts); starts.resize(proc_id_out.size()); - mgpu::scan((unsigned int *)proc_id_out.template getDeviceBuffer<0>(), proc_id_out.size(), (unsigned int *)starts.template getDeviceBuffer<0>() , v_cl.getmgpuContext()); + openfpm::scan((unsigned int *)proc_id_out.template getDeviceBuffer<0>(), proc_id_out.size(), (unsigned int *)starts.template getDeviceBuffer<0>() , v_cl.getmgpuContext()); starts.template deviceToHost<0>(starts.size()-1,starts.size()-1); size_t sz = starts.template get<0>(starts.size()-1); @@ -265,7 +265,7 @@ struct local_ghost_from_dec_impl<dim,St,prop,Memory,layout_base,true> box_f_dev.toKernel(),box_f_sv.toKernel(),v_pos.toKernel(),o_part_loc.toKernel(),g_m); starts.resize(o_part_loc.size()); - mgpu::scan((unsigned int *)o_part_loc.template getDeviceBuffer<0>(), o_part_loc.size(), (unsigned int *)starts.template getDeviceBuffer<0>() , v_cl.getmgpuContext()); + openfpm::scan((unsigned int *)o_part_loc.template getDeviceBuffer<0>(), o_part_loc.size(), (unsigned int *)starts.template getDeviceBuffer<0>() , v_cl.getmgpuContext()); starts.template deviceToHost<0>(starts.size()-1,starts.size()-1); size_t total = starts.template get<0>(starts.size()-1); diff --git a/src/Vector/cuda/vector_dist_cuda_func_test.cu b/src/Vector/cuda/vector_dist_cuda_func_test.cu index 4088971a3..e50a9c467 100644 --- a/src/Vector/cuda/vector_dist_cuda_func_test.cu +++ b/src/Vector/cuda/vector_dist_cuda_func_test.cu @@ -129,7 +129,7 @@ BOOST_AUTO_TEST_CASE( vector_ghost_process_local_particles ) starts.resize(o_part_loc.size()); auto & v_cl = create_vcluster(); - mgpu::scan((unsigned int *)o_part_loc.template getDeviceBuffer<0>(), o_part_loc.size(), (unsigned int *)starts.template getDeviceBuffer<0>() , v_cl.getmgpuContext()); + openfpm::scan((unsigned int *)o_part_loc.template getDeviceBuffer<0>(), o_part_loc.size(), (unsigned int *)starts.template getDeviceBuffer<0>() , v_cl.getmgpuContext()); starts.deviceToHost<0>(starts.size()-1,starts.size()-1); size_t tot = starts.template get<0>(o_part_loc.size()-1); diff --git a/src/Vector/vector_dist_comm.hpp b/src/Vector/vector_dist_comm.hpp index 6694ac553..b08cf1b11 100644 --- a/src/Vector/vector_dist_comm.hpp +++ b/src/Vector/vector_dist_comm.hpp @@ -1473,7 +1473,7 @@ class vector_dist_comm #else starts.resize(v_cl.size()); - mgpu::scan((unsigned int *)prc_sz.template getDeviceBuffer<0>(), prc_sz.size(), (unsigned int *)starts.template getDeviceBuffer<0>() , v_cl.getmgpuContext()); + openfpm::scan((unsigned int *)prc_sz.template getDeviceBuffer<0>(), prc_sz.size(), (unsigned int *)starts.template getDeviceBuffer<0>() , v_cl.getmgpuContext()); // move prc_sz to host prc_sz.template deviceToHost<0>(); -- GitLab