From 3d2143d35bced4c913479f56106280b00160c0f5 Mon Sep 17 00:00:00 2001 From: Pietro Incardona Date: Mon, 11 Mar 2019 20:48:35 +0100 Subject: [PATCH] Fixing MetaParser function --- example/Vector/3_molecular_dynamic_gpu/main.cu | 2 -- install | 4 ++-- src/Vector/vector_dist.hpp | 12 +++++------- src/Vector/vector_dist_kernel.hpp | 6 +++--- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/example/Vector/3_molecular_dynamic_gpu/main.cu b/example/Vector/3_molecular_dynamic_gpu/main.cu index 4419797..7cdb053 100644 --- a/example/Vector/3_molecular_dynamic_gpu/main.cu +++ b/example/Vector/3_molecular_dynamic_gpu/main.cu @@ -96,8 +96,6 @@ constexpr int energy = 2; template __global__ void calc_force_gpu(vector_dist_type vd, NN_type NN, real_number sigma12, real_number sigma6, real_number r_cut2) { - if (blockIdx.x == 0 && threadIdx.x == 0) - {printf("AAAAA %ld ",vd.size());} auto p = GET_PARTICLE(vd); // Get the position xp of the particle diff --git a/install b/install index 8275aab..74c6ed2 100755 --- a/install +++ b/install @@ -420,11 +420,11 @@ fi echo "INCLUDE_PATH=$cuda_include_dirs -Wno-deprecated-declarations $openmp_flags -I. -I$install_base/openfpm_numerics/include -I$install_base/openfpm_pdata/include/config -I$install_base/openfpm_pdata/include -I$install_base/openfpm_data/include -I$install_base/openfpm_vcluster/include -I$install_base/openfpm_io/include -I$install_base/openfpm_devices/include -I$i_dir/METIS/include -I$i_dir/PARMETIS/include -I$i_dir/BOOST/include -I$i_dir/HDF5/include -I$i_dir/LIBHILBERT/include $lin_alg_inc" > example.mk echo "LIBS_PATH=$openmp_flags -L$install_base/openfpm_devices/lib -L$install_base/openfpm_pdata/lib -L$install_base/openfpm_vcluster/lib -L$i_dir/METIS/lib -L$i_dir/PARMETIS/lib -L$i_dir/BOOST/lib -L$hdf5_lib -L$i_dir/LIBHILBERT/lib $lin_alg_dir " >> example.mk if [ x"$gpu_support" == x"1" ]; then - echo "LIBS=-lvcluster -lofpm_pdata -lofpmmemory -lparmetis -lmetis -lboost_iostreams -lhdf5 -llibhilbert $(cat cuda_lib) $lin_alg_lib -ldl" >> example.mk + echo "LIBS=-lvcluster -lofpm_pdata -lofpmmemory -lparmetis -lmetis -lboost_iostreams -lboost_program_options -lhdf5 -llibhilbert $(cat cuda_lib) $lin_alg_lib -ldl" >> example.mk echo "LIBS_SE2=-lvcluster -lofpmmemory_se2 -lparmetis -lmetis -lboost_iostreams -lboost_program_options -lhdf5 -llibhilbert $(cat cuda_lib) $lin_alg_lib" >> example.mk else echo "LIBS=-lvcluster -lofpm_pdata -lofpmmemory -lparmetis -lmetis -lboost_iostreams -lboost_program_options -lhdf5 -llibhilbert $lin_alg_lib -ldl" >> example.mk - echo "LIBS_SE2=-lvcluster -lofpmmemory_se2 -lparmetis -lmetis -lboost_iostreams -lhdf5 -llibhilbert $lin_alg_lib" >> example.mk + echo "LIBS_SE2=-lvcluster -lofpmmemory_se2 -lparmetis -lmetis -lboost_iostreams -lboost_program_options -lhdf5 -llibhilbert $lin_alg_lib" >> example.mk fi echo "INCLUDE_PATH_NVCC=-Xcompiler="-Wno-deprecated-declarations" $(cat openmp_flags) -Xcudafe \"--display_error_number --diag_suppress=2885 --diag_suppress=2886 --diag_suppress=2887 --diag_suppress=2888 --diag_suppress=186 --diag_suppress=111\" --expt-extended-lambda -I. -I$install_base/openfpm_numerics/include -I$install_base/openfpm_pdata/include/config -I$install_base/openfpm_pdata/include -I$install_base/openfpm_data/include -I$install_base/openfpm_vcluster/include -I$install_base/openfpm_io/include -I$install_base/openfpm_devices/include -I$i_dir/METIS/include -I$i_dir/PARMETIS/include -I$i_dir/BOOST/include -I$i_dir/HDF5/include -I$i_dir/LIBHILBERT/include $lin_alg_inc" >> example.mk cp example.mk src/example.mk diff --git a/src/Vector/vector_dist.hpp b/src/Vector/vector_dist.hpp index 5d357bd..a11d460 100644 --- a/src/Vector/vector_dist.hpp +++ b/src/Vector/vector_dist.hpp @@ -2372,9 +2372,7 @@ public: */ inline bool write(std::string out ,int opt = VTK_WRITER) { - write(out,"",opt); - - return true; + return write(out,"",opt); } /*! \brief Output particle position and properties @@ -2461,7 +2459,7 @@ public: */ inline bool write_frame(std::string out, size_t iteration, int opt = VTK_WRITER) { - write_frame(out,iteration,"",opt); + return write_frame(out,iteration,"",opt); } /*! \brief Output particle position and properties @@ -2503,7 +2501,7 @@ public: std::string output = std::to_string(out + "_" + std::to_string(v_cl.getProcessUnitID()) + "_" + std::to_string(iteration) + std::to_string(".vtk")); // Write the VTK file - return vtk_writer.write(output,prp_names,"","particles",ft); + return vtk_writer.write(output,prp_names,"particles","",ft); } } @@ -2738,7 +2736,7 @@ public: */ template vector_dist_ker toKernel() { - vector_dist_ker v(v_pos.toKernel(), v_prp.toKernel()); + vector_dist_ker v(g_m,v_pos.toKernel(), v_prp.toKernel()); return v; } @@ -2752,7 +2750,7 @@ public: */ template vector_dist_ker toKernel_sorted() { - vector_dist_ker v(v_pos_out.toKernel(), v_prp_out.toKernel()); + vector_dist_ker v(g_m,v_pos_out.toKernel(), v_prp_out.toKernel()); return v; } diff --git a/src/Vector/vector_dist_kernel.hpp b/src/Vector/vector_dist_kernel.hpp index 30fb692..812233a 100644 --- a/src/Vector/vector_dist_kernel.hpp +++ b/src/Vector/vector_dist_kernel.hpp @@ -12,7 +12,7 @@ #define POS_PROP -1 -#define GET_PARTICLE(vd) blockDim.x*blockIdx.x + threadIdx.x; if (blockDim.x*blockIdx.x + threadIdx.x >= vd.size()) {return;}; +#define GET_PARTICLE(vd) blockDim.x*blockIdx.x + threadIdx.x; if (blockDim.x*blockIdx.x + threadIdx.x >= vd.size_local()) {return;}; #define GET_PARTICLE_SORT(p,NN) if (blockDim.x*blockIdx.x + threadIdx.x >= NN.get_g_m()) {return;}\ else{p = NN.getDomainSortIds().template get<0>(blockDim.x*blockIdx.x + threadIdx.x);} @@ -40,8 +40,8 @@ public: //! dimensions of space static const unsigned int dims = dim; - vector_dist_ker(const openfpm::vector_gpu_ker,memory_traits_inte> & v_pos, const openfpm::vector_gpu_ker & v_prp) - :v_pos(v_pos),v_prp(v_prp) + vector_dist_ker(int g_m, const openfpm::vector_gpu_ker,memory_traits_inte> & v_pos, const openfpm::vector_gpu_ker & v_prp) + :g_m(g_m),v_pos(v_pos),v_prp(v_prp) {} /*! \brief return the number of particles (excluding ghost) -- 2.22.0