Skip to content

Commit b7a429b

Browse files
jimmytweijimmytwei
authored
Merge pull request oneapi-src#2534 from krisrak/20241001-c2s
updated gpu-opt and c2s training(1-4) for 2025.0
2 parents b5630a0 + b88e453 commit b7a429b

File tree

355 files changed

+57060
-19581
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

355 files changed

+57060
-19581
lines changed

‎DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/01_SYCL_Migration_Simple_VectorAdd/01_SYCL_Migration_Simple_VectorAdd.ipynb

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -399,12 +399,12 @@
399399
"\n",
400400
"int main()\n",
401401
"{\n",
402-
" // sycl queue with out of order execution allowed dpct::device_ext &dev_ct1 = dpct::get_current_device();\r\n",
403-
" sycl::queue &q_ct1 = dev_ct1out_ofn_order_queue();\r\n",
404-
" //# Print device name\r\n",
405-
" dpct::device_info dev;\r\n",
406-
" dpct::get_device_info(dev, dpct::dev_mgr::instance().get_device(0));\r\n",
407-
" std::cout << \"Device: \" << dev.get_name() << \"\\n\";;\n",
402+
" dpct::device_ext &dev_ct1 = dpct::get_current_device();\n",
403+
" sycl::queue &q_ct1 = dev_ct1.out_of_order_queue();\n",
404+
" //# Print device name\n",
405+
" dpct::device_info dev;\n",
406+
" dpct::get_device(0).get_device_info(dev);\n",
407+
" std::cout << \"Device: \" << dev.get_name() << \"\\n\";\n",
408408
"\n",
409409
" //# Initialize vectors on host\n",
410410
" float A[N] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};\n",
@@ -418,27 +418,28 @@
418418
" d_C = sycl::malloc_device<float>(N, q_ct1);\n",
419419
"\n",
420420
" //# copy vector data from host to device\n",
421-
" auto e1 = q_ct1.memcpy(d_A, A, N * sizeof(float));\n",
422-
" auto e2 = q_ct1.memcpy(d_B, B, N * sizeof(float));\n",
421+
" q_ct1.memcpy(d_A, A, N * sizeof(float));\n",
422+
" q_ct1.memcpy(d_B, B, N * sizeof(float));\n",
423+
" q_ct1.wait();\n",
423424
"\n",
424425
" //# sumbit task to compute VectorAdd on device\n",
425-
" auto e3 = q_ct1.parallel_for(\n",
426-
" sycl::nd_range<3>(sycl::range<3>(1, 1, N), sycl::range<3>(1, 1, N)), {e1, e2},\n",
426+
" q_ct1.parallel_for(\n",
427+
" sycl::nd_range<3>(sycl::range<3>(1, 1, N), sycl::range<3>(1, 1, N)),\n",
427428
" [=](sycl::nd_item<3> item_ct1) {\n",
428429
" VectorAddKernel(d_A, d_B, d_C, item_ct1);\n",
429-
" });\n",
430+
" }).wait();\n",
430431
"\n",
431432
" //# copy result of vector data from device to host\n",
432-
" q_ct1.memcpy(C, d_C, N * sizeof(float), e3).wait();\n",
433+
" q_ct1.memcpy(C, d_C, N * sizeof(float)).wait();\n",
433434
"\n",
434435
" //# print result on host\n",
435436
" for (int i = 0; i < N; i++) std::cout<< C[i] << \" \";\n",
436437
" std::cout << \"\\n\";\n",
437438
"\n",
438439
" //# free allocation on device\n",
439-
" sycl::free(d_A, q_ct1);\n",
440-
" sycl::free(d_B, q_ct1);\n",
441-
" sycl::free(d_C, q_ct1);\n",
440+
" dpct::dpct_free(d_A, q_ct1);\n",
441+
" dpct::dpct_free(d_B, q_ct1);\n",
442+
" dpct::dpct_free(d_C, q_ct1);\n",
442443
" return 0;\n",
443444
"}\n",
444445
"```"

‎DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/01_SYCL_Migration_Simple_VectorAdd/dpct_output/MainSourceFiles.yaml

Lines changed: 60 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,224 +1,224 @@
11
---
2-
MainSourceFile: '/home/rkris11/work/cuda/MainSrcFiles_placehold'
2+
MainSourceFile: '/home/rkris11/work/git/oneAPI-samples/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/01_SYCL_Migration_Simple_VectorAdd/cuda/MainSrcFiles_placehold'
33
Replacements:
4-
- FilePath: '/home/rkris11/work/cuda/vectoradd.cu'
5-
Offset: 0
4+
- FilePath: '/home/rkris11/work/git/oneAPI-samples/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/01_SYCL_Migration_Simple_VectorAdd/cuda/vectoradd.cu'
5+
Offset: 206
66
Length: 19
77
ReplacementText: "#include <sycl/sycl.hpp>\n#include <dpct/dpct.hpp>\n"
88
ConstantFlag: ''
99
ConstantOffset: 0
1010
InitStr: ''
1111
NewHostVarName: ''
1212
BlockLevelFormatFlag: false
13-
- FilePath: '/home/rkris11/work/cuda/vectoradd.cu'
14-
Offset: 120
13+
- FilePath: '/home/rkris11/work/git/oneAPI-samples/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/01_SYCL_Migration_Simple_VectorAdd/cuda/vectoradd.cu'
14+
Offset: 326
1515
Length: 11
1616
ReplacementText: ''
1717
ConstantFlag: ''
1818
ConstantOffset: 0
1919
InitStr: ''
2020
NewHostVarName: ''
2121
BlockLevelFormatFlag: false
22-
- FilePath: '/home/rkris11/work/cuda/vectoradd.cu'
23-
Offset: 180
22+
- FilePath: '/home/rkris11/work/git/oneAPI-samples/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/01_SYCL_Migration_Simple_VectorAdd/cuda/vectoradd.cu'
23+
Offset: 386
2424
Length: 0
2525
ReplacementText: ",\n const sycl::nd_item<3> &item_ct1"
2626
ConstantFlag: ''
2727
ConstantOffset: 0
2828
InitStr: ''
2929
NewHostVarName: ''
3030
BlockLevelFormatFlag: false
31-
- FilePath: '/home/rkris11/work/cuda/vectoradd.cu'
32-
Offset: 196
31+
- FilePath: '/home/rkris11/work/git/oneAPI-samples/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/01_SYCL_Migration_Simple_VectorAdd/cuda/vectoradd.cu'
32+
Offset: 402
3333
Length: 11
3434
ReplacementText: 'item_ct1.get_local_id(2)'
3535
ConstantFlag: ''
3636
ConstantOffset: 0
3737
InitStr: ''
3838
NewHostVarName: ''
3939
BlockLevelFormatFlag: false
40-
- FilePath: '/home/rkris11/work/cuda/vectoradd.cu'
41-
Offset: 213
40+
- FilePath: '/home/rkris11/work/git/oneAPI-samples/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/01_SYCL_Migration_Simple_VectorAdd/cuda/vectoradd.cu'
41+
Offset: 419
4242
Length: 11
4343
ReplacementText: 'item_ct1.get_local_id(2)'
4444
ConstantFlag: ''
4545
ConstantOffset: 0
4646
InitStr: ''
4747
NewHostVarName: ''
4848
BlockLevelFormatFlag: false
49-
- FilePath: '/home/rkris11/work/cuda/vectoradd.cu'
50-
Offset: 230
49+
- FilePath: '/home/rkris11/work/git/oneAPI-samples/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/01_SYCL_Migration_Simple_VectorAdd/cuda/vectoradd.cu'
50+
Offset: 436
5151
Length: 11
5252
ReplacementText: 'item_ct1.get_local_id(2)'
5353
ConstantFlag: ''
5454
ConstantOffset: 0
5555
InitStr: ''
5656
NewHostVarName: ''
5757
BlockLevelFormatFlag: false
58-
- FilePath: '/home/rkris11/work/cuda/vectoradd.cu'
59-
Offset: 263
58+
- FilePath: '/home/rkris11/work/git/oneAPI-samples/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/01_SYCL_Migration_Simple_VectorAdd/cuda/vectoradd.cu'
59+
Offset: 469
6060
Length: 0
6161
ReplacementText: "\n dpct::device_ext &dev_ct1 = dpct::get_current_device();\n sycl::queue &q_ct1 = dev_ct1.in_order_queue();"
6262
ConstantFlag: ''
6363
ConstantOffset: 0
6464
InitStr: ''
6565
NewHostVarName: ''
6666
BlockLevelFormatFlag: false
67-
- FilePath: '/home/rkris11/work/cuda/vectoradd.cu'
68-
Offset: 304
67+
- FilePath: '/home/rkris11/work/git/oneAPI-samples/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/01_SYCL_Migration_Simple_VectorAdd/cuda/vectoradd.cu'
68+
Offset: 510
6969
Length: 14
7070
ReplacementText: 'dpct::device_info'
7171
ConstantFlag: ''
7272
ConstantOffset: 0
7373
InitStr: ''
7474
NewHostVarName: ''
7575
BlockLevelFormatFlag: false
76-
- FilePath: '/home/rkris11/work/cuda/vectoradd.cu'
77-
Offset: 333
76+
- FilePath: '/home/rkris11/work/git/oneAPI-samples/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/01_SYCL_Migration_Simple_VectorAdd/cuda/vectoradd.cu'
77+
Offset: 539
7878
Length: 32
79-
ReplacementText: 'dpct::get_device_info(dev, dpct::dev_mgr::instance().get_device(0))'
79+
ReplacementText: 'dpct::get_device(0).get_device_info(dev)'
8080
ConstantFlag: ''
8181
ConstantOffset: 0
8282
InitStr: ''
8383
NewHostVarName: ''
8484
BlockLevelFormatFlag: false
85-
- FilePath: '/home/rkris11/work/cuda/vectoradd.cu'
86-
Offset: 407
85+
- FilePath: '/home/rkris11/work/git/oneAPI-samples/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/01_SYCL_Migration_Simple_VectorAdd/cuda/vectoradd.cu'
86+
Offset: 613
8787
Length: 4
8888
ReplacementText: 'get_name()'
8989
ConstantFlag: ''
9090
ConstantOffset: 0
9191
InitStr: ''
9292
NewHostVarName: ''
9393
BlockLevelFormatFlag: false
94-
- FilePath: '/home/rkris11/work/cuda/vectoradd.cu'
95-
Offset: 762
94+
- FilePath: '/home/rkris11/work/git/oneAPI-samples/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/01_SYCL_Migration_Simple_VectorAdd/cuda/vectoradd.cu'
95+
Offset: 968
9696
Length: 33
9797
ReplacementText: 'd_A = sycl::malloc_device<float>(N, q_ct1)'
9898
ConstantFlag: ''
9999
ConstantOffset: 0
100100
InitStr: ''
101101
NewHostVarName: ''
102102
BlockLevelFormatFlag: false
103-
- FilePath: '/home/rkris11/work/cuda/vectoradd.cu'
104-
Offset: 806
103+
- FilePath: '/home/rkris11/work/git/oneAPI-samples/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/01_SYCL_Migration_Simple_VectorAdd/cuda/vectoradd.cu'
104+
Offset: 1012
105105
Length: 33
106106
ReplacementText: 'd_B = sycl::malloc_device<float>(N, q_ct1)'
107107
ConstantFlag: ''
108108
ConstantOffset: 0
109109
InitStr: ''
110110
NewHostVarName: ''
111111
BlockLevelFormatFlag: false
112-
- FilePath: '/home/rkris11/work/cuda/vectoradd.cu'
113-
Offset: 850
112+
- FilePath: '/home/rkris11/work/git/oneAPI-samples/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/01_SYCL_Migration_Simple_VectorAdd/cuda/vectoradd.cu'
113+
Offset: 1056
114114
Length: 33
115115
ReplacementText: 'd_C = sycl::malloc_device<float>(N, q_ct1)'
116116
ConstantFlag: ''
117117
ConstantOffset: 0
118118
InitStr: ''
119119
NewHostVarName: ''
120120
BlockLevelFormatFlag: false
121-
- FilePath: '/home/rkris11/work/cuda/vectoradd.cu'
122-
Offset: 946
121+
- FilePath: '/home/rkris11/work/git/oneAPI-samples/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/01_SYCL_Migration_Simple_VectorAdd/cuda/vectoradd.cu'
122+
Offset: 1152
123123
Length: 10
124124
ReplacementText: q_ct1.memcpy
125125
ConstantFlag: ''
126126
ConstantOffset: 0
127127
InitStr: ''
128128
NewHostVarName: ''
129129
BlockLevelFormatFlag: false
130-
- FilePath: '/home/rkris11/work/cuda/vectoradd.cu'
131-
Offset: 980
130+
- FilePath: '/home/rkris11/work/git/oneAPI-samples/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/01_SYCL_Migration_Simple_VectorAdd/cuda/vectoradd.cu'
131+
Offset: 1186
132132
Length: 24
133133
ReplacementText: ''
134134
ConstantFlag: ''
135135
ConstantOffset: 0
136136
InitStr: ''
137137
NewHostVarName: ''
138138
BlockLevelFormatFlag: false
139-
- FilePath: '/home/rkris11/work/cuda/vectoradd.cu'
140-
Offset: 1016
139+
- FilePath: '/home/rkris11/work/git/oneAPI-samples/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/01_SYCL_Migration_Simple_VectorAdd/cuda/vectoradd.cu'
140+
Offset: 1222
141141
Length: 10
142142
ReplacementText: q_ct1.memcpy
143143
ConstantFlag: ''
144144
ConstantOffset: 0
145145
InitStr: ''
146146
NewHostVarName: ''
147147
BlockLevelFormatFlag: false
148-
- FilePath: '/home/rkris11/work/cuda/vectoradd.cu'
149-
Offset: 1050
148+
- FilePath: '/home/rkris11/work/git/oneAPI-samples/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/01_SYCL_Migration_Simple_VectorAdd/cuda/vectoradd.cu'
149+
Offset: 1256
150150
Length: 24
151151
ReplacementText: ''
152152
ConstantFlag: ''
153153
ConstantOffset: 0
154154
InitStr: ''
155155
NewHostVarName: ''
156156
BlockLevelFormatFlag: false
157-
- FilePath: '/home/rkris11/work/cuda/vectoradd.cu'
158-
Offset: 1144
157+
- FilePath: '/home/rkris11/work/git/oneAPI-samples/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/01_SYCL_Migration_Simple_VectorAdd/cuda/vectoradd.cu'
158+
Offset: 1350
159159
Length: 40
160160
ReplacementText: "q_ct1.parallel_for(\n sycl::nd_range<3>(sycl::range<3>(1, 1, N), sycl::range<3>(1, 1, N)), \n [=](sycl::nd_item<3> item_ct1) {\n VectorAddKernel(d_A, d_B, d_C, item_ct1);\n });"
161161
ConstantFlag: ''
162162
ConstantOffset: 0
163163
InitStr: ''
164164
NewHostVarName: ''
165165
BlockLevelFormatFlag: true
166-
- FilePath: '/home/rkris11/work/cuda/vectoradd.cu'
167-
Offset: 1184
166+
- FilePath: '/home/rkris11/work/git/oneAPI-samples/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/01_SYCL_Migration_Simple_VectorAdd/cuda/vectoradd.cu'
167+
Offset: 1390
168168
Length: 1
169169
ReplacementText: ''
170170
ConstantFlag: ''
171171
ConstantOffset: 0
172172
InitStr: ''
173173
NewHostVarName: ''
174174
BlockLevelFormatFlag: false
175-
- FilePath: '/home/rkris11/work/cuda/vectoradd.cu'
176-
Offset: 1257
175+
- FilePath: '/home/rkris11/work/git/oneAPI-samples/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/01_SYCL_Migration_Simple_VectorAdd/cuda/vectoradd.cu'
176+
Offset: 1463
177177
Length: 10
178178
ReplacementText: q_ct1.memcpy
179179
ConstantFlag: ''
180180
ConstantOffset: 0
181181
InitStr: ''
182182
NewHostVarName: ''
183183
BlockLevelFormatFlag: false
184-
- FilePath: '/home/rkris11/work/cuda/vectoradd.cu'
185-
Offset: 1291
184+
- FilePath: '/home/rkris11/work/git/oneAPI-samples/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/01_SYCL_Migration_Simple_VectorAdd/cuda/vectoradd.cu'
185+
Offset: 1497
186186
Length: 24
187187
ReplacementText: ''
188188
ConstantFlag: ''
189189
ConstantOffset: 0
190190
InitStr: ''
191191
NewHostVarName: ''
192192
BlockLevelFormatFlag: false
193-
- FilePath: '/home/rkris11/work/cuda/vectoradd.cu'
194-
Offset: 1316
193+
- FilePath: '/home/rkris11/work/git/oneAPI-samples/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/01_SYCL_Migration_Simple_VectorAdd/cuda/vectoradd.cu'
194+
Offset: 1522
195195
Length: 0
196196
ReplacementText: '.wait()'
197197
ConstantFlag: ''
198198
ConstantOffset: 0
199199
InitStr: ''
200200
NewHostVarName: ''
201201
BlockLevelFormatFlag: false
202-
- FilePath: '/home/rkris11/work/cuda/vectoradd.cu'
203-
Offset: 1494
202+
- FilePath: '/home/rkris11/work/git/oneAPI-samples/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/01_SYCL_Migration_Simple_VectorAdd/cuda/vectoradd.cu'
203+
Offset: 1700
204204
Length: 13
205205
ReplacementText: 'dpct::dpct_free(d_A, q_ct1)'
206206
ConstantFlag: ''
207207
ConstantOffset: 0
208208
InitStr: ''
209209
NewHostVarName: ''
210210
BlockLevelFormatFlag: false
211-
- FilePath: '/home/rkris11/work/cuda/vectoradd.cu'
212-
Offset: 1518
211+
- FilePath: '/home/rkris11/work/git/oneAPI-samples/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/01_SYCL_Migration_Simple_VectorAdd/cuda/vectoradd.cu'
212+
Offset: 1724
213213
Length: 13
214214
ReplacementText: 'dpct::dpct_free(d_B, q_ct1)'
215215
ConstantFlag: ''
216216
ConstantOffset: 0
217217
InitStr: ''
218218
NewHostVarName: ''
219219
BlockLevelFormatFlag: false
220-
- FilePath: '/home/rkris11/work/cuda/vectoradd.cu'
221-
Offset: 1542
220+
- FilePath: '/home/rkris11/work/git/oneAPI-samples/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/01_SYCL_Migration_Simple_VectorAdd/cuda/vectoradd.cu'
221+
Offset: 1748
222222
Length: 13
223223
ReplacementText: 'dpct::dpct_free(d_C, q_ct1)'
224224
ConstantFlag: ''
@@ -227,16 +227,16 @@ Replacements:
227227
NewHostVarName: ''
228228
BlockLevelFormatFlag: false
229229
MainSourceFilesDigest:
230-
- MainSourceFile: '/home/rkris11/work/cuda/vectoradd.cu'
231-
Digest: 94a00fac90fc59be1140115c91bdaf4e
232-
DpctVersion: 19.0.0
230+
- MainSourceFile: '/home/rkris11/work/git/oneAPI-samples/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/01_SYCL_Migration_Simple_VectorAdd/cuda/vectoradd.cu'
231+
Digest: cf933ad350e521879fbf674f6a82801e
232+
DpctVersion: 2025.0.0
233233
MainHelperFileName: ''
234234
USMLevel: ''
235235
FeatureMap: {}
236236
CompileTargets: {}
237237
OptionMap:
238238
AnalysisScopePath:
239-
Value: '/home/rkris11/work/cuda'
239+
Value: '/home/rkris11/work/git/oneAPI-samples/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/01_SYCL_Migration_Simple_VectorAdd/cuda'
240240
Specified: false
241241
AsyncHandler:
242242
Value: 'false'
@@ -251,7 +251,7 @@ OptionMap:
251251
Value: 'false'
252252
Specified: false
253253
CompilationsDir:
254-
Value: ''
254+
Value: '/home/rkris11/work/git'
255255
Specified: false
256256
CtadEnabled:
257257
Value: 'false'
@@ -292,6 +292,9 @@ OptionMap:
292292
SyclNamedLambda:
293293
Value: 'false'
294294
Specified: false
295+
UseSYCLCompat:
296+
Value: 'false'
297+
Specified: false
295298
UsmLevel:
296299
Value: '1'
297300
Specified: false

0 commit comments

Comments
 (0)