Skip to content

Commit 2e2c4e2

Browse files
MikeL270MikeL270
committed
autofix Using_USM
1 parent db88afc commit 2e2c4e2

1 file changed

Lines changed: 43 additions & 49 deletions

File tree

‎Lesson_Materials/Using_USM/index.html‎

Lines changed: 43 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,11 @@
22

33
<html>
44
<head>
5-
<meta charset="utf-8" />
6-
<link rel="stylesheet" href="../../Static/css/reveal.css" />
7-
<link
8-
rel="stylesheet"
9-
href="../../Static/css/theme/white.css"
10-
/>
11-
<link rel="stylesheet" href="../../Static/css/custom.css" />
12-
<link
13-
rel="stylesheet"
14-
href="../../Static/css/atom-one-light.css"
15-
/>
5+
<meta charset="utf-8"/>
6+
<link rel="stylesheet" href="../../Static/css/reveal.css"/>
7+
<link rel="stylesheet" href="../../Static/css/theme/white.css"/>
8+
<link rel="stylesheet" href="../../Static/css/custom.css"/>
9+
<link rel="stylesheet" href="../../Static/css/atom-one-light.css"/>
1610
<script src="../../node_modules/reveal.js/dist/reveal.js" defer></script>
1711
<script src="../../node_modules/reveal.js/dist/plugin/markdown.js" defer></script>
1812
<script src="../../node_modules/reveal.js/dist/plugin/highlight.js" defer></script>
@@ -53,7 +47,7 @@
5347
<div class="hbox" data-markdown>
5448
#### USM Allocation Types
5549
</div>
56-
<div class="container"data-markdown>
50+
<div class="container" data-markdown>
5751
| Type | Description | Access host | Access device | Nominal location |
5852
|--------|---------------------------------|----------------|----------------|----------------------|
5953
| device | device global allocations | ✗ | ✓ | device |
@@ -67,11 +61,11 @@
6761
#### Malloc_device
6862
</div>
6963
<div class="container">
70-
<code class="code-100pc"><pre>
71-
void* malloc_device(size_t numBytes, const queue& syclQueue, const property_list &propList = {});
64+
<pre><code class="language-cpp">
65+
void* malloc_device(size_t numBytes, const queue&amp; syclQueue, const property_list &amp;propList = {});
7266

7367
template &lt;typename T&gt;
74-
T* malloc_device(size_t count, const queue& syclQueue, const property_list &propList = {});
68+
T* malloc_device(size_t count, const queue&amp; syclQueue, const property_list &amp;propList = {});
7569
</code></pre>
7670
</div>
7771
<div class="container" data-markdown>
@@ -88,8 +82,8 @@
8882
#### Free
8983
</div>
9084
<div class="container">
91-
<code class="code-100pc"><pre>
92-
void free(void* ptr, queue& syclQueue);
85+
<pre><code class="language-cpp">
86+
void free(void* ptr, queue&amp; syclQueue);
9387
</code></pre>
9488
</div>
9589
<div class="container" data-markdown>
@@ -105,8 +99,8 @@
10599
#### Memcpy
106100
</div>
107101
<div class="container">
108-
<code class="code-100pc"><pre>
109-
event queue::memcpy(void* dest, const void* src, size_t numBytes, const std::vector<event> &depEvents);
102+
<pre><code class="language-cpp">
103+
event queue::memcpy(void* dest, const void* src, size_t numBytes, const std::vector&lt;event&gt; &amp;depEvents);
110104
</code></pre>
111105
</div>
112106
<div class="container" data-markdown>
@@ -120,13 +114,13 @@
120114
<!--Slide 7-->
121115
<section>
122116
<div class="hbox" data-markdown>
123-
#### Memset & fill
117+
#### Memset &amp; fill
124118
</div>
125119
<div class="container">
126-
<code class="code-100pc"><pre>
127-
event queue::memset(void* ptr, int value, size_t numBytes, const std::vector<event> &depEvents);
120+
<pre><code class="language-cpp">
121+
event queue::memset(void* ptr, int value, size_t numBytes, const std::vector&lt;event&gt; &amp;depEvents);
128122

129-
event queue::fill(void* ptr, const T& pattern, size_t count, const std::vector<event> &depEvents);
123+
event queue::fill(void* ptr, const T&amp; pattern, size_t count, const std::vector&lt;event&gt; &amp;depEvents);
130124
</code></pre>
131125
</div>
132126
<div class="container" data-markdown>
@@ -142,12 +136,12 @@
142136
#### Putting it all together
143137
</div>
144138
<div class="container">
145-
<code class="code-100pc"><pre>
139+
<pre><code class="language-cpp">
146140
int square_number(int x){
147141

148142
auto myQueue = queue{};
149143

150-
myQueue.submit([&](handler &cgh){
144+
myQueue.submit([&amp;](handler &amp;cgh){
151145
cgh.single_task&lt;square_number&gt;([=](){
152146
/* square some number */
153147
});
@@ -167,12 +161,12 @@
167161
#### Putting it all together
168162
</div>
169163
<div class="container">
170-
<code class="code-100pc" data-noescape><pre>
164+
<pre><code data-noescape class="language-cpp">
171165
int square_number(int x){
172166

173167
auto myQueue = queue{<mark>usm_selector{}</mark>};
174168

175-
myQueue.submit([&](handler &cgh){
169+
myQueue.submit([&amp;](handler &amp;cgh){
176170
cgh.single_task&lt;square_number&gt;([=](){
177171
/* square some number */
178172
});
@@ -192,14 +186,14 @@
192186
#### Putting it all together
193187
</div>
194188
<div class="container">
195-
<code class="code-100pc" data-noescape><pre>
189+
<pre><code data-noescape class="language-cpp">
196190
int square_number(int x){
197191

198192
auto myQueue = queue{usm_selector{}};
199193

200194
<mark>auto devicePtr = malloc_device&lt;int&gt;(1, myQueue);</mark>
201195

202-
myQueue.submit([&](handler &cgh){
196+
myQueue.submit([&amp;](handler &amp;cgh){
203197
cgh.single_task&lt;square_number&gt;([=](){
204198
/* square some number */
205199
});
@@ -220,16 +214,16 @@
220214
#### Putting it all together
221215
</div>
222216
<div class="container">
223-
<code class="code-100pc" data-noescape><pre>
217+
<pre><code data-noescape class="language-cpp">
224218
int square_number(int x){
225219

226220
auto myQueue = queue{usm_selector{}};
227221

228222
auto devicePtr = malloc_device&lt;int&gt;(1, myQueue);
229223

230-
<mark>myQueue.memcpy(devicePtr, &x, sizeof(int)).wait();</mark>
224+
<mark>myQueue.memcpy(devicePtr, &amp;x, sizeof(int)).wait();</mark>
231225

232-
myQueue.submit([&](handler &cgh){
226+
myQueue.submit([&amp;](handler &amp;cgh){
233227
cgh.single_task&lt;square&gt;([=](){
234228
/* square some number */
235229
});
@@ -250,16 +244,16 @@
250244
#### Putting it all together
251245
</div>
252246
<div class="container">
253-
<code class="code-100pc" data-noescape><pre>
247+
<pre><code data-noescape class="language-cpp">
254248
int square_number(int x){
255249

256250
auto myQueue = queue{usm_selector{}};
257251

258252
auto devicePtr = malloc_device&lt;int&gt;(1, myQueue);
259253

260-
myQueue.memcpy(devicePtr, &x, sizeof(int)).wait();
254+
myQueue.memcpy(devicePtr, &amp;x, sizeof(int)).wait();
261255

262-
myQueue.submit([&](handler &cgh){
256+
myQueue.submit([&amp;](handler &amp;cgh){
263257
cgh.single_task&lt;square&gt;([=](){
264258
<mark>*devicePtr = (*devicePtr) * (*devicePtr);</mark>
265259
});
@@ -279,22 +273,22 @@
279273
#### Putting it all together
280274
</div>
281275
<div class="container">
282-
<code class="code-100pc" data-noescape><pre>
276+
<pre><code data-noescape class="language-cpp">
283277
int square_number(int x){
284278

285279
auto myQueue = queue{usm_selector{}};
286280

287281
auto devicePtr = malloc_device&lt;int&gt;(1, myQueue);
288282

289-
myQueue.memcpy(devicePtr, &x, sizeof(int)).wait();
283+
myQueue.memcpy(devicePtr, &amp;x, sizeof(int)).wait();
290284

291-
myQueue.submit([&](handler &cgh){
285+
myQueue.submit([&amp;](handler &amp;cgh){
292286
cgh.single_task&lt;square&gt;([=](){
293287
*devicePtr = (*devicePtr) * (*devicePtr);
294288
});
295289
}).wait();
296290

297-
<mark>myQueue.memcpy(&x, devicePtr, sizeof(int)).wait();</mark>
291+
<mark>myQueue.memcpy(&amp;x, devicePtr, sizeof(int)).wait();</mark>
298292

299293
return x;
300294
}
@@ -310,22 +304,22 @@
310304
#### Putting it all together
311305
</div>
312306
<div class="container">
313-
<code class="code-100pc" data-noescape><pre>
307+
<pre><code data-noescape class="language-cpp">
314308
int square_number(int x){
315309

316310
auto myQueue = queue{usm_selector{}};
317311

318312
auto devicePtr = malloc_device&lt;int&gt;(1, myQueue);
319313

320-
myQueue.memcpy(devicePtr, &x, sizeof(int)).wait();
314+
myQueue.memcpy(devicePtr, &amp;x, sizeof(int)).wait();
321315

322-
myQueue.submit([&](handler &cgh){
316+
myQueue.submit([&amp;](handler &amp;cgh){
323317
cgh.single_task&lt;square&gt;([=](){
324318
*devicePtr = (*devicePtr) * (*devicePtr);
325319
});
326320
}).wait();
327321

328-
myQueue.memcpy(&x, devicePtr, sizeof(int)).wait();
322+
myQueue.memcpy(&amp;x, devicePtr, sizeof(int)).wait();
329323

330324
<mark>free(devicePtr, myQueue);</mark>
331325

@@ -343,12 +337,12 @@
343337
#### Queue shortcuts
344338
</div>
345339
<div class="container">
346-
<code class="code-100pc"><pre>
340+
<pre><code class="language-cpp">
347341
template &lt;typename KernelName, typename KernelType&gt;
348-
event queue::single_task(const KernelType &KernelFunc);
342+
event queue::single_task(const KernelType &amp;KernelFunc);
349343

350344
template &lt;typename KernelName, typename KernelType, int Dims&gt;
351-
event queue::parallel_for(range<Dims> GlobalRange, const KernelType &KernelFunc);
345+
event queue::parallel_for(range&lt;Dims&gt; GlobalRange, const KernelType &amp;KernelFunc);
352346
</code></pre>
353347
</div>
354348
<div class="container" data-markdown>
@@ -362,20 +356,20 @@
362356
#### With the queue shortcut
363357
</div>
364358
<div class="container">
365-
<code class="code-100pc" data-noescape><pre>
359+
<pre><code data-noescape class="language-cpp">
366360
int square_number(int x){
367361

368362
auto myQueue = queue{usm_selector{}};
369363

370364
auto devicePtr = malloc_device&lt;int&gt;(1, myQueue);
371365

372-
myQueue.memcpy(devicePtr, &x, sizeof(int)).wait();
366+
myQueue.memcpy(devicePtr, &amp;x, sizeof(int)).wait();
373367

374368
<mark>myQueue.single_task&lt;square&gt;([=](){</mark>
375369
<mark>*devicePtr = (*devicePtr) * (*devicePtr);</mark>
376370
<mark>}).wait();</mark>
377371

378-
myQueue.memcpy(&x, devicePtr, sizeof(int)).wait();
372+
myQueue.memcpy(&amp;x, devicePtr, sizeof(int)).wait();
379373

380374
free(devicePtr, myQueue);
381375

0 commit comments

Comments
 (0)