Skip to content

Commit 1fd15c0

Browse files
MC952-archMC952-arch
authored
Fix async error reporting and memory type handling in CCLAdaptor and DeviceAdaptor (#266)
1 parent 6db7a25 commit 1fd15c0

25 files changed

Lines changed: 93 additions & 84 deletions

‎.github/workflows/test.yml‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,15 @@ jobs:
5050
apt update -y
5151
apt-get install clang-format -y
5252
git fetch --all
53-
from_ref=${GITHUB_HEAD_REF}
54-
to_ref=${GITHUB_BASE_REF}
55-
56-
echo "From branch: $from_ref, To branch: $to_ref"
57-
58-
pre-commit run --from-ref "origin/$from_ref" --to-ref "origin/$to_ref"
53+
if [ -n "$GITHUB_HEAD_REF" ] && [ -n "$GITHUB_BASE_REF" ]; then
54+
from_ref="origin/$GITHUB_HEAD_REF"
55+
to_ref="origin/$GITHUB_BASE_REF"
56+
else
57+
from_ref="HEAD^"
58+
to_ref="HEAD"
59+
fi
60+
echo "From reference: $from_ref; To reference: $to_ref"
61+
pre-commit run --from-ref "$from_ref" --to-ref "$to_ref"
5962
continue-on-error: false
6063

6164
- name: Check the current working directory

‎.github/workflows/torch-api-test.yml‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,15 @@ jobs:
4747
run: |
4848
cd /__w/FlagCX/FlagCX
4949
git fetch --all
50-
from_ref=${GITHUB_HEAD_REF}
51-
to_ref=${GITHUB_BASE_REF}
52-
53-
echo "From branch: $from_ref, To branch: $to_ref"
54-
55-
pre-commit run --from-ref "origin/$from_ref" --to-ref "origin/$to_ref"
50+
if [ -n "$GITHUB_HEAD_REF" ] && [ -n "$GITHUB_BASE_REF" ]; then
51+
from_ref="origin/$GITHUB_HEAD_REF"
52+
to_ref="origin/$GITHUB_BASE_REF"
53+
else
54+
from_ref="HEAD^"
55+
to_ref="HEAD"
56+
fi
57+
echo "From reference: $from_ref; To reference: $to_ref"
58+
pre-commit run --from-ref "$from_ref" --to-ref "$to_ref"
5659
continue-on-error: false
5760

5861
- name: Run `make` to build the project

‎.github/workflows/unit-test.yml‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,15 @@ jobs:
5050
apt update -y
5151
apt-get install clang-format -y
5252
git fetch --all
53-
from_ref=${GITHUB_HEAD_REF}
54-
to_ref=${GITHUB_BASE_REF}
55-
56-
echo "From branch: $from_ref, To branch: $to_ref"
57-
58-
pre-commit run --from-ref "origin/$from_ref" --to-ref "origin/$to_ref"
53+
if [ -n "$GITHUB_HEAD_REF" ] && [ -n "$GITHUB_BASE_REF" ]; then
54+
from_ref="origin/$GITHUB_HEAD_REF"
55+
to_ref="origin/$GITHUB_BASE_REF"
56+
else
57+
from_ref="HEAD^"
58+
to_ref="HEAD"
59+
fi
60+
echo "From reference: $from_ref; To reference: $to_ref"
61+
pre-commit run --from-ref "$from_ref" --to-ref "$to_ref"
5962
continue-on-error: false
6063

6164
- name: Build Google Test

‎flagcx/adaptor/ccl/bootstrap_adaptor.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ flagcxResult_t bootstrapAdaptorCommUserRank(const flagcxInnerComm_t comm,
8080

8181
// TODO: unsupported
8282
flagcxResult_t bootstrapAdaptorCommGetAsyncError(flagcxInnerComm_t comm,
83-
flagcxResult_t asyncError) {
83+
flagcxResult_t *asyncError) {
8484
return flagcxNotSupported;
8585
}
8686

‎flagcx/adaptor/ccl/cncl_adaptor.cc‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,9 @@ flagcxResult_t cnclAdaptorCommUserRank(const flagcxInnerComm_t comm,
106106
return (flagcxResult_t)c2f_ret_map[cnclGetCommRank(rank, comm->base)];
107107
}
108108

109-
// TODO: change params's type from flagcxResult_t to flagcxResult_t*
110109
flagcxResult_t cnclAdaptorCommGetAsyncError(flagcxInnerComm_t comm,
111-
flagcxResult_t asyncError) {
112-
asyncError = c2f_ret_map[cnclGetCommAsyncError(comm->base)];
110+
flagcxResult_t *asyncError) {
111+
*asyncError = c2f_ret_map[cnclGetCommAsyncError(comm->base)];
113112
return flagcxSuccess;
114113
}
115114

‎flagcx/adaptor/ccl/dunccl_adaptor.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ flagcxResult_t duncclAdaptorCommUserRank(const flagcxInnerComm_t comm,
6767
}
6868

6969
flagcxResult_t duncclAdaptorCommGetAsyncError(flagcxInnerComm_t comm,
70-
flagcxResult_t asyncError) {
70+
flagcxResult_t *asyncError) {
7171
return (flagcxResult_t)ncclCommGetAsyncError(comm->base,
72-
(ncclResult_t *)&asyncError);
72+
(ncclResult_t *)asyncError);
7373
}
7474

7575
// TODO: unsupported

‎flagcx/adaptor/ccl/gloo_adaptor.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ flagcxResult_t glooAdaptorCommUserRank(const flagcxInnerComm_t comm,
111111

112112
// TODO: unsupported
113113
flagcxResult_t glooAdaptorCommGetAsyncError(flagcxInnerComm_t comm,
114-
flagcxResult_t asyncError) {
114+
flagcxResult_t *asyncError) {
115115
return flagcxNotSupported;
116116
}
117117

‎flagcx/adaptor/ccl/hccl_adaptor.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ flagcxResult_t hcclAdaptorCommUserRank(const flagcxInnerComm_t comm,
137137

138138
// TODO: unsupported
139139
flagcxResult_t hcclAdaptorCommGetAsyncError(flagcxInnerComm_t comm,
140-
flagcxResult_t asyncError) {
140+
flagcxResult_t *asyncError) {
141141
return flagcxNotSupported;
142142
}
143143

‎flagcx/adaptor/ccl/ixnccl_adaptor.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ flagcxResult_t ixncclAdaptorCommUserRank(const flagcxInnerComm_t comm,
6767
}
6868

6969
flagcxResult_t ixncclAdaptorCommGetAsyncError(flagcxInnerComm_t comm,
70-
flagcxResult_t asyncError) {
70+
flagcxResult_t *asyncError) {
7171
return (flagcxResult_t)ncclCommGetAsyncError(comm->base,
72-
(ncclResult_t *)&asyncError);
72+
(ncclResult_t *)asyncError);
7373
}
7474

7575
// TODO: unsupported

‎flagcx/adaptor/ccl/mccl_adaptor.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ flagcxResult_t mcclAdaptorCommUserRank(const flagcxInnerComm_t comm,
7171
}
7272

7373
flagcxResult_t mcclAdaptorCommGetAsyncError(flagcxInnerComm_t comm,
74-
flagcxResult_t asyncError) {
74+
flagcxResult_t *asyncError) {
7575
return (flagcxResult_t)mcclCommGetAsyncError(comm->base,
76-
(mcclResult_t *)&asyncError);
76+
(mcclResult_t *)asyncError);
7777
}
7878

7979
// TODO: unsupported

0 commit comments

Comments
 (0)