Commit fc67fe7c authored by incardon's avatar incardon

Make send generic + Fix jenkins script

parent 3d5287d0
...@@ -77,15 +77,15 @@ then ...@@ -77,15 +77,15 @@ then
make make
if [ $? -ne 0 ]; then exit 1 ; fi if [ $? -ne 0 ]; then exit 1 ; fi
salloc -n16 --time=00:05:00 --mem-per-cpu=1900 --partition=sandy mpirun -np 16 src/vcluster salloc --nodes=1 --ntasks-per-node=16 --time=00:05:00 --mem-per-cpu=1900 --partition=sandy mpirun -np 16 src/vcluster
if [ $? -ne 0 ]; then exit 1 ; fi if [ $? -ne 0 ]; then exit 1 ; fi
salloc -n32 --time=00:05:00 --mem-per-cpu=1900 --partition=sandy mpirun -np 32 src/vcluster salloc --nodes=2 --ntasks-per-node=16 --time=00:05:00 --mem-per-cpu=1900 --partition=sandy mpirun -np 32 src/vcluster
if [ $? -ne 0 ]; then exit 1 ; fi if [ $? -ne 0 ]; then exit 1 ; fi
salloc -n64 --time=00:05:00 --mem-per-cpu=1900 --partition=sandy mpirun -np 64 src/vcluster salloc --nodes=4 --ntasks-per-node=16 --time=00:05:00 --mem-per-cpu=1900 --partition=sandy mpirun -np 64 src/vcluster
if [ $? -ne 0 ]; then exit 1 ; fi if [ $? -ne 0 ]; then exit 1 ; fi
salloc -n128 --time=00:05:00 --mem-per-cpu=1900 --partition=sandy mpirun -np 128 src/vcluster salloc --nodes=8 --ntasks-per-node=16 --time=00:05:00 --mem-per-cpu=1900 --partition=sandy mpirun -np 128 src/vcluster
if [ $? -ne 0 ]; then exit 1 ; fi if [ $? -ne 0 ]; then exit 1 ; fi
salloc -n256 --time=00:5:00 --mem-per-cpu=1900 --partition=sandy mpirun -np 256 src/vcluster salloc --nodes=16 --ntasks-per-node=16 --time=00:5:00 --mem-per-cpu=1900 --partition=sandy mpirun -np 256 src/vcluster
if [ $? -ne 0 ]; then exit 1 ; fi if [ $? -ne 0 ]; then exit 1 ; fi
else else
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include "Vector/map_vector.hpp" #include "Vector/map_vector.hpp"
#ifdef DEBUG #ifdef DEBUG
#include "util/check_no_pointers.hpp" #include "util/check_no_pointers.hpp"
#include "util.hpp" #include "util/util_debug.hpp"
#endif #endif
#include "util/Vcluster_log.hpp" #include "util/Vcluster_log.hpp"
...@@ -720,8 +720,10 @@ public: ...@@ -720,8 +720,10 @@ public:
* \param tag id * \param tag id
* \param v buffer to send * \param v buffer to send
* *
* \return true if succeed false otherwise
*
*/ */
template<typename T> bool send(size_t proc, size_t tag, openfpm::vector<T> & v) template<typename T, typename ly, typename Mem, typename gr> bool send(size_t proc, size_t tag, openfpm::vector<T,ly,Mem,gr> & v)
{ {
#ifdef DEBUG #ifdef DEBUG
checkType<T>(); checkType<T>();
...@@ -732,8 +734,10 @@ public: ...@@ -732,8 +734,10 @@ public:
// Create one request // Create one request
req.add(); req.add();
// reduce // send
MPI_IsendW<T>::send(proc,SEND_RECV_BASE + tag,v,req.last()); MPI_IsendW<T>::send(proc,SEND_RECV_BASE + tag,v,req.last());
return true;
} }
/*! \brief Recv data from a processor /*! \brief Recv data from a processor
...@@ -750,6 +754,8 @@ public: ...@@ -750,6 +754,8 @@ public:
* \param tag id * \param tag id
* \param v buffer to send * \param v buffer to send
* *
* \return true if succeed false otherwise
*
*/ */
template<typename T> bool recv(size_t proc, size_t tag, openfpm::vector<T> & v) template<typename T> bool recv(size_t proc, size_t tag, openfpm::vector<T> & v)
{ {
...@@ -762,8 +768,10 @@ public: ...@@ -762,8 +768,10 @@ public:
// Create one request // Create one request
req.add(); req.add();
// reduce // receive
MPI_IrecvW<T>::recv(proc,SEND_RECV_BASE + tag,v,req.last()); MPI_IrecvW<T>::recv(proc,SEND_RECV_BASE + tag,v,req.last());
return true;
} }
/*! \brief Execute all the requests /*! \brief Execute all the requests
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment