@@ -1148,6 +1148,7 @@ ggml_backend_cann_buffer_type(int32_t device) {
1148
1148
for (int32_t i = 0 ; i < GGML_CANN_MAX_DEVICES; i++) {
1149
1149
ggml_backend_cann_buffer_types[i] = {
1150
1150
/* .iface = */ ggml_backend_cann_buffer_type_interface,
1151
+ /* .device = */ nullptr ,
1151
1152
/* .context = */
1152
1153
new ggml_backend_cann_buffer_type_context{
1153
1154
i, " CANN" + std::to_string (i)},
@@ -1868,7 +1869,7 @@ static ggml_backend_event_t ggml_backend_cann_event_new(
1868
1869
ACL_CHECK (aclrtCreateEvent (&event));
1869
1870
1870
1871
return new ggml_backend_event{
1871
- /* .backend = */ backend ,
1872
+ /* .device = */ nullptr ,
1872
1873
/* .context = */ event,
1873
1874
};
1874
1875
}
@@ -1895,10 +1896,9 @@ static void ggml_backend_cann_event_free(ggml_backend_event_t event) {
1895
1896
*
1896
1897
* @param event Pointer to the event structure to be recorded.
1897
1898
*/
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) {
1899
1900
ggml_backend_cann_context* cann_ctx =
1900
- (ggml_backend_cann_context*)event->backend ->context ;
1901
-
1901
+ (ggml_backend_cann_context*)backend->context ;
1902
1902
ACL_CHECK (aclrtRecordEvent ((aclrtEvent)event->context , cann_ctx->stream ()));
1903
1903
}
1904
1904
@@ -1916,8 +1916,7 @@ static void ggml_backend_cann_event_wait(ggml_backend_t backend,
1916
1916
ggml_backend_event_t event) {
1917
1917
ggml_backend_cann_context* cann_ctx =
1918
1918
(ggml_backend_cann_context*)backend->context ;
1919
-
1920
- if (ggml_backend_is_cann (event->backend )) {
1919
+ if (ggml_backend_is_cann (backend)) {
1921
1920
ACL_CHECK (aclrtStreamWaitEvent (cann_ctx->stream (),
1922
1921
(aclrtEvent)event->context ));
1923
1922
} else {
0 commit comments