[fix] 补齐experimental重名头文件整改-hcomm-AtomGit

已合并

[fix] 补齐experimental重名头文件整改 #4839

[fix] 补齐experimental重名头文件整改 #4839

已合并

YantingLiu创建于 11 天前

共 4 个文件变更+7-8

	@@ -21,7 +21,7 @@
21		21
22	// Orion	22	// Orion
23	#include "socket.h"	23	#include "socket.h"
24	-#include "local_rdma_rma_buffer.h"	24	+#include "local_rdma_rma_buffer_v2.h"
25	#include "remote_rma_buffer.h"	25	#include "remote_rma_buffer.h"
26	#include "host_rdma_connection.h"	26	#include "host_rdma_connection.h"
27	#include "task_param.h"	27	#include "task_param.h"

	@@ -18,7 +18,7 @@
18	#include "hccl_mem.h"	18	#include "hccl_mem.h"
19	#include "exchange_rdma_buffer_dto.h"	19	#include "exchange_rdma_buffer_dto.h"
20	#include "local_rdma_rma_buffer_manager.h"	20	#include "local_rdma_rma_buffer_manager.h"
21	-#include "local_rdma_rma_buffer.h"	21	+#include "local_rdma_rma_buffer_v2.h"
22	#include "hccl_one_sided_data.h"	22	#include "hccl_one_sided_data.h"
23		23
24	namespace hcomm_experimental {	24	namespace hcomm_experimental {

	@@ -17,10 +17,9 @@
17	#include "reged_mem_mgr.h"	17	#include "reged_mem_mgr.h"
18	#include "rma_buffer_mgr.h"	18	#include "rma_buffer_mgr.h"
19	#include "buffer_key.h"	19	#include "buffer_key.h"
20	-#include "local_rdma_rma_buffer.h"	20	+#include "local_rdma_rma_buffer_v2.h"
21	#include "remote_rma_buffer.h"	21	#include "remote_rma_buffer.h"
22	#include "exchange_rdma_buffer_dto.h"	22	#include "exchange_rdma_buffer_dto.h"
23	-#include "local_rdma_rma_buffer.h"
24		23
25	namespace hcomm_experimental {	24	namespace hcomm_experimental {
26	/**	25	/**
	@@ -29,9 +28,9 @@ namespace hcomm_experimental {
29	class RoceRegedMemMgr : public RegedMemMgr {	28	class RoceRegedMemMgr : public RegedMemMgr {
30	public:	29	public:
31	using LocalRdmaRmaBufferMgr	30	using LocalRdmaRmaBufferMgr
32	- = Hccl::RmaBufferMgr<Hccl::BufferKey<uintptr_t, u64>, std::shared_ptr<Hccl::LocalRdmaRmaBuffer>>;	31	+ = hcomm::RmaBufferMgr<Hccl::BufferKey<uintptr_t, u64>, std::shared_ptr<Hccl::LocalRdmaRmaBuffer>>;
33	using RemoteRdmaRmaBufferMgr	32	using RemoteRdmaRmaBufferMgr
34	- = Hccl::RmaBufferMgr<Hccl::BufferKey<uintptr_t, u64>, std::shared_ptr<Hccl::RemoteRdmaRmaBuffer>>;	33	+ = hcomm::RmaBufferMgr<Hccl::BufferKey<uintptr_t, u64>, std::shared_ptr<Hccl::RemoteRdmaRmaBuffer>>;
35		34
36	RoceRegedMemMgr();	35	RoceRegedMemMgr();
37	~RoceRegedMemMgr() = default;	36	~RoceRegedMemMgr() = default;

	@@ -28,9 +28,9 @@ namespace hcomm_experimental {
28	class UbRegedMemMgr : public RegedMemMgr {	28	class UbRegedMemMgr : public RegedMemMgr {
29	public:	29	public:
30	using LocalUbRmaBufferMgr	30	using LocalUbRmaBufferMgr
31	- = Hccl::RmaBufferMgr<Hccl::BufferKey<uintptr_t, u64>, std::shared_ptr<Hccl::LocalUbRmaBuffer>>;	31	+ = hcomm::RmaBufferMgr<Hccl::BufferKey<uintptr_t, u64>, std::shared_ptr<Hccl::LocalUbRmaBuffer>>;
32	using RemoteUbRmaBufferMgr	32	using RemoteUbRmaBufferMgr
33	- = Hccl::RmaBufferMgr<Hccl::BufferKey<uintptr_t, u64>, std::shared_ptr<Hccl::RemoteUbRmaBuffer>>;	33	+ = hcomm::RmaBufferMgr<Hccl::BufferKey<uintptr_t, u64>, std::shared_ptr<Hccl::RemoteUbRmaBuffer>>;
34		34
35	UbRegedMemMgr();	35	UbRegedMemMgr();
36	~UbRegedMemMgr() = default;	36	~UbRegedMemMgr() = default;