Skip to content

GitLab

O
openfpm_vcluster
Commit 7545a755 authored by incardon's avatar incardon
Browse files
Options

Changing names of some files

parent 3f37237e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1231 additions and 1111 deletions
src/Makefile.am
View file @ 7545a755
......@@ -2,18 +2,18 @@
LINKLIBS = $(DEFAULT_LIB) $(PTHREAD_LIBS) $(OPT_LIBS) $(HDF5_LDFLAGS) $(HDF5_LIBS) $(BOOST_LDFLAGS)
noinst_PROGRAMS = vcluster
vcluster_SOURCES = main.cpp VCluster.cpp ../../openfpm_devices/src/memory/HeapMemory.cpp ../../openfpm_devices/src/memory/PtrMemory.cpp
vcluster_SOURCES = main.cpp VCluster/VCluster.cpp ../../openfpm_devices/src/memory/HeapMemory.cpp ../../openfpm_devices/src/memory/PtrMemory.cpp
vcluster_CXXFLAGS = $(AM_CXXFLAGS) $(INCLUDES_PATH) $(BOOST_CPPFLAGS)
vcluster_CFLAGS = $(CUDA_CFLAGS)
vcluster_LDADD = $(LINKLIBS)
lib_LIBRARIES = libvcluster.a
libvcluster_a_SOURCES = VCluster.cpp
libvcluster_a_SOURCES = VCluster/VCluster.cpp
libvcluster_a_CXXFLAGS = $(AM_CXXFLAGS) $(INCLUDES_PATH) $(BOOST_CPPFLAGS)
libvcluster_a_CFLAGS =
nobase_include_HEADERS = MPI_wrapper/MPI_IallreduceW.hpp MPI_wrapper/MPI_IrecvW.hpp MPI_wrapper/MPI_IsendW.hpp MPI_wrapper/MPI_util.hpp MPI_wrapper/MPI_IAllGather.hpp \
VCluster_semantic.ipp VCluster.hpp VCluster_object.hpp \
VCluster/VCluster_base.hpp VCluster/VCluster.hpp \
util/Vcluster_log.hpp
.cu.o :
......
src/VCluster/VCluster.hpp 0 → 100644
View file @ 7545a755
This diff is collapsed.
src/VCluster.hpp → src/VCluster/VCluster_base.hpp
View file @ 7545a755
#ifndef VCLUSTER
#define VCLUSTER
#ifndef VCLUSTER_BASE_HPP_
#define VCLUSTER_BASE_HPP_
#include "config.h"
#include <mpi.h>
#include "MPI_wrapper/MPI_util.hpp"
#include "VCluster_object.hpp"
#include "Vector/map_vector.hpp"
#include "MPI_wrapper/MPI_IallreduceW.hpp"
#include "MPI_wrapper/MPI_IrecvW.hpp"
......@@ -54,133 +53,6 @@ template<typename T> void assign(T * ptr1, T * ptr2)
*ptr1 = *ptr2;
};
//! Helper class to add data without serialization
template<bool sr>
struct op_ssend_recv_add_sr
{
//! Add data
template<typename T, typename D, typename S, int ... prp> static void execute(D & recv,S & v2, size_t i)
{
// Merge the information
recv.template add_prp<typename T::value_type,PtrMemory,openfpm::grow_policy_identity,openfpm::vect_isel<typename T::value_type>::value,prp...>(v2);
}
};
//! Helper class to add data with serialization
template<>
struct op_ssend_recv_add_sr<true>
{
//! Add data
template<typename T, typename D, typename S, int ... prp> static void execute(D & recv,S & v2, size_t i)
{
// Merge the information
recv.template add_prp<typename T::value_type,HeapMemory,openfpm::grow_policy_double,openfpm::vect_isel<typename T::value_type>::value, prp...>(v2);
}
};
//! Helper class to add data
template<typename op>
struct op_ssend_recv_add
{
//! Add data
template<bool sr, typename T, typename D, typename S, int ... prp> static void execute(D & recv,S & v2, size_t i)
{
// Merge the information
op_ssend_recv_add_sr<sr>::template execute<T,D,S,prp...>(recv,v2,i);
}
};
//! Helper class to merge data without serialization
template<bool sr,template<typename,typename> class op>
struct op_ssend_recv_merge_impl
{
//! Merge the
template<typename T, typename D, typename S, int ... prp> inline static void execute(D & recv,S & v2,size_t i,openfpm::vector<openfpm::vector<aggregate<size_t,size_t>>> & opart)
{
// Merge the information
recv.template merge_prp_v<op,typename T::value_type, PtrMemory, openfpm::grow_policy_identity, prp...>(v2,opart.get(i));
}
};
//! Helper class to merge data with serialization
template<template<typename,typename> class op>
struct op_ssend_recv_merge_impl<true,op>
{
//! merge the data
template<typename T, typename D, typename S, int ... prp> inline static void execute(D & recv,S & v2,size_t i,openfpm::vector<openfpm::vector<aggregate<size_t,size_t>>> & opart)
{
// Merge the information
recv.template merge_prp_v<op,typename T::value_type, HeapMemory, openfpm::grow_policy_double, prp...>(v2,opart.get(i));
}
};
//! Helper class to merge data
template<template<typename,typename> class op>
struct op_ssend_recv_merge
{
//! For each processor contain the list of the particles with which I must merge the information
openfpm::vector<openfpm::vector<aggregate<size_t,size_t>>> & opart;
//! constructor
op_ssend_recv_merge(openfpm::vector<openfpm::vector<aggregate<size_t,size_t>>> & opart)
:opart(opart)
{}
//! execute the merge
template<bool sr, typename T, typename D, typename S, int ... prp> void execute(D & recv,S & v2,size_t i)
{
op_ssend_recv_merge_impl<sr,op>::template execute<T,D,S,prp...>(recv,v2,i,opart);
}
};
//! Helper class to merge data without serialization
template<bool sr>
struct op_ssend_gg_recv_merge_impl
{
//! Merge the
template<typename T, typename D, typename S, int ... prp> inline static void execute(D & recv,S & v2,size_t i,size_t & start)
{
// Merge the information
recv.template merge_prp_v<replace_,typename T::value_type, PtrMemory, openfpm::grow_policy_identity, prp...>(v2,start);
start += v2.size();
}
};
//! Helper class to merge data with serialization
template<>
struct op_ssend_gg_recv_merge_impl<true>
{
//! merge the data
template<typename T, typename D, typename S, int ... prp> inline static void execute(D & recv,S & v2,size_t i,size_t & start)
{
// Merge the information
recv.template merge_prp_v<replace_,typename T::value_type, HeapMemory, openfpm::grow_policy_double, prp...>(v2,start);
// from
start += v2.size();
}
};
//! Helper class to merge data
struct op_ssend_gg_recv_merge
{
//! starting marker
size_t start;
//! constructor
op_ssend_gg_recv_merge(size_t start)
:start(start)
{}
//! execute the merge
template<bool sr, typename T, typename D, typename S, int ... prp> void execute(D & recv,S & v2,size_t i)
{
op_ssend_gg_recv_merge_impl<sr>::template execute<T,D,S,prp...>(recv,v2,i,start);
}
};
//////////////////////////////////////////////////
//! temporal buffer for reductions
union red
......@@ -203,7 +75,6 @@ union red
double d;
};
/*! \brief This class virtualize the cluster of PC as a set of processes that communicate
*
* At the moment it is an MPI-like interface, with a more type aware, and simple, interface.
......@@ -228,7 +99,7 @@ union red
*
*/
class Vcluster
class Vcluster_base
{
//! log file
Vcluster_log log;
......@@ -293,9 +164,6 @@ class Vcluster
//! vector of the size of send buffers
openfpm::vector<size_t> sz_send;
//! Receive buffers
openfpm::vector<BHeapMemory> recv_buf;
//! barrier request
MPI_Request bar_req;
......@@ -303,17 +171,22 @@ class Vcluster
MPI_Status bar_stat;
//! disable operator=
Vcluster & operator=(const Vcluster &) {return *this;};
Vcluster_base & operator=(const Vcluster_base &) {return *this;};
//! disable copy constructor
Vcluster(const Vcluster &)
Vcluster_base(const Vcluster_base &)
:NBX_cnt(0)
{};
protected:
//! Receive buffers
openfpm::vector<BHeapMemory> recv_buf;
public:
// Finalize the MPI program
~Vcluster()
~Vcluster_base()
{
#ifdef SE_CLASS2
check_delete(this);
......@@ -342,7 +215,7 @@ public:
* \param argv pointer to arguments vector passed to the program
*
*/
Vcluster(int *argc, char ***argv)
Vcluster_base(int *argc, char ***argv)
:NBX_cnt(0)
{
#ifdef SE_CLASS2
......@@ -1024,101 +897,10 @@ public:
req.clear();
stat.clear();
}
/////////////////////// Semantic communication ///////////////////////
#include "VCluster_semantic.ipp"
};
// Function to initialize the global VCluster //
extern Vcluster * global_v_cluster_private;
/*! \brief Initialize a global instance of Runtime Virtual Cluster Machine
*
* Initialize a global instance of Runtime Virtual Cluster Machine
*
*/
static inline void init_global_v_cluster_private(int *argc, char ***argv)
{
if (global_v_cluster_private == NULL)
global_v_cluster_private = new Vcluster(argc,argv);
}
static inline void delete_global_v_cluster_private()
{
delete global_v_cluster_private;
}
static inline Vcluster & create_vcluster()
{
#ifdef SE_CLASS1
if (global_v_cluster_private == NULL)
std::cerr << __FILE__ << ":" << __LINE__ << " Error you must call openfpm_init before using any distributed data structures";
#endif
return *global_v_cluster_private;
}
/*! \brief Check if the library has been initialized
*
* \return true if the library has been initialized
*
*/
static inline bool is_openfpm_init()
{
return ofp_initialized;
}
/*! \brief Initialize the library
*
* This function MUST be called before any other function
*
*/
static inline void openfpm_init(int *argc, char ***argv)
{
#ifdef HAVE_PETSC
PetscInitialize(argc,argv,NULL,NULL);
#endif
init_global_v_cluster_private(argc,argv);
#ifdef SE_CLASS1
std::cout << "OpenFPM is compiled with debug mode LEVEL:1. Remember to remove SE_CLASS1 when you go in production" << std::endl;
#endif
#ifdef SE_CLASS2
std::cout << "OpenFPM is compiled with debug mode LEVEL:2. Remember to remove SE_CLASS2 when you go in production" << std::endl;
#endif
ofp_initialized = true;
}
/*! \brief Finalize the library
*
* This function MUST be called at the end of the program
*
*/
static inline void openfpm_finalize()
{
#ifdef HAVE_PETSC
PetscFinalize();
#endif
delete_global_v_cluster_private();
ofp_initialized = false;
}
#endif
src/VCluster/VCluster_meta_function.hpp 0 → 100644
View file @ 7545a755
/*
* VCluster_meta_function.hpp
*
* Created on: Dec 8, 2016
* Author: i-bird
*/
#ifndef OPENFPM_VCLUSTER_SRC_VCLUSTER_VCLUSTER_META_FUNCTION_HPP_
#define OPENFPM_VCLUSTER_SRC_VCLUSTER_VCLUSTER_META_FUNCTION_HPP_
#include "memory/BHeapMemory.hpp"
#include "Packer_Unpacker/has_max_prop.hpp"
template<bool result, typename T, typename S>
struct unpack_selector_with_prp
{
template<typename op, int ... prp> static void call_unpack(S & recv, openfpm::vector<BHeapMemory> & recv_buf, openfpm::vector<size_t> * sz, openfpm::vector<size_t> * sz_byte, op & op_param)
{
if (sz_byte != NULL)
sz_byte->resize(recv_buf.size());
for (size_t i = 0 ; i < recv_buf.size() ; i++)
{
T unp;
ExtPreAlloc<HeapMemory> & mem = *(new ExtPreAlloc<HeapMemory>(recv_buf.get(i).size(),recv_buf.get(i)));
mem.incRef();
Unpack_stat ps;
Unpacker<T,HeapMemory>::template unpack<>(mem, unp, ps);
size_t recv_size_old = recv.size();
// Merge the information
op_param.template execute<true,T,decltype(recv),decltype(unp),prp...>(recv,unp,i);
size_t recv_size_new = recv.size();
if (sz_byte != NULL)
sz_byte->get(i) = recv_buf.get(i).size();
if (sz != NULL)
sz->get(i) = recv_size_new - recv_size_old;
mem.decRef();
delete &mem;
}
}
};
//
template<typename T, typename S>
struct unpack_selector_with_prp<true,T,S>
{
template<typename op, unsigned int ... prp> static void call_unpack(S & recv, openfpm::vector<BHeapMemory> & recv_buf, openfpm::vector<size_t> * sz, openfpm::vector<size_t> * sz_byte, op & op_param)
{
if (sz_byte != NULL)
sz_byte->resize(recv_buf.size());
for (size_t i = 0 ; i < recv_buf.size() ; i++)
{
// calculate the number of received elements
size_t n_ele = recv_buf.get(i).size() / sizeof(typename T::value_type);
// add the received particles to the vector
PtrMemory * ptr1 = new PtrMemory(recv_buf.get(i).getPointer(),recv_buf.get(i).size());
// create vector representation to a piece of memory already allocated
openfpm::vector<typename T::value_type,PtrMemory,typename memory_traits_lin<typename T::value_type>::type, memory_traits_lin,openfpm::grow_policy_identity> v2;
v2.setMemory(*ptr1);
// resize with the number of elements
v2.resize(n_ele);
// Merge the information
size_t recv_size_old = recv.size();
op_param.template execute<false,T,decltype(recv),decltype(v2),prp...>(recv,v2,i);
size_t recv_size_new = recv.size();
if (sz_byte != NULL)
sz_byte->get(i) = recv_buf.get(i).size();
if (sz != NULL)
sz->get(i) = recv_size_new - recv_size_old;
}
}
};
template<typename T>
struct call_serialize_variadic {};
template<int ... prp>
struct call_serialize_variadic<index_tuple<prp...>>
{
template<typename T> inline static void call_pr(T & send, size_t & tot_size)
{
Packer<T,HeapMemory>::template packRequest<prp...>(send,tot_size);
}
template<typename T> inline static void call_pack(ExtPreAlloc<HeapMemory> & mem, T & send, Pack_stat & sts)
{
Packer<T,HeapMemory>::template pack<prp...>(mem,send,sts);
}
template<typename op, typename T, typename S> inline static void call_unpack(S & recv, openfpm::vector<BHeapMemory> & recv_buf, openfpm::vector<size_t> * sz, openfpm::vector<size_t> * sz_byte, op & op_param)
{
const bool result = has_pack_gen<typename T::value_type>::value == false && is_vector<T>::value == true;
unpack_selector_with_prp<result, T, S>::template call_unpack<op,prp...>(recv, recv_buf, sz, sz_byte, op_param);
}
};
//! There is max_prop inside
template<bool cond, typename op, typename T, typename S, unsigned int ... prp>
struct pack_unpack_cond_with_prp
{
static void packingRequest(T & send, size_t & tot_size, openfpm::vector<size_t> & sz)
{
typedef typename ::generate_indexes<int, has_max_prop<T, has_value_type<T>::value>::number, MetaFuncOrd>::result ind_prop_to_pack;
if (has_pack_gen<typename T::value_type>::value == false && is_vector<T>::value == true)
//if (has_pack<typename T::value_type>::type::value == false && has_pack_agg<typename T::value_type>::result::value == false && is_vector<T>::value == true)
{
sz.add(send.size()*sizeof(typename T::value_type));
}
else
{
call_serialize_variadic<ind_prop_to_pack>::call_pr(send,tot_size);
sz.add(tot_size);
}
}
static void packing(ExtPreAlloc<HeapMemory> & mem, T & send, Pack_stat & sts, openfpm::vector<const void *> & send_buf)
{
typedef typename ::generate_indexes<int, has_max_prop<T, has_value_type<T>::value>::number, MetaFuncOrd>::result ind_prop_to_pack;
if (has_pack_gen<typename T::value_type>::value == false && is_vector<T>::value == true)
//if (has_pack<typename T::value_type>::type::value == false && has_pack_agg<typename T::value_type>::result::value == false && is_vector<T>::value == true)
{
//std::cout << demangle(typeid(T).name()) << std::endl;
send_buf.add(send.getPointer());
}
else
{
send_buf.add(mem.getPointerEnd());
call_serialize_variadic<ind_prop_to_pack>::call_pack(mem,send,sts);
}
}
static void unpacking(S & recv, openfpm::vector<BHeapMemory> & recv_buf, openfpm::vector<size_t> * sz, openfpm::vector<size_t> * sz_byte, op & op_param)
{
typedef index_tuple<prp...> ind_prop_to_pack;
call_serialize_variadic<ind_prop_to_pack>::template call_unpack<op,T,S>(recv, recv_buf, sz, sz_byte, op_param);
}
};
/////////////////////////////
//! Helper class to add data without serialization
template<bool sr>
struct op_ssend_recv_add_sr
{
//! Add data
template<typename T, typename D, typename S, int ... prp> static void execute(D & recv,S & v2, size_t i)
{
// Merge the information
recv.template add_prp<typename T::value_type,PtrMemory,openfpm::grow_policy_identity,openfpm::vect_isel<typename T::value_type>::value,prp...>(v2);
}
};
//! Helper class to add data with serialization
template<>
struct op_ssend_recv_add_sr<true>
{
//! Add data
template<typename T, typename D, typename S, int ... prp> static void execute(D & recv,S & v2, size_t i)
{
// Merge the information
recv.template add_prp<typename T::value_type,HeapMemory,openfpm::grow_policy_double,openfpm::vect_isel<typename T::value_type>::value, prp...>(v2);
}
};
//! Helper class to add data
template<typename op>
struct op_ssend_recv_add
{
//! Add data
template<bool sr, typename T, typename D, typename S, int ... prp> static void execute(D & recv,S & v2, size_t i)
{
// Merge the information
op_ssend_recv_add_sr<sr>::template execute<T,D,S,prp...>(recv,v2,i);
}
};
//! Helper class to merge data without serialization
template<bool sr,template<typename,typename> class op>
struct op_ssend_recv_merge_impl
{
//! Merge the
template<typename T, typename D, typename S, int ... prp> inline static void execute(D & recv,S & v2,size_t i,openfpm::vector<openfpm::vector<aggregate<size_t,size_t>>> & opart)
{
// Merge the information
recv.template merge_prp_v<op,typename T::value_type, PtrMemory, openfpm::grow_policy_identity, prp...>(v2,opart.get(i));
}
};
//! Helper class to merge data with serialization
template<template<typename,typename> class op>
struct op_ssend_recv_merge_impl<true,op>
{
//! merge the data
template<typename T, typename D, typename S, int ... prp> inline static void execute(D & recv,S & v2,size_t i,openfpm::vector<openfpm::vector<aggregate<size_t,size_t>>> & opart)
{
// Merge the information
recv.template merge_prp_v<op,typename T::value_type, HeapMemory, openfpm::grow_policy_double, prp...>(v2,opart.get(i));
}
};
//! Helper class to merge data
template<template<typename,typename> class op>
struct op_ssend_recv_merge
{
//! For each processor contain the list of the particles with which I must merge the information
openfpm::vector<openfpm::vector<aggregate<size_t,size_t>>> & opart;
//! constructor
op_ssend_recv_merge(openfpm::vector<openfpm::vector<aggregate<size_t,size_t>>> & opart)
:opart(opart)
{}
//! execute the merge
template<bool sr, typename T, typename D, typename S, int ... prp> void execute(D & recv,S & v2,size_t i)
{
op_ssend_recv_merge_impl<sr,op>::template execute<T,D,S,prp...>(recv,v2,i,opart);
}
};
//! Helper class to merge data without serialization
template<bool sr>
struct op_ssend_gg_recv_merge_impl
{
//! Merge the
template<typename T, typename D, typename S, int ... prp> inline static void execute(D & recv,S & v2,size_t i,size_t & start)
{
// Merge the information
recv.template merge_prp_v<replace_,typename T::value_type, PtrMemory, openfpm::grow_policy_identity, prp...>(v2,start);
start += v2.size();
}
};
//! Helper class to merge data with serialization
template<>
struct op_ssend_gg_recv_merge_impl<true>
{
//! merge the data
template<typename T, typename D, typename S, int ... prp> inline static void execute(D & recv,S & v2,size_t i,size_t & start)
{
// Merge the information
recv.template merge_prp_v<replace_,typename T::value_type, HeapMemory, openfpm::grow_policy_double, prp...>(v2,start);
// from
start += v2.size();
}
};
//! Helper class to merge data
struct op_ssend_gg_recv_merge
{
//! starting marker
size_t start;
//! constructor
op_ssend_gg_recv_merge(size_t start)
:start(start)
{}
//! execute the merge
template<bool sr, typename T, typename D, typename S, int ... prp> void execute(D & recv,S & v2,size_t i)
{
op_ssend_gg_recv_merge_impl<sr>::template execute<T,D,S,prp...>(recv,v2,i,start);
}
};
//////////////////////////////////////////////////
#endif /* OPENFPM_VCLUSTER_SRC_VCLUSTER_VCLUSTER_META_FUNCTION_HPP_ */
src/VCluster_semantic_unit_tests.hpp → src/VCluster/VCluster_semantic_unit_tests.hpp
View file @ 7545a755
......@@ -650,29 +650,54 @@ BOOST_AUTO_TEST_CASE (Vcluster_semantic_sendrecv)