From f12e2c26e776dac3862c3e49c40c9ac09d234a7d Mon Sep 17 00:00:00 2001
From: Serhii Yaskovets <yaskovet@mpi-cbg.de>
Date: Fri, 10 Feb 2023 14:47:50 +0100
Subject: [PATCH] Fixing "Fixing sparse grid load"
---
.gitmodules | 10 ++---
openfpm_data | 2 +-
openfpm_numerics | 2 +-
openfpm_vcluster | 2 +-
src/Grid/grid_dist_id.hpp | 81 +--------------------------------------
5 files changed, 9 insertions(+), 88 deletions(-)
diff --git a/.gitmodules b/.gitmodules
index c09aeab5e..aa6b50bf8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,18 +1,18 @@
[submodule "openfpm_vcluster"]
path = openfpm_vcluster
- url = https://git.mpi-cbg.de/mosaic/software/parallel-computing/openfpm/openfpm_vcluster.git
+ url = ssh://git@git.mpi-cbg.de/openfpm/openfpm_vcluster.git
[submodule "openfpm_devices"]
path = openfpm_devices
- url = https://git.mpi-cbg.de/mosaic/software/parallel-computing/openfpm/openfpm_devices.git
+ url = ssh://git@git.mpi-cbg.de/openfpm/openfpm_devices.git
[submodule "openfpm_io"]
path = openfpm_io
- url = https://git.mpi-cbg.de/mosaic/software/parallel-computing/openfpm/openfpm_io.git
+ url = ssh://git@git.mpi-cbg.de/openfpm/openfpm_io.git
[submodule "openfpm_data"]
path = openfpm_data
- url = https://git.mpi-cbg.de/mosaic/software/parallel-computing/openfpm/openfpm_io.git
+ url = ssh://git@git.mpi-cbg.de/openfpm/openfpm_data.git
[submodule "openfpm_numerics"]
path = openfpm_numerics
- url = https://git.mpi-cbg.de/mosaic/software/parallel-computing/openfpm/openfpm_numerics.git
+ url = ssh://git@git.mpi-cbg.de/openfpm/openfpm_numerics.git
[submodule "gdbgui"]
path = gdbgui
url = https://github.com/incardon/gdbgui.git
diff --git a/openfpm_data b/openfpm_data
index 23eee4f11..31607265b 160000
--- a/openfpm_data
+++ b/openfpm_data
@@ -1 +1 @@
-Subproject commit 23eee4f1181ac85831eb49f96f8f2678bc242fc5
+Subproject commit 31607265bc18447a45979cd79694d988d9788127
diff --git a/openfpm_numerics b/openfpm_numerics
index e3ebd6a3e..66ae0b6ae 160000
--- a/openfpm_numerics
+++ b/openfpm_numerics
@@ -1 +1 @@
-Subproject commit e3ebd6a3ef3c0de5a11267fb03135751c1780026
+Subproject commit 66ae0b6ae0ef539bab766a1c630f1f22340b6c2e
diff --git a/openfpm_vcluster b/openfpm_vcluster
index 895aa0e53..4077b1797 160000
--- a/openfpm_vcluster
+++ b/openfpm_vcluster
@@ -1 +1 @@
-Subproject commit 895aa0e5387d7eb0f7b6be65dd18c48f7db08f64
+Subproject commit 4077b1797cfd2e9f63dc5bc8b9e886fb5b51e7b7
diff --git a/src/Grid/grid_dist_id.hpp b/src/Grid/grid_dist_id.hpp
index 0c471f526..428d38c4c 100644
--- a/src/Grid/grid_dist_id.hpp
+++ b/src/Grid/grid_dist_id.hpp
@@ -61,59 +61,6 @@ struct Box_fix
#define NO_GDB_EXT_SWITCH 0x1000
-template<bool is_sparse>
-struct device_grid_copy
-{
- template<typename key_type1, typename key_type2, typename spg_type, typename lg_type>
- static void assign(key_type1 & key, key_type2 & key_dst, spg_type & dg, lg_type & lg)
- {
- dg.insert_o(key_dst) = lg.get_o(key);
- }
-};
-
-template<typename e_src, typename e_dst, typename indexT>
-struct copy_all_prop_sparse
-{
- //! encapsulated source object
- const e_src & block_data_src;
- e_dst & block_data_dst;
-
- indexT local_id;
-
- /*! \brief constructor
- *
- * \param src source encapsulated object
- * \param dst source encapsulated object
- *
- */
- __device__ __host__ inline copy_all_prop_sparse(const e_src & block_data_src, e_dst & block_data_dst, indexT local_id)
- :block_data_src(block_data_src),block_data_dst(block_data_dst),local_id(local_id)
- {
- };
-
- template<typename T>
- __device__ __host__ inline void operator()(T& t) const
- {
- block_data_dst.template get<T::value>()[local_id] = block_data_src.template get<T::value>();
- }
-};
-
-template<>
-struct device_grid_copy<true>
-{
- template<typename key_type1, typename key_type2, typename spg_type, typename lg_type>
- static void assign(key_type1 & key, key_type2 & key_dst, spg_type & dg, lg_type & lg)
- {
- typename spg_type::indexT_ local_id;
- auto block_data_dst = dg.insertBlockFlush(key_dst, local_id);
- auto block_data_src = lg.get_o(key);
-
- copy_all_prop_sparse<decltype(block_data_src),decltype(block_data_dst),decltype(local_id)> cp(block_data_src, block_data_dst, local_id);
-
- boost::mpl::for_each_ref< boost::mpl::range_c<int,0,decltype(block_data_dst)::max_prop> >(cp);
- }
-};
-
/*! \brief This is a distributed grid
*
* Implementation of a distributed grid the decomposition is geometrical, grid
@@ -2262,32 +2209,6 @@ public:
return loc_grid.get(v1.getSub()).template insertFlush<p>(v1.getKey());
}
- /*! \brief insert an element in the grid
- *
- * In case of dense grid this function is equivalent to get, in case of sparse
- * grid this function insert a grid point. When the point already exist it return
- * a reference to the already existing point. In case of massive insert Sparse grids
- * The point is inserted immediately and a reference to the inserted element is returned
- *
- * \warning This function is not fast an unlucky insert can potentially cost O(N) where N is the number
- * of points (worst case)
- *
- * \tparam p property to get (is an integer)
- * \param v1 grid_key that identify the element in the grid
- *
- * \return a reference to the inserted element
- *
- */
- template <typename bg_key>inline auto insertFlush(const grid_dist_key_dx<dim,bg_key> & v1)
- -> decltype(loc_grid.get(v1.getSub()).template insertFlush(v1.getKey()))
- {
-#ifdef SE_CLASS2
- check_valid(this,8);
-#endif
-
- return loc_grid.get(v1.getSub()).template insertFlush(v1.getKey());
- }
-
/*! \brief Get the reference of the selected element
*
* \tparam p property to get (is an integer)
@@ -3382,7 +3303,7 @@ public:
for (int j = 0 ; j < dim ; j++)
{key_dst.set_d(j,key.get(j) + orig.get(j) + kp1.get(j));}
- device_grid_copy<device_grid::isCompressed()>::assign(key,key_dst,dg,lg);
+ dg.insert_o(key_dst) = lg.get_o(key);
++it_src;
}
--
GitLab