This repository was archived by the owner on Jan 29, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 6
/
Copy path0004-add-SYCL.patch
492 lines (440 loc) · 20 KB
/
0004-add-SYCL.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
From 0cd01e7a8a1a4052059f7dee668289261c595eaa Mon Sep 17 00:00:00 2001
From: wangyon1 <[email protected]>
Date: Fri, 5 Feb 2021 09:56:45 +0800
Subject: [PATCH 4/4] add SYCL
---
src/CommandlineInterface/CMakeLists.txt | 2 +-
src/GraphicInterface/CMakeLists.txt | 2 +-
src/RestInterface/CMakeLists.txt | 6 +-
src/RosInterface/CMakeLists.txt | 2 +-
src/SupraExecutor/CMakeLists.txt | 2 +-
src/SupraLib/Beamformer/Beamformer.cpp | 2 +-
src/SupraLib/Beamformer/BeamformingNode.cpp | 12 ++--
src/SupraLib/Beamformer/BeamformingNode.h | 6 +-
.../Beamformer/HilbertFirEnvelope.dp.cpp | 8 +--
src/SupraLib/Beamformer/LogCompressor.dp.cpp | 7 +--
...merCuda.dp.cpp => RxBeamformerSYCL.dp.cpp} | 56 ++++++-------------
...{RxBeamformerCuda.h => RxBeamformerSYCL.h} | 12 ++--
src/SupraLib/Beamformer/ScanConverter.dp.cpp | 7 +--
src/SupraLib/CMakeLists.txt | 4 +-
src/Wrapper/CMakeLists.txt | 2 +-
15 files changed, 53 insertions(+), 77 deletions(-)
rename src/SupraLib/Beamformer/{RxBeamformerCuda.dp.cpp => RxBeamformerSYCL.dp.cpp} (92%)
rename src/SupraLib/Beamformer/{RxBeamformerCuda.h => RxBeamformerSYCL.h} (91%)
diff --git a/src/CommandlineInterface/CMakeLists.txt b/src/CommandlineInterface/CMakeLists.txt
index a15ba72..bc8b110 100644
--- a/src/CommandlineInterface/CMakeLists.txt
+++ b/src/CommandlineInterface/CMakeLists.txt
@@ -33,7 +33,7 @@ TARGET_COMPILE_DEFINITIONS(SUPRA_CMD
TARGET_LINK_LIBRARIES(SUPRA_CMD
${SUPRA_Lib_LIBRARIES}
)
-set_property(TARGET SUPRA_CMD PROPERTY CXX_STANDARD 11)
+set_property(TARGET SUPRA_CMD PROPERTY CXX_STANDARD 17)
set_property(TARGET SUPRA_CMD PROPERTY CXX_STANDARD_REQUIRED ON)
add_dependencies(SUPRA_CMD SUPRA_Lib)
diff --git a/src/GraphicInterface/CMakeLists.txt b/src/GraphicInterface/CMakeLists.txt
index 29a59f5..fa149d9 100644
--- a/src/GraphicInterface/CMakeLists.txt
+++ b/src/GraphicInterface/CMakeLists.txt
@@ -156,7 +156,7 @@ TARGET_LINK_LIBRARIES(SUPRA_GUI
${CAMPVIS_LIB}
${NodeEditor_LIBRARIES}
)
-set_property(TARGET SUPRA_GUI PROPERTY CXX_STANDARD 11)
+set_property(TARGET SUPRA_GUI PROPERTY CXX_STANDARD 17)
set_property(TARGET SUPRA_GUI PROPERTY CXX_STANDARD_REQUIRED ON)
add_dependencies(SUPRA_GUI SUPRA_Lib NodeEditor)
diff --git a/src/RestInterface/CMakeLists.txt b/src/RestInterface/CMakeLists.txt
index fb8fa95..94a417e 100644
--- a/src/RestInterface/CMakeLists.txt
+++ b/src/RestInterface/CMakeLists.txt
@@ -45,13 +45,13 @@ endif()
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
message("-- configuring clang options")
- set(CMAKE_CXX_FLAGS "-arch x86_64 -std=c++11 -stdlib=libc++ -DBOOST_LOG_DYN_LINK -Wno-deprecated-declarations")
+ set(CMAKE_CXX_FLAGS "-arch x86_64 -std=c++17 -stdlib=libc++ -DBOOST_LOG_DYN_LINK -Wno-deprecated-declarations")
elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
message("-- configuring gcc options")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -DBOOST_LOG_DYN_LINK")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17 -DBOOST_LOG_DYN_LINK")
endif()
@@ -129,7 +129,7 @@ TARGET_LINK_LIBRARIES(SUPRA_REST
)
TARGET_COMPILE_DEFINITIONS(SUPRA_REST
PRIVATE ${SUPRA_Lib_DEFINES})
-set_property(TARGET SUPRA_REST PROPERTY CXX_STANDARD 11)
+set_property(TARGET SUPRA_REST PROPERTY CXX_STANDARD 17)
set_property(TARGET SUPRA_REST PROPERTY CXX_STANDARD_REQUIRED ON)
add_dependencies(SUPRA_REST SUPRA_Lib)
diff --git a/src/RosInterface/CMakeLists.txt b/src/RosInterface/CMakeLists.txt
index 37eab21..dd769c6 100644
--- a/src/RosInterface/CMakeLists.txt
+++ b/src/RosInterface/CMakeLists.txt
@@ -39,7 +39,7 @@ TARGET_LINK_LIBRARIES(SUPRA_ROS
)
TARGET_COMPILE_DEFINITIONS(SUPRA_ROS
PRIVATE ${SUPRA_Lib_DEFINES})
-set_property(TARGET SUPRA_ROS PROPERTY CXX_STANDARD 11)
+set_property(TARGET SUPRA_ROS PROPERTY CXX_STANDARD 17)
set_property(TARGET SUPRA_ROS PROPERTY CXX_STANDARD_REQUIRED ON)
add_dependencies(SUPRA_ROS SUPRA_Lib)
diff --git a/src/SupraExecutor/CMakeLists.txt b/src/SupraExecutor/CMakeLists.txt
index 978cb3c..049bea6 100644
--- a/src/SupraExecutor/CMakeLists.txt
+++ b/src/SupraExecutor/CMakeLists.txt
@@ -31,7 +31,7 @@ TARGET_COMPILE_DEFINITIONS(SUPRA_EXECUTOR
TARGET_LINK_LIBRARIES(SUPRA_EXECUTOR
${SUPRA_Lib_LIBRARIES}
)
-set_property(TARGET SUPRA_EXECUTOR PROPERTY CXX_STANDARD 11)
+set_property(TARGET SUPRA_EXECUTOR PROPERTY CXX_STANDARD 17)
set_property(TARGET SUPRA_EXECUTOR PROPERTY CXX_STANDARD_REQUIRED ON)
add_dependencies(SUPRA_EXECUTOR SUPRA_Lib)
diff --git a/src/SupraLib/Beamformer/Beamformer.cpp b/src/SupraLib/Beamformer/Beamformer.cpp
index e83a29d..5489c7f 100644
--- a/src/SupraLib/Beamformer/Beamformer.cpp
+++ b/src/SupraLib/Beamformer/Beamformer.cpp
@@ -13,7 +13,7 @@
// ================================================================================================
#include "Beamformer.h"
-#include "RxBeamformerCuda.h"
+#include "RxBeamformerSYCL.h"
#include <exception>
#include <cassert>
diff --git a/src/SupraLib/Beamformer/BeamformingNode.cpp b/src/SupraLib/Beamformer/BeamformingNode.cpp
index 5a49f7a..6b79102 100644
--- a/src/SupraLib/Beamformer/BeamformingNode.cpp
+++ b/src/SupraLib/Beamformer/BeamformingNode.cpp
@@ -13,7 +13,7 @@
#include "USImage.h"
#include "USRawData.h"
-#include "RxBeamformerCuda.h"
+#include "RxBeamformerSYCL.h"
#include <utilities/Logging.h>
#include <algorithm>
@@ -146,7 +146,7 @@ namespace supra
}
if (needNewBeamformer)
{
- m_beamformer = std::make_shared<RxBeamformerCuda>(*m_lastSeenBeamformerParameters);
+ m_beamformer = std::make_shared<RxBeamformerSYCL>(*m_lastSeenBeamformerParameters);
}
switch (pRawData->getDataType())
@@ -200,18 +200,18 @@ namespace supra
void BeamformingNode::readBeamformerType()
{
string beamformer = m_configurationDictionary.get<string>("beamformerType");
- m_beamformerType = RxBeamformerCuda::DelayAndSum;
+ m_beamformerType = RxBeamformerSYCL::DelayAndSum;
if (beamformer == "DelayAndSum")
{
- m_beamformerType = RxBeamformerCuda::DelayAndSum;
+ m_beamformerType = RxBeamformerSYCL::DelayAndSum;
}
else if (beamformer == "DelayAndStdDev")
{
- m_beamformerType = RxBeamformerCuda::DelayAndStdDev;
+ m_beamformerType = RxBeamformerSYCL::DelayAndStdDev;
}
else if (beamformer == "TestSignal")
{
- m_beamformerType = RxBeamformerCuda::TestSignal;
+ m_beamformerType = RxBeamformerSYCL::TestSignal;
}
}
diff --git a/src/SupraLib/Beamformer/BeamformingNode.h b/src/SupraLib/Beamformer/BeamformingNode.h
index 314eb24..72b0109 100644
--- a/src/SupraLib/Beamformer/BeamformingNode.h
+++ b/src/SupraLib/Beamformer/BeamformingNode.h
@@ -24,7 +24,7 @@
#include "RecordObject.h"
#include "SyncRecordObject.h"
#include "RxBeamformerParameters.h"
-#include "RxBeamformerCuda.h"
+#include "RxBeamformerSYCL.h"
namespace supra
{
@@ -67,7 +67,7 @@ namespace supra
void readBeamformerType();
void updateImageProperties(std::shared_ptr<const USImageProperties> imageProperties);
- std::shared_ptr<RxBeamformerCuda> m_beamformer;
+ std::shared_ptr<RxBeamformerSYCL> m_beamformer;
std::shared_ptr<const RxBeamformerParameters> m_lastSeenBeamformerParameters;
std::shared_ptr<const USImageProperties> m_lastSeenImageProperties;
@@ -81,7 +81,7 @@ namespace supra
double m_windowParameter;
double m_speedOfSoundMMperS;
DataType m_outputType;
- RxBeamformerCuda::RxSampleBeamformer m_beamformerType;
+ RxBeamformerSYCL::RxSampleBeamformer m_beamformerType;
bool m_interpolateTransmits;
int32_t m_additionalOffset;
};
diff --git a/src/SupraLib/Beamformer/HilbertFirEnvelope.dp.cpp b/src/SupraLib/Beamformer/HilbertFirEnvelope.dp.cpp
index 99cf7be..da32ae6 100644
--- a/src/SupraLib/Beamformer/HilbertFirEnvelope.dp.cpp
+++ b/src/SupraLib/Beamformer/HilbertFirEnvelope.dp.cpp
@@ -9,17 +9,15 @@
//
// ================================================================================================
+#include <oneapi/dpl/execution>
+#include <oneapi/dpl/algorithm>
+
#include <CL/sycl.hpp>
-#include <dpct/dpct.hpp>
#include "HilbertFirEnvelope.h"
#include <utilities/utility.h>
#include <utilities/FirFilterFactory.h>
#include "helper.h"
-#include <dpct/dpl_utils.hpp>
-#include <oneapi/dpl/execution>
-#include <oneapi/dpl/algorithm>
-
#include <algorithm>
using namespace std;
diff --git a/src/SupraLib/Beamformer/LogCompressor.dp.cpp b/src/SupraLib/Beamformer/LogCompressor.dp.cpp
index 70bc68b..eb33e66 100644
--- a/src/SupraLib/Beamformer/LogCompressor.dp.cpp
+++ b/src/SupraLib/Beamformer/LogCompressor.dp.cpp
@@ -9,14 +9,13 @@
//
// ================================================================================================
+#include <oneapi/dpl/execution>
+#include <oneapi/dpl/algorithm>
+
#include <CL/sycl.hpp>
-#include <dpct/dpct.hpp>
#include "LogCompressor.h"
#include <utilities/utility.h>
-#include <dpct/dpl_utils.hpp>
-#include <oneapi/dpl/execution>
-#include <oneapi/dpl/algorithm>
#include <cmath>
using namespace std;
diff --git a/src/SupraLib/Beamformer/RxBeamformerCuda.dp.cpp b/src/SupraLib/Beamformer/RxBeamformerSYCL.dp.cpp
similarity index 92%
rename from src/SupraLib/Beamformer/RxBeamformerCuda.dp.cpp
rename to src/SupraLib/Beamformer/RxBeamformerSYCL.dp.cpp
index 7c7a4b7..f9ac5f7 100644
--- a/src/SupraLib/Beamformer/RxBeamformerCuda.dp.cpp
+++ b/src/SupraLib/Beamformer/RxBeamformerSYCL.dp.cpp
@@ -10,7 +10,7 @@
// ================================================================================================
#include <CL/sycl.hpp>
#include <dpct/dpct.hpp>
-#include "RxBeamformerCuda.h"
+#include "RxBeamformerSYCL.h"
#include "USImage.h"
#include "USRawData.h"
#include "RxSampleBeamformerDelayAndSum.h"
@@ -23,7 +23,7 @@
//TODO ALL ELEMENT/SCANLINE Y positons are actually Z! Change all variable names accordingly
namespace supra
{
- RxBeamformerCuda::RxBeamformerCuda(const RxBeamformerParameters & parameters)
+ RxBeamformerSYCL::RxBeamformerSYCL(const RxBeamformerParameters & parameters)
: m_windowFunction(nullptr)
{
@@ -47,11 +47,11 @@ namespace supra
m_pRxElementYs = std::unique_ptr<Container<LocationType>>(new Container<LocationType>(LocationGpu, &q_ct1, parameters.getRxElementYs()));
}
- RxBeamformerCuda::~RxBeamformerCuda()
+ RxBeamformerSYCL::~RxBeamformerSYCL()
{
}
- void RxBeamformerCuda::convertToDtSpace(double dt, double speedOfSoundMMperS, size_t numTransducerElements) const
+ void RxBeamformerSYCL::convertToDtSpace(double dt, double speedOfSoundMMperS, size_t numTransducerElements) const
{
if (m_lastSeenDt != dt || m_speedOfSoundMMperS != speedOfSoundMMperS)
{
@@ -387,7 +387,7 @@ namespace supra
template <class SampleBeamformer, unsigned int maxWindowFunctionNumel, typename RFType, typename ResultType, typename LocationType>
- void rxBeamformingDTspaceCuda3D(bool interpolateRFlines, bool interpolateBetweenTransmits, size_t numTransducerElements, vec2s elementLayout, size_t numReceivedChannels, size_t numTimesteps,
+ void rxBeamformingDTspaceSYCL3D(bool interpolateRFlines, bool interpolateBetweenTransmits, size_t numTransducerElements, vec2s elementLayout, size_t numReceivedChannels, size_t numTimesteps,
const RFType* RF, size_t numTxScanlines, size_t numRxScanlines, const ScanlineRxParameters3D* scanlines, size_t numZs, const LocationType* zs,
const LocationType* x_elems, const LocationType* y_elems, LocationType speedOfSound, LocationType dt, uint32_t additionalOffset, LocationType F,
const WindowFunctionGpu windowFunction, sycl::queue* stream, ResultType* s)
@@ -474,7 +474,7 @@ namespace supra
}
template <class SampleBeamformer, typename RFType, typename ResultType, typename LocationType>
- void rxBeamformingDTspaceCuda(bool interpolateRFlines, bool interpolateBetweenTransmits, size_t numTransducerElements, size_t numReceivedChannels, size_t numTimesteps, const RFType* RF,
+ void rxBeamformingDTspaceSYCL(bool interpolateRFlines, bool interpolateBetweenTransmits, size_t numTransducerElements, size_t numReceivedChannels, size_t numTimesteps, const RFType* RF,
size_t numTxScanlines, size_t numRxScanlines, const ScanlineRxParameters3D* scanlines, size_t numZs, const LocationType* zs, const LocationType* x_elems,
LocationType speedOfSound, LocationType dt, uint32_t additionalOffset, LocationType F, const WindowFunctionGpu windowFunction, sycl::queue* stream, ResultType* s, LocationType *mdataGpu)
{
@@ -540,8 +540,8 @@ namespace supra
}
template <typename ChannelDataType, typename ImageDataType>
- shared_ptr<USImage> RxBeamformerCuda::performRxBeamforming(
- RxBeamformerCuda::RxSampleBeamformer sampleBeamformer,
+ shared_ptr<USImage> RxBeamformerSYCL::performRxBeamforming(
+ RxBeamformerSYCL::RxSampleBeamformer sampleBeamformer,
shared_ptr<const USRawData> rawData,
double fNumber,
double speedOfSoundMMperS,
@@ -573,29 +573,9 @@ namespace supra
});
gRawData->getStream()->wait();
- auto beamformingFunction3D = &rxBeamformingDTspaceCuda3D<RxSampleBeamformerDelayAndSum, m_windowFunctionNumEntries, ChannelDataType, ImageDataType, LocationType>;
- auto beamformingFunction2D = &rxBeamformingDTspaceCuda<RxSampleBeamformerDelayAndSum, ChannelDataType, ImageDataType, LocationType>;
+ auto beamformingFunction3D = &rxBeamformingDTspaceSYCL3D<RxSampleBeamformerDelayAndSum, m_windowFunctionNumEntries, ChannelDataType, ImageDataType, LocationType>;
+ auto beamformingFunction2D = &rxBeamformingDTspaceSYCL<RxSampleBeamformerDelayAndSum, ChannelDataType, ImageDataType, LocationType>;
- // We don't use DelayAndStdDev and TestSignal algorthm, so below code are commented.
- /*switch (sampleBeamformer)
- {
- case DelayAndSum:
- beamformingFunction3D = &rxBeamformingDTspaceCuda3D<RxSampleBeamformerDelayAndSum, m_windowFunctionNumEntries, ChannelDataType, ImageDataType, LocationType>;
- beamformingFunction2D = &rxBeamformingDTspaceCuda<RxSampleBeamformerDelayAndSum, ChannelDataType, ImageDataType, LocationType>;
- break;
- case DelayAndStdDev:
- beamformingFunction3D = &rxBeamformingDTspaceCuda3D<RxSampleBeamformerDelayAndStdDev, m_windowFunctionNumEntries, ChannelDataType, ImageDataType, LocationType>;
- beamformingFunction2D = &rxBeamformingDTspaceCuda<RxSampleBeamformerDelayAndStdDev, ChannelDataType, ImageDataType, LocationType>;
- break;
- case TestSignal:
- beamformingFunction3D = &rxBeamformingDTspaceCuda3D<RxSampleBeamformerTestSignal, m_windowFunctionNumEntries, ChannelDataType, ImageDataType, LocationType>;
- beamformingFunction2D = &rxBeamformingDTspaceCuda<RxSampleBeamformerTestSignal, ChannelDataType, ImageDataType, LocationType>;
- break;
- case INVALID:
- default:
- beamformingFunction3D = &rxBeamformingDTspaceCuda3D<RxSampleBeamformerDelayAndSum, m_windowFunctionNumEntries, ChannelDataType, ImageDataType, LocationType>;
- beamformingFunction2D = &rxBeamformingDTspaceCuda<RxSampleBeamformerDelayAndSum, ChannelDataType, ImageDataType, LocationType>;
- }*/
convertToDtSpace(dt, speedOfSoundMMperS, rawData->getNumElements());
@@ -669,8 +649,8 @@ namespace supra
}
template
- shared_ptr<USImage> RxBeamformerCuda::performRxBeamforming<int16_t, int16_t>(
- RxBeamformerCuda::RxSampleBeamformer sampleBeamformer,
+ shared_ptr<USImage> RxBeamformerSYCL::performRxBeamforming<int16_t, int16_t>(
+ RxBeamformerSYCL::RxSampleBeamformer sampleBeamformer,
shared_ptr<const USRawData> rawData,
double fNumber,
double speedOfSoundMMperS,
@@ -679,8 +659,8 @@ namespace supra
bool interpolateBetweenTransmits,
int32_t additionalOffset) const;
template
- shared_ptr<USImage> RxBeamformerCuda::performRxBeamforming<int16_t, float>(
- RxBeamformerCuda::RxSampleBeamformer sampleBeamformer,
+ shared_ptr<USImage> RxBeamformerSYCL::performRxBeamforming<int16_t, float>(
+ RxBeamformerSYCL::RxSampleBeamformer sampleBeamformer,
shared_ptr<const USRawData> rawData,
double fNumber,
double speedOfSoundMMperS,
@@ -689,8 +669,8 @@ namespace supra
bool interpolateBetweenTransmits,
int32_t additionalOffset) const;
template
- shared_ptr<USImage> RxBeamformerCuda::performRxBeamforming<float, int16_t>(
- RxBeamformerCuda::RxSampleBeamformer sampleBeamformer,
+ shared_ptr<USImage> RxBeamformerSYCL::performRxBeamforming<float, int16_t>(
+ RxBeamformerSYCL::RxSampleBeamformer sampleBeamformer,
shared_ptr<const USRawData> rawData,
double fNumber,
double speedOfSoundMMperS,
@@ -699,8 +679,8 @@ namespace supra
bool interpolateBetweenTransmits,
int32_t additionalOffset) const;
template
- shared_ptr<USImage> RxBeamformerCuda::performRxBeamforming<float, float>(
- RxBeamformerCuda::RxSampleBeamformer sampleBeamformer,
+ shared_ptr<USImage> RxBeamformerSYCL::performRxBeamforming<float, float>(
+ RxBeamformerSYCL::RxSampleBeamformer sampleBeamformer,
shared_ptr<const USRawData> rawData,
double fNumber,
double speedOfSoundMMperS,
diff --git a/src/SupraLib/Beamformer/RxBeamformerCuda.h b/src/SupraLib/Beamformer/RxBeamformerSYCL.h
similarity index 91%
rename from src/SupraLib/Beamformer/RxBeamformerCuda.h
rename to src/SupraLib/Beamformer/RxBeamformerSYCL.h
index 5d9f3cf..495f030 100644
--- a/src/SupraLib/Beamformer/RxBeamformerCuda.h
+++ b/src/SupraLib/Beamformer/RxBeamformerSYCL.h
@@ -9,8 +9,8 @@
//
// ================================================================================================
-#ifndef __RXBEAMFORMERCUDA_H__
-#define __RXBEAMFORMERCUDA_H__
+#ifndef __RXBEAMFORMERSYCL_H__
+#define __RXBEAMFORMERSYCL_H__
#include "USImage.h"
#include "WindowFunction.h"
@@ -25,7 +25,7 @@ namespace supra
using std::shared_ptr;
- class RxBeamformerCuda
+ class RxBeamformerSYCL
{
public:
enum RxSampleBeamformer {
@@ -35,8 +35,8 @@ namespace supra
INVALID
};
- RxBeamformerCuda(const RxBeamformerParameters& parameters);
- ~RxBeamformerCuda();
+ RxBeamformerSYCL(const RxBeamformerParameters& parameters);
+ ~RxBeamformerSYCL();
// perform the receive beamforming
template <typename ChannelDataType, typename ImageDataType>
@@ -78,4 +78,4 @@ namespace supra
};
}
-#endif //!__RXBEAMFORMERCUDA_H__
+#endif //!__RXBEAMFORMERSYCL_H__
diff --git a/src/SupraLib/Beamformer/ScanConverter.dp.cpp b/src/SupraLib/Beamformer/ScanConverter.dp.cpp
index 43f4504..a16e2d8 100644
--- a/src/SupraLib/Beamformer/ScanConverter.dp.cpp
+++ b/src/SupraLib/Beamformer/ScanConverter.dp.cpp
@@ -24,17 +24,16 @@
//
// ================================================================================================
+#include <oneapi/dpl/execution>
+#include <oneapi/dpl/algorithm>
+
#include <CL/sycl.hpp>
-#include <dpct/dpct.hpp>
#include "ScanConverter.h"
#include <cassert>
#include <utilities/syclUtility.h>
#include <utilities/utility.h>
#include <utilities/Logging.h>
-#include <dpct/dpl_utils.hpp>
-#include <oneapi/dpl/execution>
-#include <oneapi/dpl/algorithm>
#include <cmath>
using namespace std;
diff --git a/src/SupraLib/CMakeLists.txt b/src/SupraLib/CMakeLists.txt
index a2472b9..56a7f6a 100644
--- a/src/SupraLib/CMakeLists.txt
+++ b/src/SupraLib/CMakeLists.txt
@@ -193,14 +193,14 @@ IF(SUPRA_BEAMFORMER)
InputOutput/UltrasoundInterfaceRawDataMock.cpp
InputOutput/UltrasoundInterfaceBeamformedMock.cpp)
SET(SUPRA_Lib_CUDASOURCE ${SUPRA_Lib_CUDASOURCE}
- Beamformer/RxBeamformerCuda.dp.cpp
+ Beamformer/RxBeamformerSYCL.dp.cpp
Beamformer/HilbertFirEnvelope.dp.cpp
Beamformer/LogCompressor.dp.cpp
Beamformer/ScanConverter.dp.cpp)
SET(SUPRA_Lib_HEADERS ${SUPRA_Lib_HEADERS}
Beamformer/Sequencer.h
Beamformer/Beamformer.h
- Beamformer/RxBeamformerCuda.h
+ Beamformer/RxBeamformerSYCL.h
Beamformer/RxBeamformerCommon.h
Beamformer/RxSampleBeamformerDelayAndSum.h
Beamformer/RxSampleBeamformerDelayAndStdDev.h
diff --git a/src/Wrapper/CMakeLists.txt b/src/Wrapper/CMakeLists.txt
index 2562392..749ba26 100644
--- a/src/Wrapper/CMakeLists.txt
+++ b/src/Wrapper/CMakeLists.txt
@@ -28,7 +28,7 @@ TARGET_COMPILE_DEFINITIONS(SUPRA_Wrapper
TARGET_LINK_LIBRARIES(SUPRA_Wrapper
${SUPRA_Lib_LIBRARIES}
)
-set_property(TARGET SUPRA_Wrapper PROPERTY CXX_STANDARD 11)
+set_property(TARGET SUPRA_Wrapper PROPERTY CXX_STANDARD 17)
set_property(TARGET SUPRA_Wrapper PROPERTY CXX_STANDARD_REQUIRED ON)
add_dependencies(SUPRA_Wrapper SUPRA_Lib)
--
2.17.1