Skip to content

Commit 639d921

Browse files
Merge pull request #337 from YdrMaster/main
issue/158/feat: 接入天数 ccl
2 parents 2ef0f5a + 9d2a96d commit 639d921

File tree

2 files changed

+16
-13
lines changed

2 files changed

+16
-13
lines changed

src/infiniccl-test/infiniccl_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#define TEST_INFINI(API__) CHECK_API_OR(API__, INFINI_STATUS_SUCCESS, return 1)
1111
#define TEST_INFINI_THREAD(API__) CHECK_API_OR(API__, INFINI_STATUS_SUCCESS, return nullptr)
1212

13-
const size_t MAX_COUNT = 100ULL * 1024 * 1024;
13+
const size_t MAX_COUNT = 8ULL * 1024 * 1024;
1414

1515
const size_t TEST_COUNTS[] = {
1616
128,

src/infiniccl/infiniccl.cc

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@ __C infiniStatus_t infinicclCommInitAll(
1212

1313
#define COMM_INIT_ALL(CASE_, NAMESPACE_) \
1414
case CASE_: \
15-
return infiniccl::NAMESPACE_::commInitAll(comms, ndevice, device_ids);
15+
return infiniccl::NAMESPACE_::commInitAll(comms, ndevice, device_ids)
1616

1717
switch (device_type) {
18-
COMM_INIT_ALL(INFINI_DEVICE_NVIDIA, cuda)
19-
COMM_INIT_ALL(INFINI_DEVICE_ASCEND, ascend)
20-
COMM_INIT_ALL(INFINI_DEVICE_METAX, metax)
18+
COMM_INIT_ALL(INFINI_DEVICE_NVIDIA, cuda);
19+
COMM_INIT_ALL(INFINI_DEVICE_ILUVATAR, cuda);
20+
COMM_INIT_ALL(INFINI_DEVICE_ASCEND, ascend);
21+
COMM_INIT_ALL(INFINI_DEVICE_METAX, metax);
2122
default:
2223
return INFINI_STATUS_DEVICE_TYPE_NOT_SUPPORTED;
2324
}
@@ -32,12 +33,13 @@ __C infiniStatus_t infinicclCommDestroy(infinicclComm_t comm) {
3233

3334
#define COMM_DESTROY(CASE_, NAMESPACE_) \
3435
case CASE_: \
35-
return infiniccl::NAMESPACE_::commDestroy(comm);
36+
return infiniccl::NAMESPACE_::commDestroy(comm)
3637

3738
switch (comm->device_type) {
38-
COMM_DESTROY(INFINI_DEVICE_NVIDIA, cuda)
39-
COMM_DESTROY(INFINI_DEVICE_ASCEND, ascend)
40-
COMM_DESTROY(INFINI_DEVICE_METAX, metax)
39+
COMM_DESTROY(INFINI_DEVICE_NVIDIA, cuda);
40+
COMM_DESTROY(INFINI_DEVICE_ILUVATAR, cuda);
41+
COMM_DESTROY(INFINI_DEVICE_ASCEND, ascend);
42+
COMM_DESTROY(INFINI_DEVICE_METAX, metax);
4143

4244
default:
4345
return INFINI_STATUS_DEVICE_TYPE_NOT_SUPPORTED;
@@ -60,12 +62,13 @@ __C infiniStatus_t infinicclAllReduce(
6062

6163
#define ALL_REDUCE(CASE_, NAMESPACE_) \
6264
case CASE_: \
63-
return infiniccl::NAMESPACE_::allReduce(sendbuf, recvbuf, count, dataype, op, comm, stream);
65+
return infiniccl::NAMESPACE_::allReduce(sendbuf, recvbuf, count, dataype, op, comm, stream)
6466

6567
switch (comm->device_type) {
66-
ALL_REDUCE(INFINI_DEVICE_NVIDIA, cuda)
67-
ALL_REDUCE(INFINI_DEVICE_ASCEND, ascend)
68-
ALL_REDUCE(INFINI_DEVICE_METAX, metax)
68+
ALL_REDUCE(INFINI_DEVICE_NVIDIA, cuda);
69+
ALL_REDUCE(INFINI_DEVICE_ILUVATAR, cuda);
70+
ALL_REDUCE(INFINI_DEVICE_ASCEND, ascend);
71+
ALL_REDUCE(INFINI_DEVICE_METAX, metax);
6972

7073
default:
7174
return INFINI_STATUS_DEVICE_TYPE_NOT_SUPPORTED;

0 commit comments

Comments
 (0)