Skip to content

Commit 4e4ff76

Browse files
authored
Revert "use the correct SYCL context for host USM allocations (#7777)"
This reverts commit af4ae50.
1 parent fd5ea0f commit 4e4ff76

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

ggml-sycl.cpp

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13089,12 +13089,10 @@ void *ggml_sycl_host_malloc(size_t size) try {
1308913089
return nullptr;
1309013090
}
1309113091

13092-
ggml_sycl_set_device(g_main_device);
13093-
dpct::queue_ptr main_stream = g_syclStreams[g_main_device][0];
13094-
1309513092
void * ptr = nullptr;
13093+
//allow to use dpct::get_in_order_queue() for host malloc
1309613094
dpct::err0 err = CHECK_TRY_ERROR(
13097-
ptr = (void *)sycl::malloc_host(size, *main_stream));
13095+
ptr = (void *)sycl::malloc_host(size, dpct::get_in_order_queue()));
1309813096

1309913097
if (err != 0) {
1310013098
// clear the error
@@ -13115,9 +13113,8 @@ catch (sycl::exception const &exc) {
1311513113
}
1311613114

1311713115
void ggml_sycl_host_free(void *ptr) try {
13118-
ggml_sycl_set_device(g_main_device);
13119-
dpct::queue_ptr main_stream = g_syclStreams[g_main_device][0];
13120-
SYCL_CHECK(CHECK_TRY_ERROR(sycl::free(ptr, *main_stream)));
13116+
//allow to use dpct::get_in_order_queue() for host malloc
13117+
SYCL_CHECK(CHECK_TRY_ERROR(sycl::free(ptr, dpct::get_in_order_queue())));
1312113118
}
1312213119
catch (sycl::exception const &exc) {
1312313120
std::cerr << exc.what() << "Exception caught at file:" << __FILE__

0 commit comments

Comments
 (0)