Skip to content

Commit becfd38

Browse files
authored
[CANN] Fix cann compilation error (ggml-org#9891)
Fix cann compilation error after merging llama.cpp supports dynamically loadable backends.
1 parent 755a9b2 commit becfd38

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

ggml/src/ggml-cann.cpp

+5-6
Original file line numberDiff line numberDiff line change
@@ -1148,6 +1148,7 @@ ggml_backend_cann_buffer_type(int32_t device) {
11481148
for (int32_t i = 0; i < GGML_CANN_MAX_DEVICES; i++) {
11491149
ggml_backend_cann_buffer_types[i] = {
11501150
/* .iface = */ ggml_backend_cann_buffer_type_interface,
1151+
/* .device = */ nullptr,
11511152
/* .context = */
11521153
new ggml_backend_cann_buffer_type_context{
11531154
i, "CANN" + std::to_string(i)},
@@ -1868,7 +1869,7 @@ static ggml_backend_event_t ggml_backend_cann_event_new(
18681869
ACL_CHECK(aclrtCreateEvent(&event));
18691870

18701871
return new ggml_backend_event{
1871-
/* .backend = */ backend,
1872+
/* .device = */ nullptr,
18721873
/* .context = */ event,
18731874
};
18741875
}
@@ -1895,10 +1896,9 @@ static void ggml_backend_cann_event_free(ggml_backend_event_t event) {
18951896
*
18961897
* @param event Pointer to the event structure to be recorded.
18971898
*/
1898-
static void ggml_backend_cann_event_record(ggml_backend_event_t event) {
1899+
static void ggml_backend_cann_event_record(ggml_backend_t backend, ggml_backend_event_t event) {
18991900
ggml_backend_cann_context* cann_ctx =
1900-
(ggml_backend_cann_context*)event->backend->context;
1901-
1901+
(ggml_backend_cann_context*)backend->context;
19021902
ACL_CHECK(aclrtRecordEvent((aclrtEvent)event->context, cann_ctx->stream()));
19031903
}
19041904

@@ -1916,8 +1916,7 @@ static void ggml_backend_cann_event_wait(ggml_backend_t backend,
19161916
ggml_backend_event_t event) {
19171917
ggml_backend_cann_context* cann_ctx =
19181918
(ggml_backend_cann_context*)backend->context;
1919-
1920-
if (ggml_backend_is_cann(event->backend)) {
1919+
if (ggml_backend_is_cann(backend)) {
19211920
ACL_CHECK(aclrtStreamWaitEvent(cann_ctx->stream(),
19221921
(aclrtEvent)event->context));
19231922
} else {

0 commit comments

Comments
 (0)