Skip to content

Commit 02ddbf2

Browse files
committed
Convert submit and parallel_for to use extension in ggml-sycl.cpp
1 parent 5b2a349 commit 02ddbf2

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

ggml/src/ggml-sycl/ggml-sycl.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1887,11 +1887,11 @@ static void argsort_f32_i32_sycl(const float *x, int *dst, const int ncols,
18871887
const size_t shared_mem = ncols_pad * sizeof(int);
18881888

18891889
if (order == GGML_SORT_ORDER_ASC) {
1890-
stream->submit([&](sycl::handler &cgh) {
1890+
syclex::submit(*stream,[&](sycl::handler &cgh) {
18911891
sycl::local_accessor<uint8_t, 1> dpct_local_acc_ct1(
18921892
sycl::range<1>(shared_mem), cgh);
18931893

1894-
cgh.parallel_for(
1894+
syclex::nd_launch(cgh,
18951895
sycl::nd_range<3>(block_nums * block_dims, block_dims),
18961896
[=](sycl::nd_item<3> item_ct1) {
18971897
k_argsort_f32_i32<GGML_SORT_ORDER_ASC>(
@@ -1901,11 +1901,11 @@ static void argsort_f32_i32_sycl(const float *x, int *dst, const int ncols,
19011901
});
19021902
});
19031903
} else if (order == GGML_SORT_ORDER_DESC) {
1904-
stream->submit([&](sycl::handler &cgh) {
1904+
syclex::submit(*stream,[&](sycl::handler &cgh) {
19051905
sycl::local_accessor<uint8_t, 1> dpct_local_acc_ct1(
19061906
sycl::range<1>(shared_mem), cgh);
19071907

1908-
cgh.parallel_for(
1908+
syclex::nd_launch(cgh,
19091909
sycl::nd_range<3>(block_nums * block_dims, block_dims),
19101910
[=](sycl::nd_item<3> item_ct1) {
19111911
k_argsort_f32_i32<GGML_SORT_ORDER_DESC>(
@@ -1925,13 +1925,13 @@ static void argmax_f32_i32_sycl(const float *x, int *dst, const int ncols,
19251925
const sycl::range<3> block_nums(1, nrows, 1);
19261926
const size_t shared_mem = 256 * sizeof(float);
19271927

1928-
stream->submit([&](sycl::handler &cgh) {
1928+
syclex::submit(*stream,[&](sycl::handler &cgh) {
19291929
sycl::local_accessor<float, 1> shared_data(
19301930
sycl::range<1>(shared_mem/sizeof(float)), cgh);
19311931
sycl::local_accessor<int, 1> shared_indices(
19321932
sycl::range<1>(shared_mem/sizeof(float)), cgh);
19331933

1934-
cgh.parallel_for(
1934+
syclex::nd_launch(cgh,
19351935
sycl::nd_range<3>(block_nums * block_dims, block_dims),
19361936
[=](sycl::nd_item<3> item_ct1) {
19371937
const int tid = item_ct1.get_local_id(2);
@@ -2952,7 +2952,7 @@ static void ggml_sycl_mul_mat_batched_sycl(ggml_backend_sycl_context & ctx, cons
29522952
void ** ptrs_dst_get = ptrs_dst.get();
29532953
size_t nb12_scaled = src1->type == GGML_TYPE_F16 ? nb12 : s12 * sizeof(sycl::half);
29542954
size_t nb13_scaled = src1->type == GGML_TYPE_F16 ? nb13 : s13 * sizeof(sycl::half);
2955-
cgh.parallel_for(sycl::nd_range<3>(block_dims, block_dims), [=](sycl::nd_item<3> item_ct1) {
2955+
syclex::nd_launch(cgh,sycl::nd_range<3>(block_dims, block_dims), [=](sycl::nd_item<3> item_ct1) {
29562956
k_compute_batched_ptrs(src0_f16, src1_f16, dst_ddf, ptrs_src_get, ptrs_dst_get, ne12, ne13, ne23, nb02,
29572957
nb03, nb12_scaled, nb13_scaled, nbd2, nbd3, r2, r3, item_ct1);
29582958
});
@@ -3456,7 +3456,7 @@ static void ggml_sycl_mul_mat_id(ggml_backend_sycl_context & ctx,
34563456
{
34573457
sycl::range<3> block_dims(1, 1, std::min((unsigned int)ne10, 768u));
34583458
sycl::range<3> grid_dims(1, n_ids, ids->ne[1]);
3459-
stream->submit([&](sycl::handler &cgh) {
3459+
syclex::submit(*stream,[&](sycl::handler &cgh) {
34603460
sycl::local_accessor<int, 0> src1_row_acc(cgh);
34613461

34623462
char *__restrict src1_contiguous_get =
@@ -3468,7 +3468,7 @@ static void ggml_sycl_mul_mat_id(ggml_backend_sycl_context & ctx,
34683468
size_t ids_nb_ct6 = ids->nb[1];
34693469
size_t ids_nb_ct7 = ids->nb[0];
34703470

3471-
cgh.parallel_for(
3471+
syclex::nd_launch(cgh,
34723472
sycl::nd_range<3>(grid_dims * block_dims, block_dims),
34733473
[=](sycl::nd_item<3> item_ct1) {
34743474
k_copy_src1_to_contiguous(
@@ -3501,13 +3501,13 @@ static void ggml_sycl_mul_mat_id(ggml_backend_sycl_context & ctx,
35013501
{
35023502
sycl::range<3> block_dims(1, 1, std::min((unsigned int)ne0, 768u));
35033503
sycl::range<3> grid_dims(1, 1, num_src1_rows);
3504-
stream->submit([&](sycl::handler &cgh) {
3504+
syclex::submit(*stream,[&](sycl::handler &cgh) {
35053505
const char *__restrict dst_contiguous_get =
35063506
dst_contiguous.get();
35073507
const mmid_row_mapping *__restrict dev_row_mapping_get =
35083508
dev_row_mapping.get();
35093509

3510-
cgh.parallel_for(
3510+
syclex::nd_launch(cgh,
35113511
sycl::nd_range<3>(grid_dims * block_dims, block_dims),
35123512
[=](sycl::nd_item<3> item_ct1) {
35133513
k_copy_dst_from_contiguous(dst_original,

0 commit comments

Comments
 (0)