forked from junnengzhao/supra-on-oneapi
-
Notifications
You must be signed in to change notification settings - Fork 0
/
0002-modify-to-run.patch
1536 lines (1455 loc) · 63.2 KB
/
0002-modify-to-run.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
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
From 4ca60200efcde25f49195c37d2a432b305bf0f57 Mon Sep 17 00:00:00 2001
From: wangyon1 <yong4.wang@intel.com>
Date: Thu, 4 Feb 2021 15:17:44 +0800
Subject: [PATCH 2/4] modify to run
---
CMakeLists.txt | 16 +-
src/SupraLib/AbstractInput.h | 2 +
src/SupraLib/AbstractNode.h | 3 +
src/SupraLib/Beamformer/Beamformer.cpp | 9 +-
.../Beamformer/HilbertEnvelopeNode.cpp | 2 +-
.../Beamformer/HilbertFirEnvelope.dp.cpp | 17 +-
src/SupraLib/Beamformer/LogCompressor.dp.cpp | 39 +++--
src/SupraLib/Beamformer/RxBeamformerCommon.h | 4 +-
.../Beamformer/RxBeamformerCuda.dp.cpp | 66 +++----
.../RxSampleBeamformerDelayAndStdDev.h | 8 +-
.../RxSampleBeamformerDelayAndSum.h | 8 +-
src/SupraLib/Beamformer/ScanConverter.dp.cpp | 71 ++++----
src/SupraLib/Beamformer/WindowFunction.cpp | 3 +-
src/SupraLib/Beamformer/WindowFunction.h | 6 +-
src/SupraLib/CMakeLists.txt | 165 +++---------------
src/SupraLib/Container.h | 138 +++++----------
src/SupraLib/ContainerFactory.cpp.dp.cpp | 43 ++---
src/SupraLib/ContainerFactory.h | 4 +-
src/SupraLib/InterfaceFactory.cpp | 34 ++--
src/SupraLib/utilities/DataType.cpp | 4 +-
src/SupraLib/utilities/FirFilterFactory.h | 7 +-
.../{cudaUtility.h => syclUtility.h} | 6 +-
src/SupraLib/utilities/utility.h | 12 ++
src/SupraLib/vec.h | 4 +-
24 files changed, 248 insertions(+), 423 deletions(-)
rename src/SupraLib/utilities/{cudaUtility.h => syclUtility.h} (95%)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 528fb8a..f38509f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,24 +9,18 @@ SET(PATCH_VERSION "0")
MESSAGE( STATUS "CMAKE_GENERATOR: ${CMAKE_GENERATOR}")
MESSAGE( STATUS "CMAKE_CL_64: ${CMAKE_CL_64}")
-SET(CMAKE_CXX_STANDARD 11)
+
+SET(CMAKE_CXX_STANDARD 17)
SET(CMAKE_CXX_STANDARD_REQUIRED ON)
SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-FIND_PACKAGE( OpenMP REQUIRED)
-if(OPENMP_FOUND)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
-endif()
-IF(WIN32)
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
-ENDIF(WIN32)
+
+
# options for modules to include
OPTION(SUPRA_PROFILING "Add profiling message to logfile" OFF)
OPTION(SUPRA_WARNINGS_AS_ERRORS "Treat all build warnings as errors (NOT on windows)" OFF)
-OPTION(SUPRA_DOWNLOAD_SAMPLEDATA "Whether sample data should be downloaded" ON)
+OPTION(SUPRA_DOWNLOAD_SAMPLEDATA "Whether sample data should be downloaded" OFF)
OPTION(SUPRA_CUDA "Use cuda in SUPRA" ON)
OPTION(SUPRA_CUDA_PORTABLE "Build for all supported CUDA architectures" OFF)
OPTION(SUPRA_TORCH "Use pytorch in SUPRA" OFF)
diff --git a/src/SupraLib/AbstractInput.h b/src/SupraLib/AbstractInput.h
index 66b1d5c..a3b8f8d 100644
--- a/src/SupraLib/AbstractInput.h
+++ b/src/SupraLib/AbstractInput.h
@@ -18,7 +18,9 @@
#include <tuple>
#include <array>
+#undef emit
#include <tbb/flow_graph.h>
+#define emit
#include "AbstractNode.h"
#include "utilities/SingleThreadTimer.h"
diff --git a/src/SupraLib/AbstractNode.h b/src/SupraLib/AbstractNode.h
index 33db7b0..291c9ed 100644
--- a/src/SupraLib/AbstractNode.h
+++ b/src/SupraLib/AbstractNode.h
@@ -13,7 +13,10 @@
#define __ABSTRACTNODE_H__
#include <memory>
+
+#undef emit
#include <tbb/flow_graph.h>
+#define emit
#include "ConfigurationDictionary.h"
#include "ValueRangeDictionary.h"
diff --git a/src/SupraLib/Beamformer/Beamformer.cpp b/src/SupraLib/Beamformer/Beamformer.cpp
index 799b1ef..e83a29d 100644
--- a/src/SupraLib/Beamformer/Beamformer.cpp
+++ b/src/SupraLib/Beamformer/Beamformer.cpp
@@ -30,6 +30,7 @@ namespace supra
using std::tuple;
using namespace logging;
+
Beamformer::Beamformer()
: m_pRxBeamformerParameters(nullptr)
@@ -931,7 +932,7 @@ namespace supra
((relativeIndex.y - 0.5)*m_txFocusWidth)*scanlinePerpDirY;
vec elementToFocus = scanlineStart3 + m_txFocusDepth*scanlineDir + focusPointFromFocusCenter - elementPos;
double transitTime = m_pTransducer->computeTransitTime(elementIndex, elementToFocus, m_speedOfSoundMMperS, m_correctMatchingLayers);
- maxTransitTime = max(maxTransitTime, transitTime);
+ maxTransitTime = std::max(maxTransitTime, transitTime);
}
for (size_t activeElementIdxX = txAperture.begin.x; activeElementIdxX <= txAperture.end.x; activeElementIdxX++)
@@ -965,7 +966,7 @@ namespace supra
double transitTime = m_pTransducer->computeTransitTime(vec2s{ activeElementIdxX, activeElementIdxY }, elementToFocus, m_speedOfSoundMMperS, m_correctMatchingLayers);
double delay = maxTransitTime - transitTime;
params.delays[localElementIdxX][localElementIdxY] = delay;
- maxDelay = max(maxDelay, delay);
+ maxDelay = std::max(maxDelay, delay);
}
}
}
@@ -976,7 +977,7 @@ namespace supra
{
auto elementPos = std::get<2>(t);
vec d = (scanlineStart3 - elementPos)*scanlineDir;
- maxTransitTime = max(maxTransitTime, (d.x + d.y + d.z + m_txFocusDepth) / m_speedOfSoundMMperS);
+ maxTransitTime = std::max(maxTransitTime, (d.x + d.y + d.z + m_txFocusDepth) / m_speedOfSoundMMperS);
}
for (size_t activeElementIdxX = txAperture.begin.x; activeElementIdxX <= txAperture.end.x; activeElementIdxX++)
@@ -993,7 +994,7 @@ namespace supra
double delay = maxTransitTime - transitTime;
params.delays[localElementIdxX][localElementIdxY] = delay;
- maxDelay = max(maxDelay, delay);
+ maxDelay = std::max(maxDelay, delay);
}
}
}
diff --git a/src/SupraLib/Beamformer/HilbertEnvelopeNode.cpp b/src/SupraLib/Beamformer/HilbertEnvelopeNode.cpp
index a9aa775..ad8ee3a 100644
--- a/src/SupraLib/Beamformer/HilbertEnvelopeNode.cpp
+++ b/src/SupraLib/Beamformer/HilbertEnvelopeNode.cpp
@@ -16,7 +16,7 @@
#include <utilities/Logging.h>
//TODO remove this later
-#include <utilities/cudaUtility.h>
+#include <utilities/syclUtility.h>
using namespace std;
diff --git a/src/SupraLib/Beamformer/HilbertFirEnvelope.dp.cpp b/src/SupraLib/Beamformer/HilbertFirEnvelope.dp.cpp
index f2823f9..af16284 100644
--- a/src/SupraLib/Beamformer/HilbertFirEnvelope.dp.cpp
+++ b/src/SupraLib/Beamformer/HilbertFirEnvelope.dp.cpp
@@ -92,10 +92,9 @@ namespace supra
sycl::range<3> gridSizeFilter(1, static_cast<unsigned int>((numSamples + blockSizeFilter[ 1 ] - 1) / blockSizeFilter[ 1 ]),
static_cast<unsigned int>((numScanlines + blockSizeFilter[ 2 ] - 1) / blockSizeFilter[ 2 ]));
- /*
- DPCT1049:27: The workgroup size passed to the SYCL kernel may exceed the limit. To get the device limit, query info::device::max_work_group_size. Adjust the workgroup size if needed.
- */
- inImageData->getStream()->submit([ & ](sycl::handler& cgh) {
+ static long hilbert_call_count = 0;
+
+ sycl::event hilbert_event = inImageData->getStream()->submit([ & ](sycl::handler& cgh) {
auto inImageData_get_ct0 = inImageData->get();
auto m_hilbertFilter_get_ct1 = m_hilbertFilter->get();
auto pEnv_get_ct2 = pEnv->get();
@@ -105,10 +104,12 @@ namespace supra
kernelFilterDemodulation(inImageData_get_ct0, m_hilbertFilter_get_ct1, pEnv_get_ct2, numSamples, numScanlines, m_filterLength_ct5, item_ct1);
});
});
- /*
- DPCT1010:26: SYCL uses exceptions to report errors and does not use the error codes. The call was replaced with 0. You need to rewrite this code.
- */
- cudaSafeCall(0);
+
+ hilbert_event.wait();
+ hilbert_call_count++;
+ std::string msg = "Hilbert run " + std::to_string(hilbert_call_count) + " times: ";
+ Report_time(msg, hilbert_event);
+
return pEnv;
}
diff --git a/src/SupraLib/Beamformer/LogCompressor.dp.cpp b/src/SupraLib/Beamformer/LogCompressor.dp.cpp
index 7389daf..70bc68b 100644
--- a/src/SupraLib/Beamformer/LogCompressor.dp.cpp
+++ b/src/SupraLib/Beamformer/LogCompressor.dp.cpp
@@ -12,6 +12,7 @@
#include <CL/sycl.hpp>
#include <dpct/dpct.hpp>
#include "LogCompressor.h"
+#include <utilities/utility.h>
#include <dpct/dpl_utils.hpp>
#include <oneapi/dpl/execution>
@@ -23,11 +24,9 @@ using namespace std;
namespace supra
{
template <typename In, typename Out, typename WorkType>
- /*
- DPCT1044:29: thrust::unary_function was removed because std::unary_function has been deprecated in C++11. You may need to remove references to typedefs from thrust::unary_function in the class
- definition.
- */
- struct thrustLogcompress {
+
+ struct thrustLogcompress
+ {
WorkType _inScale;
WorkType _scaleOverDenominator;
@@ -36,12 +35,12 @@ namespace supra
// of the downscaled (_inMax) input signal
thrustLogcompress(double dynamicRange, In inMax, Out outMax, double scale)
: _inScale(static_cast<WorkType>(dynamicRange / inMax))
- , _scaleOverDenominator(static_cast<WorkType>(scale * outMax / log10(dynamicRange + 1)))
+ , _scaleOverDenominator(static_cast<WorkType>(scale * outMax / sycl::log10(dynamicRange + 1)))
{};
Out operator()(const In& a) const
{
- WorkType val = log10(abs(static_cast<WorkType>(a))*_inScale + (WorkType)1) * _scaleOverDenominator;
+ WorkType val = sycl::log10(std::abs(static_cast<WorkType>(a))*_inScale + (WorkType)1) * _scaleOverDenominator;
return clampCast<Out>(val);
}
};
@@ -66,11 +65,27 @@ namespace supra
}
thrustLogcompress<InputType, OutputType, WorkType> c(sycl::pow<double>(10, (dynamicRange / 20)), static_cast<InputType>(inMax), outMax, scale);
- std::transform(thrust::cuda::par.on(inImageData->getStream()), inImageData->get(), inImageData->get() + (width * height * depth), pComprGpu->get(), c);
- /*
- DPCT1010:28: SYCL uses exceptions to report errors and does not use the error codes. The call was replaced with 0. You need to rewrite this code.
- */
- cudaSafeCall(0);
+
+ auto inImageData_t = inImageData->get();
+ auto pComprGpu_t = pComprGpu->get();
+ inImageData->getStream()->wait();
+
+ static long log_call_count = 0;
+ static std::chrono::duration<double, std::milli> log_total_duration(0);
+
+ sycl::event log_event = inImageData->getStream()->submit([&] (sycl::handler &h) {
+
+ h.parallel_for<>(sycl::range<1>(width * height * depth), [=](sycl::id<1> idx){
+ pComprGpu_t[idx] = c(inImageData_t[idx]);
+ });
+
+ });
+
+ inImageData->getStream()->wait();
+ log_event.wait();
+ log_call_count++;
+ std::string Log_msg = "Log run " + std::to_string(log_call_count) + " times: ";
+ Report_time(Log_msg, log_event);
return pComprGpu;
}
diff --git a/src/SupraLib/Beamformer/RxBeamformerCommon.h b/src/SupraLib/Beamformer/RxBeamformerCommon.h
index 1527995..f86b5b9 100644
--- a/src/SupraLib/Beamformer/RxBeamformerCommon.h
+++ b/src/SupraLib/Beamformer/RxBeamformerCommon.h
@@ -29,7 +29,7 @@ namespace supra
template <typename T>
inline T computeDelayDTSPACE_D(T dirX, T dirY, T dirZ, T x_element, T x, T z)
{
- return sqrt((x_element - (x + dirX*z))*
+ return sycl::sqrt((x_element - (x + dirX*z))*
(x_element - (x + dirX*z)) +
(dirY*z)*(dirY*z)) + z;
}
@@ -37,7 +37,7 @@ namespace supra
template <typename T>
inline T computeDelayDTSPACE3D_D(T dirX, T dirY, T dirZ, T x_element, T z_element, T x, T z, T d)
{
- return sqrt(
+ return sycl::sqrt(
squ(x_element - (x + dirX*d)) +
squ(z_element - (z + dirZ*d)) +
squ(dirY*d)) + d;
diff --git a/src/SupraLib/Beamformer/RxBeamformerCuda.dp.cpp b/src/SupraLib/Beamformer/RxBeamformerCuda.dp.cpp
index 39f80ff..d97c382 100644
--- a/src/SupraLib/Beamformer/RxBeamformerCuda.dp.cpp
+++ b/src/SupraLib/Beamformer/RxBeamformerCuda.dp.cpp
@@ -17,7 +17,8 @@
#include "RxSampleBeamformerDelayAndStdDev.h"
#include "RxSampleBeamformerTestSignal.h"
#include "RxBeamformerCommon.h"
-#include "utilities/cudaUtility.h"
+#include "utilities/syclUtility.h"
+#include <utilities/utility.h>
//TODO ALL ELEMENT/SCANLINE Y positons are actually Z! Change all variable names accordingly
namespace supra
@@ -25,8 +26,7 @@ namespace supra
RxBeamformerCuda::RxBeamformerCuda(const RxBeamformerParameters & parameters)
: m_windowFunction(nullptr)
{
- dpct::device_ext& dev_ct1 = dpct::get_current_device();
- sycl::queue& q_ct1 = dev_ct1.default_queue();
+
m_lastSeenDt = 0;
m_numRxScanlines = parameters.getNumRxScanlines();
m_rxScanlineLayout = parameters.getRxScanlineLayout();
@@ -35,6 +35,9 @@ namespace supra
m_speedOfSoundMMperS = parameters.getSpeedOfSoundMMperS();
m_rxNumDepths = parameters.getRxNumDepths();
+ dpct::device_ext& dev_ct1 = dpct::get_current_device();
+ sycl::queue& q_ct1 = dev_ct1.default_queue();
+
// create and fill new buffers
m_pRxDepths = std::unique_ptr<Container<LocationType>>(new Container<LocationType>(LocationGpu, &q_ct1, parameters.getRxDepths()));
@@ -315,9 +318,7 @@ namespace supra
{
if (interpolateBetweenTransmits)
{
- /*
- DPCT1049:32: The workgroup size passed to the SYCL kernel may exceed the limit. To get the device limit, query info::device::max_work_group_size. Adjust the workgroup size if needed.
- */
+
stream->submit([ & ](sycl::handler& cgh) {
sycl::accessor<LocationType, 1, sycl::access::mode::read_write, sycl::access::target::local> x_elemsDTsh_acc_ct1(sycl::range<1>(1024), cgh);
sycl::accessor<LocationType, 1, sycl::access::mode::read_write, sycl::access::target::local> z_elemsDTsh_acc_ct1(sycl::range<1>(1024), cgh);
@@ -334,9 +335,7 @@ namespace supra
});
}
else {
- /*
- DPCT1049:33: The workgroup size passed to the SYCL kernel may exceed the limit. To get the device limit, query info::device::max_work_group_size. Adjust the workgroup size if needed.
- */
+
stream->submit([ & ](sycl::handler& cgh) {
sycl::accessor<LocationType, 1, sycl::access::mode::read_write, sycl::access::target::local> x_elemsDTsh_acc_ct1(sycl::range<1>(1024), cgh);
sycl::accessor<LocationType, 1, sycl::access::mode::read_write, sycl::access::target::local> z_elemsDTsh_acc_ct1(sycl::range<1>(1024), cgh);
@@ -356,9 +355,7 @@ namespace supra
else {
if (interpolateBetweenTransmits)
{
- /*
- DPCT1049:34: The workgroup size passed to the SYCL kernel may exceed the limit. To get the device limit, query info::device::max_work_group_size. Adjust the workgroup size if needed.
- */
+
stream->submit([ & ](sycl::handler& cgh) {
sycl::accessor<LocationType, 1, sycl::access::mode::read_write, sycl::access::target::local> x_elemsDTsh_acc_ct1(sycl::range<1>(1024), cgh);
sycl::accessor<LocationType, 1, sycl::access::mode::read_write, sycl::access::target::local> z_elemsDTsh_acc_ct1(sycl::range<1>(1024), cgh);
@@ -375,9 +372,7 @@ namespace supra
});
}
else {
- /*
- DPCT1049:35: The workgroup size passed to the SYCL kernel may exceed the limit. To get the device limit, query info::device::max_work_group_size. Adjust the workgroup size if needed.
- */
+
stream->submit([ & ](sycl::handler& cgh) {
sycl::accessor<LocationType, 1, sycl::access::mode::read_write, sycl::access::target::local> x_elemsDTsh_acc_ct1(sycl::range<1>(1024), cgh);
sycl::accessor<LocationType, 1, sycl::access::mode::read_write, sycl::access::target::local> z_elemsDTsh_acc_ct1(sycl::range<1>(1024), cgh);
@@ -394,10 +389,7 @@ namespace supra
});
}
}
- /*
- DPCT1010:36: SYCL uses exceptions to report errors and does not use the error codes. The call was replaced with 0. You need to rewrite this code.
- */
- cudaSafeCall(0);
+
}
template <class SampleBeamformer, typename RFType, typename ResultType, typename LocationType>
@@ -411,9 +403,7 @@ namespace supra
{
if (interpolateBetweenTransmits)
{
- /*
- DPCT1049:37: The workgroup size passed to the SYCL kernel may exceed the limit. To get the device limit, query info::device::max_work_group_size. Adjust the workgroup size if needed.
- */
+
stream->submit([ & ](sycl::handler& cgh) {
cgh.parallel_for(sycl::nd_range<3>(gridSize * blockSize, blockSize), [ = ](sycl::nd_item<3> item_ct1) {
rxBeamformingDTSPACEKernel<SampleBeamformer, true, true>(numTransducerElements, numReceivedChannels, numTimesteps, RF, numTxScanlines, numRxScanlines, scanlines,
@@ -422,23 +412,26 @@ namespace supra
});
}
else {
- /*
- DPCT1049:38: The workgroup size passed to the SYCL kernel may exceed the limit. To get the device limit, query info::device::max_work_group_size. Adjust the workgroup size if needed.
- */
- stream->submit([ & ](sycl::handler& cgh) {
+
+ static long beam_call_count = 0;
+
+ sycl::event beam_event = stream->submit([ & ](sycl::handler& cgh) {
cgh.parallel_for(sycl::nd_range<3>(gridSize * blockSize, blockSize), [ = ](sycl::nd_item<3> item_ct1) {
rxBeamformingDTSPACEKernel<SampleBeamformer, true, false>(numTransducerElements, numReceivedChannels, numTimesteps, RF, numTxScanlines, numRxScanlines, scanlines,
numZs, zs, x_elems, speedOfSound, dt, additionalOffset, F, windowFunction, s, item_ct1);
});
});
+
+ beam_event.wait();
+ beam_call_count++;
+ std::string msg = "Beamforming run " + std::to_string(beam_call_count) + " times: ";
+ Report_time(msg, beam_event);
}
}
else {
if (interpolateBetweenTransmits)
{
- /*
- DPCT1049:39: The workgroup size passed to the SYCL kernel may exceed the limit. To get the device limit, query info::device::max_work_group_size. Adjust the workgroup size if needed.
- */
+
stream->submit([ & ](sycl::handler& cgh) {
cgh.parallel_for(sycl::nd_range<3>(gridSize * blockSize, blockSize), [ = ](sycl::nd_item<3> item_ct1) {
rxBeamformingDTSPACEKernel<SampleBeamformer, false, true>(numTransducerElements, numReceivedChannels, numTimesteps, RF, numTxScanlines, numRxScanlines, scanlines,
@@ -447,9 +440,7 @@ namespace supra
});
}
else {
- /*
- DPCT1049:40: The workgroup size passed to the SYCL kernel may exceed the limit. To get the device limit, query info::device::max_work_group_size. Adjust the workgroup size if needed.
- */
+
stream->submit([ & ](sycl::handler& cgh) {
cgh.parallel_for(sycl::nd_range<3>(gridSize * blockSize, blockSize), [ = ](sycl::nd_item<3> item_ct1) {
rxBeamformingDTSPACEKernel<SampleBeamformer, false, false>(numTransducerElements, numReceivedChannels, numTimesteps, RF, numTxScanlines, numRxScanlines, scanlines,
@@ -458,10 +449,7 @@ namespace supra
});
}
}
- /*
- DPCT1010:41: SYCL uses exceptions to report errors and does not use the error codes. The call was replaced with 0. You need to rewrite this code.
- */
- cudaSafeCall(0);
+
}
template <typename ChannelDataType, typename ImageDataType>
@@ -494,7 +482,9 @@ namespace supra
auto beamformingFunction3D = &rxBeamformingDTspaceCuda3D<RxSampleBeamformerDelayAndSum, m_windowFunctionNumEntries, ChannelDataType, ImageDataType, LocationType>;
auto beamformingFunction2D = &rxBeamformingDTspaceCuda<RxSampleBeamformerDelayAndSum, ChannelDataType, ImageDataType, LocationType>;
- switch (sampleBeamformer)
+
+ // 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>;
@@ -512,7 +502,7 @@ namespace supra
default:
beamformingFunction3D = &rxBeamformingDTspaceCuda3D<RxSampleBeamformerDelayAndSum, m_windowFunctionNumEntries, ChannelDataType, ImageDataType, LocationType>;
beamformingFunction2D = &rxBeamformingDTspaceCuda<RxSampleBeamformerDelayAndSum, ChannelDataType, ImageDataType, LocationType>;
- }
+ }*/
convertToDtSpace(dt, speedOfSoundMMperS, rawData->getNumElements());
diff --git a/src/SupraLib/Beamformer/RxSampleBeamformerDelayAndStdDev.h b/src/SupraLib/Beamformer/RxSampleBeamformerDelayAndStdDev.h
index d72079d..9e5e845 100644
--- a/src/SupraLib/Beamformer/RxSampleBeamformerDelayAndStdDev.h
+++ b/src/SupraLib/Beamformer/RxSampleBeamformerDelayAndStdDev.h
@@ -107,7 +107,7 @@ namespace supra
{
LocationType delayf = initialDelay +
computeDelayDTSPACE3D_D(dirX, dirY, dirZ, x_elem, z_elem, scanline_x, scanline_z, depth) + additionalOffset;
- uint32_t delay = static_cast<uint32_t>(::floor(delayf));
+ uint32_t delay = static_cast<uint32_t>(sycl::floor(delayf));
delayf -= delay;
if (delay < (numTimesteps - 1))
{
@@ -122,7 +122,7 @@ namespace supra
}
else
{
- uint32_t delay = static_cast<uint32_t>(::round(
+ uint32_t delay = static_cast<uint32_t>(sycl::round(
initialDelay + computeDelayDTSPACE3D_D(dirX, dirY, dirZ, x_elem, z_elem, scanline_x, scanline_z, depth)) + additionalOffset);
if (delay < numTimesteps)
{
@@ -204,7 +204,7 @@ namespace supra
{
LocationType delayf = initialDelay +
computeDelayDTSPACE_D(dirX, dirY, dirZ, x_elem, scanline_x, depth) + additionalOffset;
- int32_t delay = static_cast<int32_t>(floor(delayf));
+ int32_t delay = static_cast<int32_t>(sycl::floor(delayf));
delayf -= delay;
if (delay < (numTimesteps - 1))
{
@@ -219,7 +219,7 @@ namespace supra
}
else
{
- int32_t delay = static_cast<int32_t>(round(
+ int32_t delay = static_cast<int32_t>(sycl::round(
initialDelay + computeDelayDTSPACE_D(dirX, dirY, dirZ, x_elem, scanline_x, depth)) + additionalOffset);
if (delay < numTimesteps)
{
diff --git a/src/SupraLib/Beamformer/RxSampleBeamformerDelayAndSum.h b/src/SupraLib/Beamformer/RxSampleBeamformerDelayAndSum.h
index 0684605..f5330d5 100644
--- a/src/SupraLib/Beamformer/RxSampleBeamformerDelayAndSum.h
+++ b/src/SupraLib/Beamformer/RxSampleBeamformerDelayAndSum.h
@@ -72,7 +72,7 @@ namespace supra
{
LocationType delayf = initialDelay +
computeDelayDTSPACE3D_D(dirX, dirY, dirZ, x_elem, z_elem, scanline_x, scanline_z, depth) + additionalOffset;
- uint32_t delay = static_cast<uint32_t>(::floor(delayf));
+ uint32_t delay = static_cast<uint32_t>(sycl::floor(delayf));
delayf -= delay;
if (delay < (numTimesteps - 1))
{
@@ -87,7 +87,7 @@ namespace supra
}
else
{
- uint32_t delay = static_cast<uint32_t>(::round(
+ uint32_t delay = static_cast<uint32_t>(sycl::round(
initialDelay + computeDelayDTSPACE3D_D(dirX, dirY, dirZ, x_elem, z_elem, scanline_x, scanline_z, depth)) + additionalOffset);
if (delay < numTimesteps)
{
@@ -147,7 +147,7 @@ namespace supra
{
LocationType delayf = initialDelay +
computeDelayDTSPACE_D(dirX, dirY, dirZ, x_elem, scanline_x, depth) + additionalOffset;
- int32_t delay = static_cast<int32_t>(floor(delayf));
+ int32_t delay = static_cast<int32_t>(sycl::floor(delayf));
delayf -= delay;
if (delay < (numTimesteps - 1))
{
@@ -162,7 +162,7 @@ namespace supra
}
else
{
- int32_t delay = static_cast<int32_t>(round(
+ int32_t delay = static_cast<int32_t>(sycl::round(
initialDelay + computeDelayDTSPACE_D(dirX, dirY, dirZ, x_elem, scanline_x, depth)) + additionalOffset);
if (delay < numTimesteps)
{
diff --git a/src/SupraLib/Beamformer/ScanConverter.dp.cpp b/src/SupraLib/Beamformer/ScanConverter.dp.cpp
index fd49274..43f4504 100644
--- a/src/SupraLib/Beamformer/ScanConverter.dp.cpp
+++ b/src/SupraLib/Beamformer/ScanConverter.dp.cpp
@@ -28,7 +28,8 @@
#include <dpct/dpct.hpp>
#include "ScanConverter.h"
#include <cassert>
-#include <utilities/cudaUtility.h>
+#include <utilities/syclUtility.h>
+#include <utilities/utility.h>
#include <utilities/Logging.h>
#include <dpct/dpl_utils.hpp>
@@ -90,7 +91,7 @@ namespace supra
pointInsideTetrahedron(s2, s3, e1, e4, voxelPos))
{
- thrust::pair<vec3T<Tf>, bool> params = mapToParameters3D<Tf, Ti>(
+ std::pair<vec3T<Tf>, bool> params = mapToParameters3D<Tf, Ti>(
scanline1Pos,
scanline2Pos,
scanline3Pos,
@@ -185,7 +186,7 @@ namespace supra
}
template <typename Tf, typename Ti>
- static thrust::pair<vec3T<Tf>, bool> mapToParameters3D(
+ static std::pair<vec3T<Tf>, bool> mapToParameters3D(
const vec3T<Tf> & a,
const vec3T<Tf> & ax,
const vec3T<Tf> & ay,
@@ -215,7 +216,7 @@ namespace supra
if (dot(lowConnX, highConnX) > 0 || dot(lowConnY, highConnY) > 0)
{
- return thrust::pair<vec3T<Tf>, bool>(vec3T<Tf>{ 0, 0, 0 }, false);
+ return std::pair<vec3T<Tf>, bool>(vec3T<Tf>{ 0, 0, 0 }, false);
}
vec2T<Tf> dist = { 1e10, 1e10 };
@@ -273,7 +274,7 @@ namespace supra
vec3T<Tf> lineBase = (1 - t.y)*planeBaseX1 + t.y*planeBaseX2;
Tf d = norm(x - lineBase);
- return thrust::pair<vec3T<Tf>, bool>(vec3T<Tf>{ t.x, t.y, d }, true);
+ return std::pair<vec3T<Tf>, bool>(vec3T<Tf>{ t.x, t.y, d }, true);
}
};
@@ -455,13 +456,13 @@ namespace supra
if (m_is2D)
{
- sycl::range<3> blockSize(1, 256, 1);
+ sycl::range<3> blockSize(1, 8, 16);
sycl::range<3> gridSize(1, static_cast<unsigned int>((m_imageSize.y + blockSize[ 1 ] - 1) / blockSize[ 1 ]),
static_cast<unsigned int>((m_imageSize.x + blockSize[ 2 ] - 1) / blockSize[ 2 ]));
- /*
- DPCT1049:22: The workgroup size passed to the SYCL kernel may exceed the limit. To get the device limit, query info::device::max_work_group_size. Adjust the workgroup size if needed.
- */
- pScanlineData->getStream()->submit([ & ](sycl::handler& cgh) {
+
+ static long scan_call_count = 0;
+
+ sycl::event scan_event = pScanlineData->getStream()->submit([ & ](sycl::handler& cgh) {
auto m_imageSize_x_ct2 = ( uint32_t )m_imageSize.x;
auto m_imageSize_y_ct3 = ( uint32_t )m_imageSize.y;
auto m_mask_get_ct4 = m_mask->get();
@@ -476,10 +477,13 @@ namespace supra
pScanlineData_get_ct8, pConv_get_ct9, item_ct1);
});
});
- /*
- DPCT1010:20: SYCL uses exceptions to report errors and does not use the error codes. The call was replaced with 0. You need to rewrite this code.
- */
- cudaSafeCall(0);
+
+ scan_event.wait();
+ scan_call_count++;
+ std::string msg = "Scan run " + std::to_string(scan_call_count) + " times: ";
+ Report_time(msg, scan_event);
+
+
}
else
{
@@ -506,10 +510,7 @@ namespace supra
m_sampleIdx_get_ct7, m_weightX_get_ct8, m_weightY_get_ct9, m_weightZ_get_ct10, pScanlineData_get_ct11, pConv_get_ct12, item_ct1);
});
});
- /*
- DPCT1010:21: SYCL uses exceptions to report errors and does not use the error codes. The call was replaced with 0. You need to rewrite this code.
- */
- cudaSafeCall(0);
+
}
return pConv;
}
@@ -535,8 +536,8 @@ namespace supra
void ScanConverter::updateInternals(const std::shared_ptr<const USImageProperties>& inImageProps)
{
- dpct::device_ext& dev_ct1 = dpct::get_current_device();
- sycl::queue& q_ct1 = dev_ct1.default_queue();
+ dpct::device_ext& dev_ct1 = dpct::get_current_device();
+ sycl::queue& q_ct1 = dev_ct1.default_queue();
logging::log_log("Scanconverter: Updating scanconversion internals");
//Check the scanline configuration for validity
@@ -675,17 +676,19 @@ namespace supra
m_weightX = make_shared<Container<WeightType> >(ContainerLocation::LocationHost, numelBuffers);
m_weightY = make_shared<Container<WeightType> >(ContainerLocation::LocationHost, numelBuffers);
m_weightZ = make_shared<Container<WeightType> >(ContainerLocation::LocationHost, numelBuffers);*/
- m_mask = make_shared<Container<uint8_t>>(ContainerLocation::LocationGpu, &q_ct1, numelBuffers);
- m_sampleIdx = make_shared<Container<IndexType>>(ContainerLocation::LocationGpu, &q_ct1, numelBuffers);
- m_weightX = make_shared<Container<WeightType>>(ContainerLocation::LocationGpu, &q_ct1, numelBuffers);
- m_weightY = make_shared<Container<WeightType>>(ContainerLocation::LocationGpu, &q_ct1, numelBuffers);
- m_weightZ = make_shared<Container<WeightType>>(ContainerLocation::LocationGpu, &q_ct1, numelBuffers);
+ sycl::queue &default_queue=dpct::get_default_queue();
+ m_mask = make_shared<Container<uint8_t>>(ContainerLocation::LocationGpu, &default_queue, numelBuffers);
+ m_sampleIdx = make_shared<Container<IndexType>>(ContainerLocation::LocationGpu, &default_queue, numelBuffers);
+ m_weightX = make_shared<Container<WeightType>>(ContainerLocation::LocationGpu, &default_queue, numelBuffers);
+ m_weightY = make_shared<Container<WeightType>>(ContainerLocation::LocationGpu, &default_queue, numelBuffers);
+ m_weightZ = make_shared<Container<WeightType>>(ContainerLocation::LocationGpu, &default_queue, numelBuffers);
//create image mask
- /*
- DPCT1003:24: Migrated API does not return error code. (*, 0) is inserted. You may need to rewrite this code.
- */
- cudaSafeCall((q_ct1.memset(m_mask->get(), 0, m_mask->size() * sizeof(uint8_t)), 0));
+
+ //create image mask
+ m_mask->getStream()->submit([&](sycl::handler &h){
+ h.memset(m_mask->get(), 0, m_mask->size()*sizeof(uint8_t));
+ });
if (m_is2D)
{
@@ -839,17 +842,11 @@ namespace supra
static_cast<Tf>(resolution), m_mask_get_ct27, m_sampleIdx_get_ct28, m_weightX_get_ct29, m_weightY_get_ct30, m_weightZ_get_ct31, item_ct1);
});
});
- /*
- DPCT1010:26: SYCL uses exceptions to report errors and does not use the error codes. The call was replaced with 0. You need to rewrite this code.
- */
- cudaSafeCall(0);
+
}
}
}
- /*
- DPCT1003:27: Migrated API does not return error code. (*, 0) is inserted. You may need to rewrite this code.
- */
- cudaSafeCall((q_ct1.wait(), 0));
+
}
else
{
diff --git a/src/SupraLib/Beamformer/WindowFunction.cpp b/src/SupraLib/Beamformer/WindowFunction.cpp
index 26ec55b..06bc8f5 100644
--- a/src/SupraLib/Beamformer/WindowFunction.cpp
+++ b/src/SupraLib/Beamformer/WindowFunction.cpp
@@ -42,8 +42,9 @@ namespace supra
}
//Create the storage for the window functions
+ sycl::queue &default_queue=dpct::get_default_queue();
m_dataGpu = unique_ptr<Container<ElementType> >(
- new Container<ElementType>(LocationGpu, cudaStreamPerThread, m_data));
+ new Container<ElementType>(LocationGpu, &default_queue, m_data));
m_gpuFunction = WindowFunctionGpu(m_numEntriesPerFunction, m_dataGpu->get());
}
diff --git a/src/SupraLib/Beamformer/WindowFunction.h b/src/SupraLib/Beamformer/WindowFunction.h
index 2158d3a..4f69c89 100644
--- a/src/SupraLib/Beamformer/WindowFunction.h
+++ b/src/SupraLib/Beamformer/WindowFunction.h
@@ -21,7 +21,7 @@
#include <memory>
#include <Container.h>
#include <utilities/utility.h>
-#include <utilities/cudaUtility.h>
+#include <utilities/syclUtility.h>
#include <cmath>
namespace supra
@@ -51,10 +51,10 @@ namespace supra
public:
typedef float ElementType;
- WindowFunctionGpu(const WindowFunctionGpu& a)
+ /*WindowFunctionGpu(const WindowFunctionGpu& a)
: m_numEntriesPerFunction(a.m_numEntriesPerFunction)
, m_data(a.m_data)
- , m_scale(a.m_scale) {};
+ , m_scale(a.m_scale) {};*/
//Returns the weight of chosen window a the relative index
// relativeIndex has to be normalized to [-1, 1] (inclusive)
diff --git a/src/SupraLib/CMakeLists.txt b/src/SupraLib/CMakeLists.txt
index 22df44e..a2472b9 100644
--- a/src/SupraLib/CMakeLists.txt
+++ b/src/SupraLib/CMakeLists.txt
@@ -58,53 +58,11 @@ IF (SUPRA_DEVICE_CEPHASONICS)
INCLUDE(supraIncludeCephasonics)
ENDIF()
-IF(SUPRA_CUDA)
- include(supraIncludeCuda)
- set(CUDA_SEPARABLE_COMPILATION ON)
- MESSAGE(STATUS "Found Cuda Version " ${CUDA_VERSION_STRING})
- set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};-Wno-deprecated-gpu-targets;--use_fast_math;--default-stream=per-thread;-lineinfo")
- IF(CUDA_VERSION_STRING VERSION_GREATER "8.0")
- set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};--Wno-deprecated-declarations")
- IF(BUILD_SHARED_LIBS AND NOT WIN32)
- set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};-Xcompiler=-fPIC")
- ENDIF()
- ENDIF()
- IF(SUPRA_CUDA_PORTABLE)
- CUDA_SELECT_NVCC_ARCH_FLAGS(ARCH_FLAGS "Common" )
- ELSE()
- CUDA_SELECT_NVCC_ARCH_FLAGS(ARCH_FLAGS "Auto")
- ENDIF()
- MESSAGE(STATUS "Using nvcc arch flags: ${ARCH_FLAGS}")
- LIST(APPEND CUDA_NVCC_FLAGS ${ARCH_FLAGS})
- IF(NOT WIN32)
- # nvcc cannot handle the flag beeing set twice, so only set it if not present
- list(FIND CUDA_NVCC_FLAGS "-std=c++11" CUDA_NVCC_STD_FLAGa)
- list(FIND CUDA_NVCC_FLAGS "--std=c++11" CUDA_NVCC_STD_FLAGb)
- IF(CUDA_NVCC_STD_FLAGa EQUAL -1 AND CUDA_NVCC_STD_FLAGb EQUAL -1)
- set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};--std=c++11")
- ENDIF()
- ENDIF()
-
- # on win32 cufft is not supported
- IF(EXISTS ${CUDA_CUFFT_LIBRARIES})
- LIST(APPEND CUDA_LIBRARIES ${CUDA_CUFFT_LIBRARIES})
- SET(SUPRA_CUFFT TRUE)
- SET(SUPRA_Lib_DEFINES ${SUPRA_Lib_DEFINES} HAVE_CUFFT)
- ENDIF()
- LIST(APPEND CUDA_LIBRARIES ${CUDA_curand_LIBRARY} ${CUDA_nppif_LIBRARY} ${CUDA_nppist_LIBRARY} ${CUDA_nppial_LIBRARY})
-
- SET(SUPRA_Lib_DEFINES ${SUPRA_Lib_DEFINES}
- HAVE_CUDA)
- SET(SUPRA_Lib_INCLUDEDIRS ${SUPRA_Lib_INCLUDEDIRS}
- ${CUDA_INCLUDE_DIRS})
-
- IF(CUDA_cublas_LIBRARY)
- SET(SUPRA_CUDA_CUBLAS ON)
- SET(SUPRA_Lib_DEFINES ${SUPRA_Lib_DEFINES}
- HAVE_CUDA_CUBLAS)
- SET(CUDA_LIBRARIES ${CUDA_LIBRARIES} ${CUDA_cublas_LIBRARY})
- ENDIF()
-ENDIF(SUPRA_CUDA)
+
+
+SET(SUPRA_Lib_DEFINES ${SUPRA_Lib_DEFINES} HAVE_CUDA)
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c++11-narrowing -O2 -g")
+
#find IGTL Interface
IF(SUPRA_DEVICE_IGTL_OUTPUT OR SUPRA_DEVICE_TRACKING_IGTL)
@@ -129,7 +87,7 @@ ENDIF(SUPRA_PROFILING)
############################################
#lib base source files
SET(SUPRA_Lib_SOURCE
- ContainerFactory.cpp
+ ContainerFactory.cpp.dp.cpp
SupraManager.cpp
RecordObject.cpp
SyncRecordObject.cpp
@@ -149,7 +107,7 @@ SET(SUPRA_Lib_SOURCE
utilities/tinyxml2/tinyxml2.cpp
utilities/jsoncpp/jsoncpp.cpp
FrequencyLimiterNode.cpp
- StreamSyncNode.cpp
+ #StreamSyncNode.cpp
AutoQuitNode.cpp
ExampleNodes/ImageProcessingCpuNode.cpp)
SET(SUPRA_Lib_HEADERS
@@ -172,7 +130,7 @@ SET(SUPRA_Lib_HEADERS
TemporalOffsetNode.h
InterfaceFactory.h
utilities/utility.h
- utilities/cudaUtility.h
+ utilities/syclUtility.h
utilities/Buffer.h
utilities/Logging.h
utilities/CallFrequency.h
@@ -190,41 +148,9 @@ SET(SUPRA_Lib_HEADERS
IF(SUPRA_CUDA)
SET(SUPRA_Lib_SOURCE
- ${SUPRA_Lib_SOURCE}
- ExampleNodes/ImageProcessingCudaNode.cpp
- ExampleNodes/ImageProcessingCuda.cu
- ExampleNodes/ImageProcessingBufferCudaNode.cpp
- ExampleNodes/ImageProcessingBufferCuda.cu
- Processing/TimeGainCompensationNode.cpp
- Processing/TimeGainCompensation.cu
- Processing/FilterSradCuda.cu
- Processing/FilterSradCudaNode.cpp
- Processing/DarkFilterThresholdingCudaNode.cpp
- Processing/DarkFilterThresholdingCuda.cu
- Processing/BilateralFilterCudaNode.cpp
- Processing/BilateralFilterCuda.cu
- Processing/MedianFilterCudaNode.cpp
- Processing/MedianFilterCuda.cu
- NoiseNode.cpp
- NoiseCuda.cu)
+ ${SUPRA_Lib_SOURCE} )
SET(SUPRA_Lib_HEADERS
- ${SUPRA_Lib_HEADERS}
- ExampleNodes/ImageProcessingCudaNode.h
- ExampleNodes/ImageProcessingCuda.h
- ExampleNodes/ImageProcessingBufferCudaNode.h
- ExampleNodes/ImageProcessingBufferCuda.h
- Processing/TimeGainCompensationNode.h
- Processing/TimeGainCompensation.h
- Processing/FilterSradCudaNode.h
- Processing/FilterSradCuda.h
- Processing/DarkFilterThresholdingCudaNode.h
- Processing/DarkFilterThresholdingCuda.h
- Processing/BilateralFilterCudaNode.h
- Processing/BilateralFilterCuda.h
- Processing/MedianFilterCudaNode.h
- Processing/MedianFilterCuda.h
- NoiseNode.h
- NoiseCuda.h)
+ ${SUPRA_Lib_HEADERS})
ENDIF(SUPRA_CUDA)
SET(SUPRA_Lib_INCLUDEDIRS
@@ -260,23 +186,17 @@ IF(SUPRA_BEAMFORMER)
Beamformer/WindowFunction.cpp
Beamformer/USTransducer.cpp
Beamformer/BeamformingNode.cpp
- Beamformer/IQDemodulatorNode.cpp
Beamformer/HilbertFirEnvelopeNode.cpp
Beamformer/LogCompressorNode.cpp
Beamformer/ScanConverterNode.cpp
- Beamformer/TemporalFilterNode.cpp
- Beamformer/RawDelayNode.cpp
Beamformer/RxEventLimiterNode.cpp
InputOutput/UltrasoundInterfaceRawDataMock.cpp
InputOutput/UltrasoundInterfaceBeamformedMock.cpp)
SET(SUPRA_Lib_CUDASOURCE ${SUPRA_Lib_CUDASOURCE}
- Beamformer/RxBeamformerCuda.cu
- Beamformer/IQDemodulator.cu
- Beamformer/HilbertFirEnvelope.cu
- Beamformer/LogCompressor.cu
- Beamformer/ScanConverter.cu
- Beamformer/TemporalFilter.cu
- Beamformer/RawDelay.cu)
+ Beamformer/RxBeamformerCuda.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
@@ -305,55 +225,15 @@ IF(SUPRA_BEAMFORMER)
Beamformer/RxEventLimiterNode.h
InputOutput/UltrasoundInterfaceRawDataMock.h
InputOutput/UltrasoundInterfaceBeamformedMock.h)
- IF(SUPRA_CUFFT)
- SET(SUPRA_Lib_SOURCE ${SUPRA_Lib_SOURCE}
- Beamformer/HilbertEnvelopeNode.cpp)
- SET(SUPRA_Lib_CUDASOURCE ${SUPRA_Lib_CUDASOURCE}
- Beamformer/HilbertEnvelope.cu)
- SET(SUPRA_Lib_HEADERS ${SUPRA_Lib_HEADERS}
- Beamformer/HilbertEnvelope.h
- Beamformer/HilbertEnvelopeNode.h)
- ENDIF(SUPRA_CUFFT)
+
SET(SUPRA_Lib_DEFINES ${SUPRA_Lib_DEFINES}
HAVE_BEAMFORMER)
- SET(SUPRA_Lib_LIBRARIES ${SUPRA_Lib_LIBRARIES}
- ${CUDA_LIBRARIES})
+ SET(SUPRA_Lib_LIBRARIES ${SUPRA_Lib_LIBRARIES})
- IF(SUPRA_CUDA_CUBLAS)
- SET(SUPRA_Lib_HEADERS ${SUPRA_Lib_HEADERS}
- Beamformer/BeamformingMVNode.h
- Beamformer/BeamformingMVpcgNode.h
- Beamformer/RxBeamformerMV.h
- Beamformer/RxBeamformerMVpcg.h)
- SET(SUPRA_Lib_SOURCE ${SUPRA_Lib_SOURCE}
- Beamformer/BeamformingMVNode.cpp
- Beamformer/BeamformingMVpcgNode.cpp)
- SET(SUPRA_Lib_CUDASOURCE ${SUPRA_Lib_CUDASOURCE}
- Beamformer/RxBeamformerMV.cu
- Beamformer/RxBeamformerMVpcg.cu)
- SET(SUPRA_Lib_DEFINES ${SUPRA_Lib_DEFINES}
- HAVE_BEAMFORMER_MINIMUM_VARIANCE)
- ELSE()
- MESSAGE(STATUS "CUBLAS not found, NOT adding minimum variance beamformer")
- ENDIF()
ENDIF(SUPRA_BEAMFORMER)
-IF(SUPRA_TORCH)
- SET(SUPRA_Lib_SOURCE ${SUPRA_Lib_SOURCE}
- Processing/TorchInference.cpp
- Processing/TorchNode.cpp)
- SET(SUPRA_Lib_HEADERS ${SUPRA_Lib_HEADERS}
- Processing/TorchInference.h
- Processing/TorchNode.h)
- SET(SUPRA_Lib_DEFINES ${SUPRA_Lib_DEFINES}
- HAVE_TORCH)
- SET(SUPRA_Lib_INCLUDEDIRS ${SUPRA_Lib_INCLUDEDIRS}
- ${TORCH_INCLUDE_DIRS})
- SET(SUPRA_Lib_LIBRARIES ${SUPRA_Lib_LIBRARIES}
- ${TORCH_LIBRARIES})
-ENDIF(SUPRA_TORCH)
IF(SUPRA_DEVICE_ULTRASOUND_SIM)
SET(SUPRA_Lib_SOURCE ${SUPRA_Lib_SOURCE}
@@ -486,19 +366,14 @@ SOURCE_GROUP(inc FILES ${SUPRA_Lib_HEADERS})
INCLUDE_DIRECTORIES(SUPRA_Lib
${SUPRA_Lib_INCLUDEDIRS})
-IF(CUDA_FOUND)
-CUDA_ADD_LIBRARY(SUPRA_Lib
- ${SUPRA_Lib_SOURCE}
- ${SUPRA_Lib_HEADERS}
- ${SUPRA_Lib_CUDASOURCE}
-)
-ELSE ()
+
ADD_LIBRARY(SUPRA_Lib
${SUPRA_Lib_SOURCE}
${SUPRA_Lib_HEADERS}
${SUPRA_Lib_CUDASOURCE}
)
-ENDIF(CUDA_FOUND)
+
+
TARGET_INCLUDE_DIRECTORIES(SUPRA_Lib
PUBLIC ${SUPRA_Lib_INCLUDEDIRS}
)
@@ -511,7 +386,7 @@ ENDIF()
TARGET_COMPILE_DEFINITIONS(SUPRA_Lib
PRIVATE ${SUPRA_Lib_DEFINES})
-set_property(TARGET SUPRA_Lib PROPERTY CXX_STANDARD 11)
+set_property(TARGET SUPRA_Lib PROPERTY CXX_STANDARD 17)
set_property(TARGET SUPRA_Lib PROPERTY CXX_STANDARD_REQUIRED ON)
SET(SUPRA_Lib_INCLUDEDIRS ${SUPRA_Lib_INCLUDEDIRS} PARENT_SCOPE)
diff --git a/src/SupraLib/Container.h b/src/SupraLib/Container.h