Skip to content

Commit 6b5cc31

Browse files
zihugithubzihugithub
authored
Merge branch 'main' into ConfigureGemini251027
2 parents ad7acaf + 23a5bc5 commit 6b5cc31

37 files changed

Lines changed: 309 additions & 134 deletions

‎.github/workflows/test.yml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,9 @@ jobs:
5353
if [ -n "$GITHUB_HEAD_REF" ] && [ -n "$GITHUB_BASE_REF" ]; then
5454
from_ref="origin/$GITHUB_HEAD_REF"
5555
to_ref="origin/$GITHUB_BASE_REF"
56-
else
57-
from_ref="HEAD^"
58-
to_ref="HEAD"
56+
echo "From reference: $from_ref; To reference: $to_ref"
57+
pre-commit run --from-ref "$from_ref" --to-ref "$to_ref"
5958
fi
60-
echo "From reference: $from_ref; To reference: $to_ref"
61-
pre-commit run --from-ref "$from_ref" --to-ref "$to_ref"
6259
continue-on-error: false
6360

6461
- name: Check the current working directory

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,9 @@ jobs:
5050
if [ -n "$GITHUB_HEAD_REF" ] && [ -n "$GITHUB_BASE_REF" ]; then
5151
from_ref="origin/$GITHUB_HEAD_REF"
5252
to_ref="origin/$GITHUB_BASE_REF"
53-
else
54-
from_ref="HEAD^"
55-
to_ref="HEAD"
53+
echo "From reference: $from_ref; To reference: $to_ref"
54+
pre-commit run --from-ref "$from_ref" --to-ref "$to_ref"
5655
fi
57-
echo "From reference: $from_ref; To reference: $to_ref"
58-
pre-commit run --from-ref "$from_ref" --to-ref "$to_ref"
5956
continue-on-error: false
6057

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

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,9 @@ jobs:
5353
if [ -n "$GITHUB_HEAD_REF" ] && [ -n "$GITHUB_BASE_REF" ]; then
5454
from_ref="origin/$GITHUB_HEAD_REF"
5555
to_ref="origin/$GITHUB_BASE_REF"
56-
else
57-
from_ref="HEAD^"
58-
to_ref="HEAD"
56+
echo "From reference: $from_ref; To reference: $to_ref"
57+
pre-commit run --from-ref "$from_ref" --to-ref "$to_ref"
5958
fi
60-
echo "From reference: $from_ref; To reference: $to_ref"
61-
pre-commit run --from-ref "$from_ref" --to-ref "$to_ref"
6259
continue-on-error: false
6360

6461
- name: Build Google Test

‎.pre-commit-config.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
11
repos:
2+
- repo: local
3+
hooks:
4+
- id: clang-format-dry-run
5+
name: clang-format-dry-run
6+
entry: clang-format --dry-run --Werror
7+
files: \.(cpp|cc|h|hpp)$
8+
language: system
9+
210
- repo: local
311
hooks:
412
- id: clang-format

‎Makefile‎

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ LIBSRCFILES:= \
248248
$(wildcard flagcx/adaptor/device/*.cc) \
249249
$(wildcard flagcx/adaptor/ccl/*.cc) \
250250
$(wildcard flagcx/adaptor/net/*.cc) \
251-
$(wildcard flagcx/adaptor/tuner/tuner_util.cc) \
251+
$(wildcard flagcx/adaptor/tuner/*.cc) \
252252
$(wildcard flagcx/service/*.cc)
253253

254254
LIBOBJ := $(LIBSRCFILES:%.cc=$(OBJDIR)/%.o)

‎flagcx/adaptor/device/cann_adaptor.cc‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,13 @@ flagcxResult_t cannAdaptorStreamWaitEvent(flagcxStream_t stream,
163163
return flagcxSuccess;
164164
}
165165

166-
flagcxResult_t cannAdaptorEventCreate(flagcxEvent_t *event) {
166+
flagcxResult_t cannAdaptorEventCreate(flagcxEvent_t *event,
167+
flagcxEventType_t eventType) {
167168
(*event) = NULL;
168169
flagcxCalloc(event, 1);
169-
DEVCHECK(aclrtCreateEventWithFlag((aclrtEvent *)(*event), ACL_EVENT_SYNC));
170+
const unsigned int flags =
171+
(eventType == flagcxEventDefault) ? ACL_EVENT_TIME_LINE : ACL_EVENT_SYNC;
172+
DEVCHECK(aclrtCreateEventWithFlag(&((*event)->base), flags));
170173
return flagcxSuccess;
171174
}
172175

‎flagcx/adaptor/device/cuda_adaptor.cc‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,11 +234,14 @@ flagcxResult_t cudaAdaptorStreamWaitEvent(flagcxStream_t stream,
234234
return flagcxSuccess;
235235
}
236236

237-
flagcxResult_t cudaAdaptorEventCreate(flagcxEvent_t *event) {
237+
flagcxResult_t cudaAdaptorEventCreate(flagcxEvent_t *event,
238+
flagcxEventType_t eventType) {
238239
(*event) = NULL;
239240
flagcxCalloc(event, 1);
240-
DEVCHECK(cudaEventCreateWithFlags((cudaEvent_t *)(*event),
241-
cudaEventDisableTiming));
241+
const unsigned int flags = (eventType == flagcxEventDefault)
242+
? cudaEventDefault
243+
: cudaEventDisableTiming;
244+
DEVCHECK(cudaEventCreateWithFlags(&((*event)->base), flags));
242245
return flagcxSuccess;
243246
}
244247

‎flagcx/adaptor/device/ducuda_adaptor.cc‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,11 +179,14 @@ flagcxResult_t ducudaAdaptorStreamWaitEvent(flagcxStream_t stream,
179179
return flagcxSuccess;
180180
}
181181

182-
flagcxResult_t ducudaAdaptorEventCreate(flagcxEvent_t *event) {
182+
flagcxResult_t ducudaAdaptorEventCreate(flagcxEvent_t *event,
183+
flagcxEventType_t eventType) {
183184
(*event) = NULL;
184185
flagcxCalloc(event, 1);
185-
DEVCHECK(cudaEventCreateWithFlags((cudaEvent_t *)(*event),
186-
cudaEventDisableTiming));
186+
const unsigned int flags = (eventType == flagcxEventDefault)
187+
? cudaEventDefault
188+
: cudaEventDisableTiming;
189+
DEVCHECK(cudaEventCreateWithFlags(&((*event)->base), flags));
187190
return flagcxSuccess;
188191
}
189192

‎flagcx/adaptor/device/hip_adaptor.cc‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,11 +176,14 @@ flagcxResult_t hipAdaptorStreamWaitEvent(flagcxStream_t stream,
176176
return flagcxSuccess;
177177
}
178178

179-
flagcxResult_t hipAdaptorEventCreate(flagcxEvent_t *event) {
179+
flagcxResult_t hipAdaptorEventCreate(flagcxEvent_t *event,
180+
flagcxEventType_t eventType) {
180181
(*event) = NULL;
181182
flagcxCalloc(event, 1);
182-
DEVCHECK(
183-
hipEventCreateWithFlags((hipEvent_t *)(*event), hipEventDisableTiming));
183+
const unsigned int flags = (eventType == flagcxEventDefault)
184+
? hipEventDefault
185+
: hipEventDisableTiming;
186+
DEVCHECK(hipEventCreateWithFlags(&((*event)->base), flags));
184187
return flagcxSuccess;
185188
}
186189

‎flagcx/adaptor/device/ixcuda_adaptor.cc‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,11 +178,15 @@ flagcxResult_t ixcudaAdaptorStreamWaitEvent(flagcxStream_t stream,
178178
return flagcxSuccess;
179179
}
180180

181-
flagcxResult_t ixcudaAdaptorEventCreate(flagcxEvent_t *event) {
181+
flagcxResult_t ixcudaAdaptorEventCreate(flagcxEvent_t *event,
182+
flagcxEventType_t eventType) {
182183
(*event) = NULL;
183184
flagcxCalloc(event, 1);
184-
DEVCHECK(cudaEventCreateWithFlags((cudaEvent_t *)(*event),
185-
cudaEventDisableTiming));
185+
const unsigned int flags = (eventType == flagcxEventDefault)
186+
? cudaEventDefault
187+
: cudaEventDisableTiming;
188+
DEVCHECK(cudaEventCreateWithFlags(&((*event)->base), flags));
189+
186190
return flagcxSuccess;
187191
}
188192

0 commit comments

Comments
 (0)