Skip to content

Commit 76b2eb0

Browse files
oleksandr-pavlykoleksandr-pavlyk
authored
Merge pull request #1797 from IntelPython/sycl-free-noexcept
2 parents 52edb6d + 3dd4469 commit 76b2eb0

24 files changed

+316
-139
lines changed

‎dpctl/tensor/libtensor/include/kernels/accumulators.hpp‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232

3333
#include "dpctl_tensor_types.hpp"
3434
#include "utils/offset_utils.hpp"
35+
#include "utils/sycl_alloc_utils.hpp"
3536
#include "utils/sycl_utils.hpp"
3637
#include "utils/type_dispatch_building.hpp"
3738
#include "utils/type_utils.hpp"
@@ -436,7 +437,8 @@ sycl::event inclusive_scan_iter_1d(sycl::queue &exec_q,
436437
sycl::event free_ev = exec_q.submit([&](sycl::handler &cgh) {
437438
cgh.depends_on(dependent_event);
438439
const auto &ctx = exec_q.get_context();
439-
cgh.host_task([ctx, temp]() { sycl::free(temp, ctx); });
440+
using dpctl::tensor::alloc_utils::sycl_free_noexcept;
441+
cgh.host_task([ctx, temp]() { sycl_free_noexcept(temp, ctx); });
440442
});
441443
host_tasks.push_back(free_ev);
442444
}
@@ -765,7 +767,8 @@ sycl::event inclusive_scan_iter(sycl::queue &exec_q,
765767
sycl::event free_ev = exec_q.submit([&](sycl::handler &cgh) {
766768
cgh.depends_on(dependent_event);
767769
const auto &ctx = exec_q.get_context();
768-
cgh.host_task([ctx, temp]() { sycl::free(temp, ctx); });
770+
using dpctl::tensor::alloc_utils::sycl_free_noexcept;
771+
cgh.host_task([ctx, temp]() { sycl_free_noexcept(temp, ctx); });
769772
});
770773
host_tasks.push_back(free_ev);
771774
}
@@ -917,7 +920,9 @@ size_t cumsum_val_contig_impl(sycl::queue &q,
917920
});
918921
copy_e.wait();
919922
size_t return_val = static_cast<size_t>(*last_elem_host_usm);
920-
sycl::free(last_elem_host_usm, q);
923+
924+
using dpctl::tensor::alloc_utils::sycl_free_noexcept;
925+
sycl_free_noexcept(last_elem_host_usm, q);
921926

922927
return return_val;
923928
}
@@ -1026,7 +1031,9 @@ size_t cumsum_val_strided_impl(sycl::queue &q,
10261031
});
10271032
copy_e.wait();
10281033
size_t return_val = static_cast<size_t>(*last_elem_host_usm);
1029-
sycl::free(last_elem_host_usm, q);
1034+
1035+
using dpctl::tensor::alloc_utils::sycl_free_noexcept;
1036+
sycl_free_noexcept(last_elem_host_usm, q);
10301037

10311038
return return_val;
10321039
}

‎dpctl/tensor/libtensor/include/kernels/elementwise_functions/common.hpp‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include "kernels/alignment.hpp"
3232
#include "kernels/dpctl_tensor_types.hpp"
3333
#include "utils/offset_utils.hpp"
34+
#include "utils/sycl_alloc_utils.hpp"
3435

3536
namespace dpctl
3637
{
@@ -947,7 +948,9 @@ sycl::event binary_contig_matrix_contig_row_broadcast_impl(
947948
sycl::event tmp_cleanup_ev = exec_q.submit([&](sycl::handler &cgh) {
948949
cgh.depends_on(comp_ev);
949950
const sycl::context &ctx = exec_q.get_context();
950-
cgh.host_task([ctx, padded_vec]() { sycl::free(padded_vec, ctx); });
951+
using dpctl::tensor::alloc_utils::sycl_free_noexcept;
952+
cgh.host_task(
953+
[ctx, padded_vec]() { sycl_free_noexcept(padded_vec, ctx); });
951954
});
952955
host_tasks.push_back(tmp_cleanup_ev);
953956

@@ -1026,7 +1029,9 @@ sycl::event binary_contig_row_contig_matrix_broadcast_impl(
10261029
sycl::event tmp_cleanup_ev = exec_q.submit([&](sycl::handler &cgh) {
10271030
cgh.depends_on(comp_ev);
10281031
const sycl::context &ctx = exec_q.get_context();
1029-
cgh.host_task([ctx, padded_vec]() { sycl::free(padded_vec, ctx); });
1032+
using dpctl::tensor::alloc_utils::sycl_free_noexcept;
1033+
cgh.host_task(
1034+
[ctx, padded_vec]() { sycl_free_noexcept(padded_vec, ctx); });
10301035
});
10311036
host_tasks.push_back(tmp_cleanup_ev);
10321037

‎dpctl/tensor/libtensor/include/kernels/elementwise_functions/common_inplace.hpp‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030

3131
#include "kernels/alignment.hpp"
3232
#include "kernels/dpctl_tensor_types.hpp"
33+
#include "utils/offset_utils.hpp"
34+
#include "utils/sycl_alloc_utils.hpp"
3335

3436
namespace dpctl
3537
{
@@ -458,7 +460,9 @@ sycl::event binary_inplace_row_matrix_broadcast_impl(
458460
sycl::event tmp_cleanup_ev = exec_q.submit([&](sycl::handler &cgh) {
459461
cgh.depends_on(comp_ev);
460462
const sycl::context &ctx = exec_q.get_context();
461-
cgh.host_task([ctx, padded_vec]() { sycl::free(padded_vec, ctx); });
463+
using dpctl::tensor::alloc_utils::sycl_free_noexcept;
464+
cgh.host_task(
465+
[ctx, padded_vec]() { sycl_free_noexcept(padded_vec, ctx); });
462466
});
463467
host_tasks.push_back(tmp_cleanup_ev);
464468

‎dpctl/tensor/libtensor/include/kernels/linalg_functions/dot_product.hpp‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#include "kernels/dpctl_tensor_types.hpp"
3636
#include "kernels/reductions.hpp"
3737
#include "utils/offset_utils.hpp"
38+
#include "utils/sycl_alloc_utils.hpp"
3839
#include "utils/sycl_utils.hpp"
3940
#include "utils/type_utils.hpp"
4041

@@ -1153,8 +1154,9 @@ sycl::event dot_product_tree_impl(sycl::queue &exec_q,
11531154
cgh.depends_on(final_reduction_ev);
11541155
const sycl::context &ctx = exec_q.get_context();
11551156

1157+
using dpctl::tensor::alloc_utils::sycl_free_noexcept;
11561158
cgh.host_task([ctx, partially_reduced_tmp] {
1157-
sycl::free(partially_reduced_tmp, ctx);
1159+
sycl_free_noexcept(partially_reduced_tmp, ctx);
11581160
});
11591161
});
11601162

@@ -1403,8 +1405,9 @@ dot_product_contig_tree_impl(sycl::queue &exec_q,
14031405
cgh.depends_on(final_reduction_ev);
14041406
const sycl::context &ctx = exec_q.get_context();
14051407

1408+
using dpctl::tensor::alloc_utils::sycl_free_noexcept;
14061409
cgh.host_task([ctx, partially_reduced_tmp] {
1407-
sycl::free(partially_reduced_tmp, ctx);
1410+
sycl_free_noexcept(partially_reduced_tmp, ctx);
14081411
});
14091412
});
14101413

‎dpctl/tensor/libtensor/include/kernels/linalg_functions/gemm.hpp‎

Lines changed: 33 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#include "kernels/dpctl_tensor_types.hpp"
3636
#include "kernels/reductions.hpp"
3737
#include "utils/offset_utils.hpp"
38+
#include "utils/sycl_alloc_utils.hpp"
3839
#include "utils/sycl_utils.hpp"
3940
#include "utils/type_utils.hpp"
4041

@@ -2364,7 +2365,8 @@ gemm_batch_tree_k_impl(sycl::queue &exec_q,
23642365
cgh.depends_on(red_ev);
23652366
const sycl::context &ctx = exec_q.get_context();
23662367

2367-
cgh.host_task([ctx, tmp] { sycl::free(tmp, ctx); });
2368+
using dpctl::tensor::alloc_utils::sycl_free_noexcept;
2369+
cgh.host_task([ctx, tmp] { sycl_free_noexcept(tmp, ctx); });
23682370
});
23692371
return cleanup_host_task_event;
23702372
}
@@ -2427,8 +2429,9 @@ gemm_batch_tree_k_impl(sycl::queue &exec_q,
24272429
cgh.depends_on(red_ev);
24282430
const sycl::context &ctx = exec_q.get_context();
24292431

2432+
using dpctl::tensor::alloc_utils::sycl_free_noexcept;
24302433
cgh.host_task([ctx, partially_reduced_tmp] {
2431-
sycl::free(partially_reduced_tmp, ctx);
2434+
sycl_free_noexcept(partially_reduced_tmp, ctx);
24322435
});
24332436
});
24342437

@@ -2661,7 +2664,8 @@ gemm_batch_tree_nm_impl(sycl::queue &exec_q,
26612664
cgh.depends_on(red_ev);
26622665
const sycl::context &ctx = exec_q.get_context();
26632666

2664-
cgh.host_task([ctx, tmp] { sycl::free(tmp, ctx); });
2667+
using dpctl::tensor::alloc_utils::sycl_free_noexcept;
2668+
cgh.host_task([ctx, tmp] { sycl_free_noexcept(tmp, ctx); });
26652669
});
26662670
return cleanup_host_task_event;
26672671
}
@@ -2728,8 +2732,9 @@ gemm_batch_tree_nm_impl(sycl::queue &exec_q,
27282732
cgh.depends_on(red_ev);
27292733
const sycl::context &ctx = exec_q.get_context();
27302734

2735+
using dpctl::tensor::alloc_utils::sycl_free_noexcept;
27312736
cgh.host_task([ctx, partially_reduced_tmp] {
2732-
sycl::free(partially_reduced_tmp, ctx);
2737+
sycl_free_noexcept(partially_reduced_tmp, ctx);
27332738
});
27342739
});
27352740

@@ -3038,7 +3043,8 @@ gemm_batch_contig_tree_k_impl(sycl::queue &exec_q,
30383043
cgh.depends_on(red_ev);
30393044
const sycl::context &ctx = exec_q.get_context();
30403045

3041-
cgh.host_task([ctx, tmp] { sycl::free(tmp, ctx); });
3046+
using dpctl::tensor::alloc_utils::sycl_free_noexcept;
3047+
cgh.host_task([ctx, tmp] { sycl_free_noexcept(tmp, ctx); });
30423048
});
30433049
return cleanup_host_task_event;
30443050
}
@@ -3097,8 +3103,9 @@ gemm_batch_contig_tree_k_impl(sycl::queue &exec_q,
30973103
cgh.depends_on(red_ev);
30983104
const sycl::context &ctx = exec_q.get_context();
30993105

3106+
using dpctl::tensor::alloc_utils::sycl_free_noexcept;
31003107
cgh.host_task([ctx, partially_reduced_tmp] {
3101-
sycl::free(partially_reduced_tmp, ctx);
3108+
sycl_free_noexcept(partially_reduced_tmp, ctx);
31023109
});
31033110
});
31043111

@@ -3238,7 +3245,8 @@ gemm_batch_contig_tree_nm_impl(sycl::queue &exec_q,
32383245
cgh.depends_on(red_ev);
32393246
const sycl::context &ctx = exec_q.get_context();
32403247

3241-
cgh.host_task([ctx, tmp] { sycl::free(tmp, ctx); });
3248+
using dpctl::tensor::alloc_utils::sycl_free_noexcept;
3249+
cgh.host_task([ctx, tmp] { sycl_free_noexcept(tmp, ctx); });
32423250
});
32433251
return cleanup_host_task_event;
32443252
}
@@ -3299,8 +3307,9 @@ gemm_batch_contig_tree_nm_impl(sycl::queue &exec_q,
32993307
cgh.depends_on(red_ev);
33003308
const sycl::context &ctx = exec_q.get_context();
33013309

3310+
using dpctl::tensor::alloc_utils::sycl_free_noexcept;
33023311
cgh.host_task([ctx, partially_reduced_tmp] {
3303-
sycl::free(partially_reduced_tmp, ctx);
3312+
sycl_free_noexcept(partially_reduced_tmp, ctx);
33043313
});
33053314
});
33063315

@@ -3603,7 +3612,8 @@ sycl::event gemm_tree_k_impl(sycl::queue &exec_q,
36033612
cgh.depends_on(red_ev);
36043613
const sycl::context &ctx = exec_q.get_context();
36053614

3606-
cgh.host_task([ctx, tmp] { sycl::free(tmp, ctx); });
3615+
using dpctl::tensor::alloc_utils::sycl_free_noexcept;
3616+
cgh.host_task([ctx, tmp] { sycl_free_noexcept(tmp, ctx); });
36073617
});
36083618
return cleanup_host_task_event;
36093619
}
@@ -3646,8 +3656,9 @@ sycl::event gemm_tree_k_impl(sycl::queue &exec_q,
36463656
cgh.depends_on(red_ev);
36473657
const sycl::context &ctx = exec_q.get_context();
36483658

3659+
using dpctl::tensor::alloc_utils::sycl_free_noexcept;
36493660
cgh.host_task([ctx, partially_reduced_tmp] {
3650-
sycl::free(partially_reduced_tmp, ctx);
3661+
sycl_free_noexcept(partially_reduced_tmp, ctx);
36513662
});
36523663
});
36533664

@@ -3769,7 +3780,8 @@ sycl::event gemm_tree_nm_impl(sycl::queue &exec_q,
37693780
cgh.depends_on(red_ev);
37703781
const sycl::context &ctx = exec_q.get_context();
37713782

3772-
cgh.host_task([ctx, tmp] { sycl::free(tmp, ctx); });
3783+
using dpctl::tensor::alloc_utils::sycl_free_noexcept;
3784+
cgh.host_task([ctx, tmp] { sycl_free_noexcept(tmp, ctx); });
37733785
});
37743786
return cleanup_host_task_event;
37753787
}
@@ -3812,8 +3824,9 @@ sycl::event gemm_tree_nm_impl(sycl::queue &exec_q,
38123824
cgh.depends_on(red_ev);
38133825
const sycl::context &ctx = exec_q.get_context();
38143826

3827+
using dpctl::tensor::alloc_utils::sycl_free_noexcept;
38153828
cgh.host_task([ctx, partially_reduced_tmp] {
3816-
sycl::free(partially_reduced_tmp, ctx);
3829+
sycl_free_noexcept(partially_reduced_tmp, ctx);
38173830
});
38183831
});
38193832

@@ -4016,7 +4029,8 @@ sycl::event gemm_contig_tree_k_impl(sycl::queue &exec_q,
40164029
cgh.depends_on(red_ev);
40174030
const sycl::context &ctx = exec_q.get_context();
40184031

4019-
cgh.host_task([ctx, tmp] { sycl::free(tmp, ctx); });
4032+
using dpctl::tensor::alloc_utils::sycl_free_noexcept;
4033+
cgh.host_task([ctx, tmp] { sycl_free_noexcept(tmp, ctx); });
40204034
});
40214035
return cleanup_host_task_event;
40224036
}
@@ -4058,8 +4072,9 @@ sycl::event gemm_contig_tree_k_impl(sycl::queue &exec_q,
40584072
cgh.depends_on(red_ev);
40594073
const sycl::context &ctx = exec_q.get_context();
40604074

4075+
using dpctl::tensor::alloc_utils::sycl_free_noexcept;
40614076
cgh.host_task([ctx, partially_reduced_tmp] {
4062-
sycl::free(partially_reduced_tmp, ctx);
4077+
sycl_free_noexcept(partially_reduced_tmp, ctx);
40634078
});
40644079
});
40654080

@@ -4170,7 +4185,8 @@ sycl::event gemm_contig_tree_nm_impl(sycl::queue &exec_q,
41704185
cgh.depends_on(red_ev);
41714186
const sycl::context &ctx = exec_q.get_context();
41724187

4173-
cgh.host_task([ctx, tmp] { sycl::free(tmp, ctx); });
4188+
using dpctl::tensor::alloc_utils::sycl_free_noexcept;
4189+
cgh.host_task([ctx, tmp] { sycl_free_noexcept(tmp, ctx); });
41744190
});
41754191
return cleanup_host_task_event;
41764192
}
@@ -4211,8 +4227,9 @@ sycl::event gemm_contig_tree_nm_impl(sycl::queue &exec_q,
42114227
cgh.depends_on(red_ev);
42124228
const sycl::context &ctx = exec_q.get_context();
42134229

4230+
using dpctl::tensor::alloc_utils::sycl_free_noexcept;
42144231
cgh.host_task([ctx, partially_reduced_tmp] {
4215-
sycl::free(partially_reduced_tmp, ctx);
4232+
sycl_free_noexcept(partially_reduced_tmp, ctx);
42164233
});
42174234
});
42184235

‎dpctl/tensor/libtensor/include/kernels/reductions.hpp‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#include "dpctl_tensor_types.hpp"
3535
#include "utils/math_utils.hpp"
3636
#include "utils/offset_utils.hpp"
37+
#include "utils/sycl_alloc_utils.hpp"
3738
#include "utils/sycl_utils.hpp"
3839
#include "utils/type_dispatch_building.hpp"
3940
#include "utils/type_utils.hpp"
@@ -1374,8 +1375,9 @@ sycl::event reduction_over_group_temps_strided_impl(
13741375
cgh.depends_on(final_reduction_ev);
13751376
const sycl::context &ctx = exec_q.get_context();
13761377

1378+
using dpctl::tensor::alloc_utils::sycl_free_noexcept;
13771379
cgh.host_task([ctx, partially_reduced_tmp] {
1378-
sycl::free(partially_reduced_tmp, ctx);
1380+
sycl_free_noexcept(partially_reduced_tmp, ctx);
13791381
});
13801382
});
13811383

@@ -1617,8 +1619,9 @@ sycl::event reduction_axis1_over_group_temps_contig_impl(
16171619
cgh.depends_on(final_reduction_ev);
16181620
const sycl::context &ctx = exec_q.get_context();
16191621

1622+
using dpctl::tensor::alloc_utils::sycl_free_noexcept;
16201623
cgh.host_task([ctx, partially_reduced_tmp] {
1621-
sycl::free(partially_reduced_tmp, ctx);
1624+
sycl_free_noexcept(partially_reduced_tmp, ctx);
16221625
});
16231626
});
16241627

@@ -1861,8 +1864,9 @@ sycl::event reduction_axis0_over_group_temps_contig_impl(
18611864
cgh.depends_on(final_reduction_ev);
18621865
const sycl::context &ctx = exec_q.get_context();
18631866

1867+
using dpctl::tensor::alloc_utils::sycl_free_noexcept;
18641868
cgh.host_task([ctx, partially_reduced_tmp] {
1865-
sycl::free(partially_reduced_tmp, ctx);
1869+
sycl_free_noexcept(partially_reduced_tmp, ctx);
18661870
});
18671871
});
18681872

@@ -2796,10 +2800,11 @@ sycl::event search_over_group_temps_strided_impl(
27962800
cgh.depends_on(final_reduction_ev);
27972801
sycl::context ctx = exec_q.get_context();
27982802

2803+
using dpctl::tensor::alloc_utils::sycl_free_noexcept;
27992804
cgh.host_task(
28002805
[ctx, partially_reduced_tmp, partially_reduced_vals_tmp] {
2801-
sycl::free(partially_reduced_tmp, ctx);
2802-
sycl::free(partially_reduced_vals_tmp, ctx);
2806+
sycl_free_noexcept(partially_reduced_tmp, ctx);
2807+
sycl_free_noexcept(partially_reduced_vals_tmp, ctx);
28032808
});
28042809
});
28052810

@@ -3087,10 +3092,11 @@ sycl::event search_axis1_over_group_temps_contig_impl(
30873092
cgh.depends_on(final_reduction_ev);
30883093
sycl::context ctx = exec_q.get_context();
30893094

3095+
using dpctl::tensor::alloc_utils::sycl_free_noexcept;
30903096
cgh.host_task(
30913097
[ctx, partially_reduced_tmp, partially_reduced_vals_tmp] {
3092-
sycl::free(partially_reduced_tmp, ctx);
3093-
sycl::free(partially_reduced_vals_tmp, ctx);
3098+
sycl_free_noexcept(partially_reduced_tmp, ctx);
3099+
sycl_free_noexcept(partially_reduced_vals_tmp, ctx);
30943100
});
30953101
});
30963102

@@ -3374,10 +3380,11 @@ sycl::event search_axis0_over_group_temps_contig_impl(
33743380
cgh.depends_on(final_reduction_ev);
33753381
sycl::context ctx = exec_q.get_context();
33763382

3383+
using dpctl::tensor::alloc_utils::sycl_free_noexcept;
33773384
cgh.host_task(
33783385
[ctx, partially_reduced_tmp, partially_reduced_vals_tmp] {
3379-
sycl::free(partially_reduced_tmp, ctx);
3380-
sycl::free(partially_reduced_vals_tmp, ctx);
3386+
sycl_free_noexcept(partially_reduced_tmp, ctx);
3387+
sycl_free_noexcept(partially_reduced_vals_tmp, ctx);
33813388
});
33823389
});
33833390

0 commit comments

Comments
 (0)