Unverified Commit 639d921e authored by PanZezhong1725's avatar PanZezhong1725 Committed by GitHub
Browse files

Merge pull request #337 from YdrMaster/main

issue/158/feat: 接入天数 ccl
parents 2ef0f5a7 9d2a96dd
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#define TEST_INFINI(API__) CHECK_API_OR(API__, INFINI_STATUS_SUCCESS, return 1) #define TEST_INFINI(API__) CHECK_API_OR(API__, INFINI_STATUS_SUCCESS, return 1)
#define TEST_INFINI_THREAD(API__) CHECK_API_OR(API__, INFINI_STATUS_SUCCESS, return nullptr) #define TEST_INFINI_THREAD(API__) CHECK_API_OR(API__, INFINI_STATUS_SUCCESS, return nullptr)
const size_t MAX_COUNT = 100ULL * 1024 * 1024; const size_t MAX_COUNT = 8ULL * 1024 * 1024;
const size_t TEST_COUNTS[] = { const size_t TEST_COUNTS[] = {
128, 128,
......
...@@ -12,12 +12,13 @@ __C infiniStatus_t infinicclCommInitAll( ...@@ -12,12 +12,13 @@ __C infiniStatus_t infinicclCommInitAll(
#define COMM_INIT_ALL(CASE_, NAMESPACE_) \ #define COMM_INIT_ALL(CASE_, NAMESPACE_) \
case CASE_: \ case CASE_: \
return infiniccl::NAMESPACE_::commInitAll(comms, ndevice, device_ids); return infiniccl::NAMESPACE_::commInitAll(comms, ndevice, device_ids)
switch (device_type) { switch (device_type) {
COMM_INIT_ALL(INFINI_DEVICE_NVIDIA, cuda) COMM_INIT_ALL(INFINI_DEVICE_NVIDIA, cuda);
COMM_INIT_ALL(INFINI_DEVICE_ASCEND, ascend) COMM_INIT_ALL(INFINI_DEVICE_ILUVATAR, cuda);
COMM_INIT_ALL(INFINI_DEVICE_METAX, metax) COMM_INIT_ALL(INFINI_DEVICE_ASCEND, ascend);
COMM_INIT_ALL(INFINI_DEVICE_METAX, metax);
default: default:
return INFINI_STATUS_DEVICE_TYPE_NOT_SUPPORTED; return INFINI_STATUS_DEVICE_TYPE_NOT_SUPPORTED;
} }
...@@ -32,12 +33,13 @@ __C infiniStatus_t infinicclCommDestroy(infinicclComm_t comm) { ...@@ -32,12 +33,13 @@ __C infiniStatus_t infinicclCommDestroy(infinicclComm_t comm) {
#define COMM_DESTROY(CASE_, NAMESPACE_) \ #define COMM_DESTROY(CASE_, NAMESPACE_) \
case CASE_: \ case CASE_: \
return infiniccl::NAMESPACE_::commDestroy(comm); return infiniccl::NAMESPACE_::commDestroy(comm)
switch (comm->device_type) { switch (comm->device_type) {
COMM_DESTROY(INFINI_DEVICE_NVIDIA, cuda) COMM_DESTROY(INFINI_DEVICE_NVIDIA, cuda);
COMM_DESTROY(INFINI_DEVICE_ASCEND, ascend) COMM_DESTROY(INFINI_DEVICE_ILUVATAR, cuda);
COMM_DESTROY(INFINI_DEVICE_METAX, metax) COMM_DESTROY(INFINI_DEVICE_ASCEND, ascend);
COMM_DESTROY(INFINI_DEVICE_METAX, metax);
default: default:
return INFINI_STATUS_DEVICE_TYPE_NOT_SUPPORTED; return INFINI_STATUS_DEVICE_TYPE_NOT_SUPPORTED;
...@@ -60,12 +62,13 @@ __C infiniStatus_t infinicclAllReduce( ...@@ -60,12 +62,13 @@ __C infiniStatus_t infinicclAllReduce(
#define ALL_REDUCE(CASE_, NAMESPACE_) \ #define ALL_REDUCE(CASE_, NAMESPACE_) \
case CASE_: \ case CASE_: \
return infiniccl::NAMESPACE_::allReduce(sendbuf, recvbuf, count, dataype, op, comm, stream); return infiniccl::NAMESPACE_::allReduce(sendbuf, recvbuf, count, dataype, op, comm, stream)
switch (comm->device_type) { switch (comm->device_type) {
ALL_REDUCE(INFINI_DEVICE_NVIDIA, cuda) ALL_REDUCE(INFINI_DEVICE_NVIDIA, cuda);
ALL_REDUCE(INFINI_DEVICE_ASCEND, ascend) ALL_REDUCE(INFINI_DEVICE_ILUVATAR, cuda);
ALL_REDUCE(INFINI_DEVICE_METAX, metax) ALL_REDUCE(INFINI_DEVICE_ASCEND, ascend);
ALL_REDUCE(INFINI_DEVICE_METAX, metax);
default: default:
return INFINI_STATUS_DEVICE_TYPE_NOT_SUPPORTED; return INFINI_STATUS_DEVICE_TYPE_NOT_SUPPORTED;
......
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