Skip to content

Commit e79ea31

Browse files
KanclerzPiotrKanclerzPiotr
authored
Update Guided_montecarloMultiGPU_SYCLMigration to 2023 (#1250)
1 parent 0fa99ef commit e79ea31

15 files changed

+29
-35
lines changed

‎DirectProgramming/DPC++/MapReduce/guided_MonteCarloMultiGPU_SYCLMigration/02_sycl_dpct_migrated/src/MonteCarloMultiGPU.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#include <stdlib.h>
3737
#include <string.h>
3838

39-
#include <CL/sycl.hpp>
39+
#include <sycl/sycl.hpp>
4040
#include <dpct/dpct.hpp>
4141

4242
// includes, project

‎DirectProgramming/DPC++/MapReduce/guided_MonteCarloMultiGPU_SYCLMigration/02_sycl_dpct_migrated/src/MonteCarlo_common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
#ifndef MONTECARLO_COMMON_H
2929
#define MONTECARLO_COMMON_H
30-
#include <CL/sycl.hpp>
30+
#include <sycl/sycl.hpp>
3131
#include <dpct/dpct.hpp>
3232
#include <dpct/rng_utils.hpp>
3333
#include <oneapi/mkl.hpp>

‎DirectProgramming/DPC++/MapReduce/guided_MonteCarloMultiGPU_SYCLMigration/02_sycl_dpct_migrated/src/MonteCarlo_gold.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <stdio.h>
3030
#include <stdlib.h>
3131

32-
#include <CL/sycl.hpp>
32+
#include <sycl/sycl.hpp>
3333
#include <dpct/dpct.hpp>
3434
#include <dpct/rng_utils.hpp>
3535
#include <oneapi/mkl.hpp>

‎DirectProgramming/DPC++/MapReduce/guided_MonteCarloMultiGPU_SYCLMigration/02_sycl_dpct_migrated/src/MonteCarlo_kernel.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include <stdio.h>
3333
#include <stdlib.h>
3434

35-
#include <CL/sycl.hpp>
35+
#include <sycl/sycl.hpp>
3636
#include <dpct/dpct.hpp>
3737
#include <dpct/rng_utils.hpp>
3838
#include <oneapi/mkl.hpp>
@@ -263,11 +263,9 @@ extern "C" void MonteCarloGPU(TOptionPlan *plan, sycl::queue *stream) {
263263
plan->optionCount * sizeof(__TOptionData));
264264

265265
stream->submit([&](sycl::handler &cgh) {
266-
sycl::accessor<real, 1, sycl::access_mode::read_write,
267-
sycl::access::target::local>
266+
sycl::local_accessor<real, 1>
268267
s_SumCall_acc_ct1(sycl::range<1>(256 /*SUM_N*/), cgh);
269-
sycl::accessor<real, 1, sycl::access_mode::read_write,
270-
sycl::access::target::local>
268+
sycl::local_accessor<real, 1>
271269
s_Sum2Call_acc_ct1(sycl::range<1>(256 /*SUM_N*/), cgh);
272270

273271
auto plan_rngStates_ct0 = plan->rngStates;

‎DirectProgramming/DPC++/MapReduce/guided_MonteCarloMultiGPU_SYCLMigration/02_sycl_dpct_migrated/src/MonteCarlo_reduction.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#ifndef MONTECARLO_REDUCTION_CUH
2929
#define MONTECARLO_REDUCTION_CUH
3030

31-
#include <CL/sycl.hpp>
31+
#include <sycl/sycl.hpp>
3232
#include <dpct/dpct.hpp>
3333

3434
#include "MonteCarlo_common.h"

‎DirectProgramming/DPC++/MapReduce/guided_MonteCarloMultiGPU_SYCLMigration/03_sycl_migrated/src/MonteCarloMultiGPU.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#include <stdlib.h>
3737
#include <string.h>
3838

39-
#include <CL/sycl.hpp>
39+
#include <sycl/sycl.hpp>
4040

4141
// includes, project
4242
#include <helper_cuda.h> // helper functions (cuda error checking and initialization)
@@ -68,7 +68,7 @@ int adjustProblemSize(int GPU_N, int default_nOptions) {
6868

6969
// select problem size
7070
for (int i = 0; i < GPU_N; i++) {
71-
sycl::queue q_ct1 = sycl::queue(gpu_selector{});
71+
sycl::queue q_ct1 = sycl::queue(gpu_selector_v);
7272
auto device = q_ct1.get_device();
7373

7474
int Cores =
@@ -83,7 +83,7 @@ int adjustProblemSize(int GPU_N, int default_nOptions) {
8383
}
8484

8585
int adjustGridSize(int GPUIndex, int defaultGridSize) {
86-
sycl::queue q_ct1 = sycl::queue(gpu_selector{});
86+
sycl::queue q_ct1 = sycl::queue(gpu_selector_v);
8787
auto device = q_ct1.get_device();
8888

8989
int maxGridSize =
@@ -114,7 +114,7 @@ static CUT_THREADPROC solverThread(TOptionPlan *plan) {
114114
// Allocate intermediate memory for MC integrator and initialize
115115
// RNG states
116116
sycl::queue stream = sycl::queue(
117-
(sycl::platform(sycl::gpu_selector())
117+
(sycl::platform(sycl::gpu_selector_v)
118118
.get_devices(sycl::info::device_type::gpu)[plan->device]));
119119

120120
initMonteCarloGPU(plan, &stream);

‎DirectProgramming/DPC++/MapReduce/guided_MonteCarloMultiGPU_SYCLMigration/03_sycl_migrated/src/MonteCarlo_common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
#ifndef MONTECARLO_COMMON_H
2929
#define MONTECARLO_COMMON_H
30-
#include <CL/sycl.hpp>
30+
#include <sycl/sycl.hpp>
3131
#include <oneapi/mkl.hpp>
3232
#include <oneapi/mkl/rng/device.hpp>
3333

‎DirectProgramming/DPC++/MapReduce/guided_MonteCarloMultiGPU_SYCLMigration/03_sycl_migrated/src/MonteCarlo_gold.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <stdio.h>
3030
#include <stdlib.h>
3131

32-
#include <CL/sycl.hpp>
32+
#include <sycl/sycl.hpp>
3333
#include <oneapi/mkl.hpp>
3434
#include <oneapi/mkl/rng/device.hpp>
3535

@@ -105,7 +105,7 @@ extern "C" void MonteCarloCPU(TOptionValue &callValue, TOptionData optionData,
105105
std::shared_ptr<oneapi::mkl::rng::philox4x32x10> gen;
106106

107107
gen = std::make_shared<oneapi::mkl::rng::philox4x32x10>(
108-
sycl::queue(cpu_selector()), seed);
108+
sycl::queue(cpu_selector_v), seed);
109109
// unsigned long long seed = 1234ULL;
110110

111111
// checkCudaErrors(0);

‎DirectProgramming/DPC++/MapReduce/guided_MonteCarloMultiGPU_SYCLMigration/03_sycl_migrated/src/MonteCarlo_kernel.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include <stdio.h>
3333
#include <stdlib.h>
3434

35-
#include <CL/sycl.hpp>
35+
#include <sycl/sycl.hpp>
3636
#include <oneapi/mkl.hpp>
3737
#include <oneapi/mkl/rng/device.hpp>
3838

@@ -249,11 +249,9 @@ extern "C" void MonteCarloGPU(TOptionPlan *plan, sycl::queue *stream) {
249249
plan->optionCount * sizeof(__TOptionData));
250250

251251
stream->submit([&](sycl::handler &cgh) {
252-
sycl::accessor<real, 1, sycl::access_mode::read_write,
253-
sycl::access::target::local>
252+
sycl::local_accessor<real, 1>
254253
s_SumCall_acc_ct1(sycl::range<1>(256 /*SUM_N*/), cgh);
255-
sycl::accessor<real, 1, sycl::access_mode::read_write,
256-
sycl::access::target::local>
254+
sycl::local_accessor<real, 1>
257255
s_Sum2Call_acc_ct1(sycl::range<1>(256 /*SUM_N*/), cgh);
258256

259257
auto plan_rngStates_ct0 = plan->rngStates;

‎DirectProgramming/DPC++/MapReduce/guided_MonteCarloMultiGPU_SYCLMigration/03_sycl_migrated/src/MonteCarlo_reduction.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#ifndef MONTECARLO_REDUCTION_CUH
2929
#define MONTECARLO_REDUCTION_CUH
3030

31-
#include <CL/sycl.hpp>
31+
#include <sycl/sycl.hpp>
3232

3333
using namespace sycl;
3434
#include "MonteCarlo_common.h"

‎DirectProgramming/DPC++/MapReduce/guided_MonteCarloMultiGPU_SYCLMigration/04_sycl_migrated_optimized/src/MonteCarloMultiGPU.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#include <stdlib.h>
3737
#include <string.h>
3838

39-
#include <CL/sycl.hpp>
39+
#include <sycl/sycl.hpp>
4040

4141
// includes, project
4242
#include <helper_cuda.h> // helper functions (cuda error checking and initialization)
@@ -68,7 +68,7 @@ int adjustProblemSize(int GPU_N, int default_nOptions) {
6868

6969
// select problem size
7070
for (int i = 0; i < GPU_N; i++) {
71-
sycl::queue q_ct1 = sycl::queue(gpu_selector{});
71+
sycl::queue q_ct1 = sycl::queue(gpu_selector_v);
7272
auto device = q_ct1.get_device();
7373

7474
int Cores = device.get_info<cl::sycl::info::device::max_compute_units>();
@@ -82,7 +82,7 @@ int adjustProblemSize(int GPU_N, int default_nOptions) {
8282
}
8383

8484
int adjustGridSize(int GPUIndex, int defaultGridSize) {
85-
sycl::queue q_ct1 = sycl::queue(gpu_selector{});
85+
sycl::queue q_ct1 = sycl::queue(gpu_selector_v);
8686
auto device = q_ct1.get_device();
8787

8888
int maxGridSize =
@@ -113,7 +113,7 @@ static CUT_THREADPROC solverThread(TOptionPlan *plan) {
113113
// Allocate intermediate memory for MC integrator and initialize
114114
// RNG states
115115
sycl::queue stream = sycl::queue(
116-
(sycl::platform(sycl::gpu_selector())
116+
(sycl::platform(sycl::gpu_selector_v)
117117
.get_devices(sycl::info::device_type::gpu)[plan->device]));
118118

119119
initMonteCarloGPU(plan, &stream);

‎DirectProgramming/DPC++/MapReduce/guided_MonteCarloMultiGPU_SYCLMigration/04_sycl_migrated_optimized/src/MonteCarlo_common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
#ifndef MONTECARLO_COMMON_H
2929
#define MONTECARLO_COMMON_H
30-
#include <CL/sycl.hpp>
30+
#include <sycl/sycl.hpp>
3131
#include <oneapi/mkl.hpp>
3232
#include <oneapi/mkl/rng/device.hpp>
3333

‎DirectProgramming/DPC++/MapReduce/guided_MonteCarloMultiGPU_SYCLMigration/04_sycl_migrated_optimized/src/MonteCarlo_gold.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <stdio.h>
3030
#include <stdlib.h>
3131

32-
#include <CL/sycl.hpp>
32+
#include <sycl/sycl.hpp>
3333
#include <oneapi/mkl.hpp>
3434
#include <oneapi/mkl/rng/device.hpp>
3535

@@ -105,7 +105,7 @@ extern "C" void MonteCarloCPU(TOptionValue &callValue, TOptionData optionData,
105105
std::shared_ptr<oneapi::mkl::rng::philox4x32x10> gen;
106106

107107
gen = std::make_shared<oneapi::mkl::rng::philox4x32x10>(
108-
sycl::queue(cpu_selector()), seed);
108+
sycl::queue(cpu_selector_v), seed);
109109
// unsigned long long seed = 1234ULL;
110110

111111
// checkCudaErrors(0);

‎DirectProgramming/DPC++/MapReduce/guided_MonteCarloMultiGPU_SYCLMigration/04_sycl_migrated_optimized/src/MonteCarlo_kernel.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include <stdio.h>
3333
#include <stdlib.h>
3434

35-
#include <CL/sycl.hpp>
35+
#include <sycl/sycl.hpp>
3636
#include <oneapi/mkl.hpp>
3737
#include <oneapi/mkl/rng/device.hpp>
3838

@@ -249,11 +249,9 @@ extern "C" void MonteCarloGPU(TOptionPlan *plan, sycl::queue *stream) {
249249
plan->optionCount * sizeof(__TOptionData));
250250

251251
stream->submit([&](sycl::handler &cgh) {
252-
sycl::accessor<real, 1, sycl::access_mode::read_write,
253-
sycl::access::target::local>
252+
sycl::local_accessor<real, 1>
254253
s_SumCall_acc_ct1(sycl::range<1>(256 /*SUM_N*/), cgh);
255-
sycl::accessor<real, 1, sycl::access_mode::read_write,
256-
sycl::access::target::local>
254+
sycl::local_accessor<real, 1>
257255
s_Sum2Call_acc_ct1(sycl::range<1>(256 /*SUM_N*/), cgh);
258256

259257
auto plan_rngStates_ct0 = plan->rngStates;

‎DirectProgramming/DPC++/MapReduce/guided_MonteCarloMultiGPU_SYCLMigration/04_sycl_migrated_optimized/src/MonteCarlo_reduction.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#ifndef MONTECARLO_REDUCTION_CUH
2929
#define MONTECARLO_REDUCTION_CUH
3030

31-
#include <CL/sycl.hpp>
31+
#include <sycl/sycl.hpp>
3232

3333
using namespace sycl;
3434
#include "MonteCarlo_common.h"

0 commit comments

Comments
 (0)