1. remove static variable char_contiguous.

PeizeLin · PeizeLin · commit 778d0bdd03c3 · 2024-11-10T12:55:08.000+08:00
change Cereal_Func from namespace to class.
diff --git a/include/Comm/Comm_Keys/Comm_Keys_31-sr.h b/include/Comm/Comm_Keys/Comm_Keys_31-sr.h
@@ -5,6 +5,8 @@
 
 #pragma once
 
+#include "../global/Cereal_Func.h"
+
 #include <vector>
 #include <functional>
 #include <mpi.h>
@@ -15,14 +17,14 @@ namespace Comm
 template<typename Tkey, typename Tkeys_provide, typename Tkeys_require>
 class Comm_Keys_31
 {
-public:
+  public:
 	Comm_Keys_31(const MPI_Comm &mpi_comm_in);
 
 	std::vector<std::vector<Tkey>> trans(
 		const Tkeys_provide &keys_provide_mine,
 		const Tkeys_require &keys_require_mine);
 
-protected:
+  protected:
 	void send_keys_require_mine(
 		const Tkeys_require &keys_require_mine);
 
@@ -40,6 +42,7 @@ class Comm_Keys_31
 	int rank_size;
 
 	const int tag_keys = 99;
+	Comm::Cereal_Func cereal_func;
 };
 
 template<typename Tkey, typename Tkeys_provide, typename Tkeys_require>
diff --git a/include/Comm/Comm_Keys/Comm_Keys_31-sr.hpp b/include/Comm/Comm_Keys/Comm_Keys_31-sr.hpp
@@ -6,7 +6,6 @@
 #pragma once
 
 #include "Comm_Keys_31-sr.h"
-#include "../global/Cereal_Func.h"
 
 #include <mpi.h>
 #include <thread>
@@ -109,14 +108,14 @@ void Comm_Keys_31<Tkey,Tkeys_provide,Tkeys_require>::send_keys_require_mine(
 		cereal::BinaryOutputArchive ar(ss_isend);
 		ar(keys_require_mine);
 	}
-	const std::size_t exponent_align = Cereal_Func::align_stringstream(ss_isend);
+	const std::size_t exponent_align = this->cereal_func.align_stringstream(ss_isend);
 	const std::string str_isend = ss_isend.str();
 
 	std::vector<MPI_Request> requests_isend(this->rank_size);
 	for(int rank_recv_tmp=1; rank_recv_tmp<this->rank_size; ++rank_recv_tmp)
 	{
 		const int rank_recv = (this->rank_mine + rank_recv_tmp) % this->rank_size;
-		Cereal_Func::mpi_isend(str_isend, exponent_align, rank_recv, this->tag_keys, this->mpi_comm, requests_isend[rank_recv]);
+		this->cereal_func.mpi_isend(str_isend, exponent_align, rank_recv, this->tag_keys, this->mpi_comm, requests_isend[rank_recv]);
 		std::this_thread::yield();
 	}
 
@@ -140,7 +139,7 @@ void Comm_Keys_31<Tkey,Tkeys_provide,Tkeys_require>::recv_require_intersection(
 	std::vector<std::vector<Tkey>> &keys_trans_list)
 {
 	Tkeys_require keys_require;
-	const MPI_Status status_recv = Cereal_Func::mpi_recv( this->mpi_comm,
+	const MPI_Status status_recv = this->cereal_func.mpi_recv( this->mpi_comm,
 		keys_require);
 	const int rank_require = status_recv.MPI_SOURCE;
 	assert(this->tag_keys==status_recv.MPI_TAG);
diff --git a/include/Comm/Comm_Keys/Comm_Keys_32-sr.h b/include/Comm/Comm_Keys/Comm_Keys_32-sr.h
@@ -5,6 +5,8 @@
 
 #pragma once
 
+#include "../global/Cereal_Func.h"
+
 #include <vector>
 #include <functional>
 #include <mpi.h>
@@ -44,6 +46,7 @@ class Comm_Keys_32
 	int rank_size;
 
 	const int tag_keys = 88;
+	Comm::Cereal_Func cereal_func;
 	std::shared_mutex lock_provide;
 };
 
diff --git a/include/Comm/Comm_Keys/Comm_Keys_32-sr.hpp b/include/Comm/Comm_Keys/Comm_Keys_32-sr.hpp
@@ -107,14 +107,14 @@ void Comm_Keys_32<Tkey,Tkeys_provide,Tkeys_require>::send_keys_require_mine(
 		cereal::BinaryOutputArchive ar(ss_isend);
 		ar(keys_require_mine);
 	}
-	const std::size_t exponent_align = Cereal_Func::align_stringstream(ss_isend);
+	const std::size_t exponent_align = this->cereal_func.align_stringstream(ss_isend);
 	const std::string str_isend = ss_isend.str();
 
 	std::vector<MPI_Request> requests_isend(this->rank_size);
 	for(int rank_recv_tmp=1; rank_recv_tmp<this->rank_size; ++rank_recv_tmp)
 	{
 		const int rank_recv = (this->rank_mine + rank_recv_tmp) % this->rank_size;
-		Cereal_Func::mpi_isend(str_isend, exponent_align, rank_recv, this->tag_keys, this->mpi_comm, requests_isend[rank_recv]);
+		this->cereal_func.mpi_isend(str_isend, exponent_align, rank_recv, this->tag_keys, this->mpi_comm, requests_isend[rank_recv]);
 		std::this_thread::yield();
 	}
 
@@ -138,7 +138,7 @@ void Comm_Keys_32<Tkey,Tkeys_provide,Tkeys_require>::recv_require_intersection(
 	std::vector<std::vector<Tkey>> &keys_trans_list)
 {
 	Tkeys_require keys_require;
-	const MPI_Status status_recv = Cereal_Func::mpi_recv( this->mpi_comm,
+	const MPI_Status status_recv = this->cereal_func.mpi_recv( this->mpi_comm,
 		keys_require);
 	const int rank_require = status_recv.MPI_SOURCE;
 	assert(this->tag_keys==status_recv.MPI_TAG);
diff --git a/include/Comm/Comm_Trans/Comm_Trans.h b/include/Comm/Comm_Trans/Comm_Trans.h
@@ -51,7 +51,7 @@ class Comm_Trans
 		Tdatas_recv &datas_recv);
 
 private:
-	void isend_data (const int rank_isend, const Tdatas_isend &datas_isend, std::string &str_isend, MPI_Request &request_isend, std::atomic<std::size_t> &memory_max_isend) const;
+	void isend_data (const int rank_isend, const Tdatas_isend &datas_isend, std::string &str_isend, MPI_Request &request_isend, std::atomic<std::size_t> &memory_max_isend);
 	void recv_data (Tdatas_recv &datas_recv, const MPI_Status status_recv, MPI_Message message_recv, std::atomic_flag &lock_set_value, std::atomic<std::size_t> &memory_max_isend);
 	void post_process(
 		std::vector<MPI_Request> &requests_isend,
@@ -67,6 +67,7 @@ class Comm_Trans
 
 private:
 	const int tag_data = 0;
+	Comm::Cereal_Func cereal_func;
 };
 
 }
diff --git a/include/Comm/Comm_Trans/Comm_Trans.hpp b/include/Comm/Comm_Trans/Comm_Trans.hpp
@@ -112,7 +112,7 @@ void Comm_Trans<Tkey,Tvalue,Tdatas_isend,Tdatas_recv>::isend_data(
 	const Tdatas_isend &datas_isend,
 	std::string &str_isend,
 	MPI_Request &request_isend,
-	std::atomic<std::size_t> &memory_max_isend) const
+	std::atomic<std::size_t> &memory_max_isend)
 {
 	std::stringstream ss_isend;
 	{
@@ -132,10 +132,10 @@ void Comm_Trans<Tkey,Tvalue,Tdatas_isend,Tdatas_recv>::isend_data(
 		ss_isend.rdbuf()->pubseekpos(0);		// 返回size_item的占位，序列化真正的size_item值
 		oar(size_item);
 	} // end cereal::BinaryOutputArchive
-	const std::size_t exponent_align = Cereal_Func::align_stringstream(ss_isend);
+	const std::size_t exponent_align = this->cereal_func.align_stringstream(ss_isend);
 	str_isend = ss_isend.str();
 	memory_max_isend.store( std::max(str_isend.size()*sizeof(char), memory_max_isend.load()) );
-	Cereal_Func::mpi_isend(str_isend, exponent_align, rank_isend, this->tag_data, this->mpi_comm, request_isend);
+	this->cereal_func.mpi_isend(str_isend, exponent_align, rank_isend, this->tag_data, this->mpi_comm, request_isend);
 }
 
 
@@ -148,7 +148,7 @@ void Comm_Trans<Tkey,Tvalue,Tdatas_isend,Tdatas_recv>::recv_data (
 	std::atomic_flag &lock_set_value,
 	std::atomic<std::size_t> &memory_max_recv)
 {
-	std::vector<char> buffer_recv = Cereal_Func::mpi_mrecv(message_recv, status_recv);
+	std::vector<char> buffer_recv = this->cereal_func.mpi_mrecv(message_recv, status_recv);
 
 	std::stringstream ss_recv;
 	ss_recv.rdbuf()->pubsetbuf(buffer_recv.data(), buffer_recv.size());
diff --git a/include/Comm/global/Cereal_Func.h b/include/Comm/global/Cereal_Func.h
@@ -5,43 +5,54 @@
 
 #pragma once
 
+#include "MPI_Wrapper.h"
+
 #include <mpi.h>
 #include <sstream>
 #include <vector>
 
 namespace Comm
 {
 
-namespace Cereal_Func
+class Cereal_Func
 {
+  public:
+
+	// every 2^exponent_align char concatenate to 1 word
+	inline std::size_t align_stringstream(std::stringstream &ss);
+
 	// Send str
-	extern inline void mpi_send(const std::string &str, const std::size_t exponent_align, const int rank_recv, const int tag, const MPI_Comm &mpi_comm);
+	inline void mpi_send(const std::string &str, const std::size_t exponent_align, const int rank_recv, const int tag, const MPI_Comm &mpi_comm);
 
 	// Send data
 	template<typename... Ts>
-	extern void mpi_send(const int rank_recv, const int tag, const MPI_Comm &mpi_comm,
+	void mpi_send(const int rank_recv, const int tag, const MPI_Comm &mpi_comm,
 		const Ts&... data);
 
 	// Isend str
-	extern inline void mpi_isend(const std::string &str, const std::size_t exponent_align, const int rank_recv, const int tag, const MPI_Comm &mpi_comm, MPI_Request &request);
+	inline void mpi_isend(const std::string &str, const std::size_t exponent_align, const int rank_recv, const int tag, const MPI_Comm &mpi_comm, MPI_Request &request);
 
 	// Isend data using temporary memory str
 	template<typename... Ts>
-	extern void mpi_isend(const int rank_recv, const int tag, const MPI_Comm &mpi_comm,
+	void mpi_isend(const int rank_recv, const int tag, const MPI_Comm &mpi_comm,
 		std::string &str, MPI_Request &request,
 		const Ts&... data);
 
+	// Recv to return
+	inline std::vector<char> mpi_recv(const MPI_Comm &mpi_comm, MPI_Status &status);
+
 	// Recv to data
 	template<typename... Ts>
-	extern MPI_Status mpi_recv(const MPI_Comm &mpi_comm,
+	MPI_Status mpi_recv(const MPI_Comm &mpi_comm,
 		Ts&... data);
 
 	// Mrecv to return
-	extern inline std::vector<char> mpi_mrecv(MPI_Message &message_recv, const MPI_Status &status);
+	inline std::vector<char> mpi_mrecv(MPI_Message &message_recv, const MPI_Status &status);
 
-	// every 2^exponent_align char concatenate to 1 word
-	extern inline std::size_t align_stringstream(std::stringstream &ss);
-}
+  private:
+
+	MPI_Wrapper::MPI_Type_Contiguous_Pool char_contiguous{MPI_CHAR};
+};
 
 }
 
diff --git a/include/Comm/global/Cereal_Func.hpp b/include/Comm/global/Cereal_Func.hpp
diff --git a/include/Comm/global/MPI_Wrapper.h b/include/Comm/global/MPI_Wrapper.h
diff --git a/unittests/global/Cereal_Test.hpp b/unittests/global/Cereal_Test.hpp

Original file line number	Diff line number	Diff line change
`@@ -107,14 +107,14 @@ void Comm_Keys_32<Tkey,Tkeys_provide,Tkeys_require>::send_keys_require_mine(`
`107`	`107`	`cereal::BinaryOutputArchive ar(ss_isend);`
`108`	`108`	`ar(keys_require_mine);`
`109`	`109`	`}`
`110`		`- const std::size_t exponent_align = Cereal_Func::align_stringstream(ss_isend);`
	`110`	`+ const std::size_t exponent_align = this->cereal_func.align_stringstream(ss_isend);`
`111`	`111`	`const std::string str_isend = ss_isend.str();`
`112`	`112`
`113`	`113`	`std::vector<MPI_Request> requests_isend(this->rank_size);`
`114`	`114`	`for(int rank_recv_tmp=1; rank_recv_tmp<this->rank_size; ++rank_recv_tmp)`
`115`	`115`	`{`
`116`	`116`	`const int rank_recv = (this->rank_mine + rank_recv_tmp) % this->rank_size;`
`117`		`- Cereal_Func::mpi_isend(str_isend, exponent_align, rank_recv, this->tag_keys, this->mpi_comm, requests_isend[rank_recv]);`
	`117`	`+ this->cereal_func.mpi_isend(str_isend, exponent_align, rank_recv, this->tag_keys, this->mpi_comm, requests_isend[rank_recv]);`
`118`	`118`	`std::this_thread::yield();`
`119`	`119`	`}`
`120`	`120`
`@@ -138,7 +138,7 @@ void Comm_Keys_32<Tkey,Tkeys_provide,Tkeys_require>::recv_require_intersection(`
`138`	`138`	`std::vector<std::vector<Tkey>> &keys_trans_list)`
`139`	`139`	`{`
`140`	`140`	`Tkeys_require keys_require;`
`141`		`- const MPI_Status status_recv = Cereal_Func::mpi_recv( this->mpi_comm,`
	`141`	`+ const MPI_Status status_recv = this->cereal_func.mpi_recv( this->mpi_comm,`
`142`	`142`	`keys_require);`
`143`	`143`	`const int rank_require = status_recv.MPI_SOURCE;`
`144`	`144`	`assert(this->tag_keys==status_recv.MPI_TAG);`