Skip to content

Commit 9c430d9

Browse files
IgorOchockiIgorOchocki
authored
Compilator update (#1349)
* Change compiler in makefiles * Change compiler in cmake files
1 parent cc69cce commit 9c430d9

File tree

19 files changed

+50
-33
lines changed

19 files changed

+50
-33
lines changed

‎DirectProgramming/C++SYCL/GraphTraversal/bitonic-sort/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5)
33

44

55
if(WIN32)
6-
set(CMAKE_CXX_COMPILER "dpcpp-cl")
6+
set(CMAKE_CXX_COMPILER "icx-cl")
77
else()
88
set(CMAKE_CXX_COMPILER "icpx")
99
endif()

‎DirectProgramming/C++SYCL/GraphTraversal/hidden-markov-models/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
cmake_minimum_required(VERSION 3.5)
33

44
if(WIN32)
5-
set(CMAKE_CXX_COMPILER "dpcpp-cl")
5+
set(CMAKE_CXX_COMPILER "icx-cl")
66
else()
77
set(CMAKE_CXX_COMPILER "icpx")
88
endif()

‎DirectProgramming/C++SYCL/N-BodyMethods/Nbody/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
if(WIN32)
2-
set(CMAKE_CXX_COMPILER "dpcpp-cl")
3-
set(CMAKE_C_COMPILER "dpcpp-cl")
2+
set(CMAKE_CXX_COMPILER "icx-cl")
3+
set(CMAKE_C_COMPILER "icx-cl")
44
else()
55
set(CMAKE_CXX_COMPILER "icpx")
66
endif()
@@ -9,7 +9,7 @@ if(NOT DEFINED ${CMAKE_BUILD_TYPE})
99
set(CMAKE_BUILD_TYPE "RELEASE")
1010
endif()
1111
if( CMAKE_BUILD_TYPE STREQUAL "DEBUG" )
12-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
12+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fsycl")
1313
endif()
1414
cmake_minimum_required (VERSION 3.4)
1515
project (NBODY)

‎DirectProgramming/C++SYCL/ParallelPatterns/PrefixSum/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
cmake_minimum_required(VERSION 3.5)
33

44
if(WIN32)
5-
set(CMAKE_CXX_COMPILER "dpcpp")
5+
set(CMAKE_CXX_COMPILER "icx-cl")
66
else()
77
set(CMAKE_CXX_COMPILER "icpx")
88
endif()

‎DirectProgramming/C++SYCL/SpectralMethods/DiscreteCosineTransform/CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
if(WIN32)
2-
set(CMAKE_CXX_COMPILER "dpcpp-cl")
2+
set(CMAKE_CXX_COMPILER "icx-cl")
3+
set(CMAKE_CXX_FLAGS "fsycl")
34
else()
45
set(CMAKE_CXX_COMPILER "icpx")
56
endif()

‎Libraries/oneDPL/maxloc_reductions/makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ run_all: maxloc_operator.exe maxloc_implicit.exe maxloc_buffered.exe maxloc_usm.
1111
.\maxloc_usm
1212

1313
maxloc_operator.exe: maxloc_operator.cpp
14-
dpcpp maxloc_operator.cpp /Femaxloc_operator.exe
14+
icx-cl -fsycl maxloc_operator.cpp /Femaxloc_operator.exe
1515

1616
maxloc_implicit.exe: maxloc_implicit.cpp
17-
dpcpp maxloc_implicit.cpp /EHsc /Femaxloc_implicit.exe
17+
icx-cl -fsycl maxloc_implicit.cpp /EHsc /Femaxloc_implicit.exe
1818

1919
maxloc_buffered.exe: maxloc_buffered.cpp
20-
dpcpp maxloc_buffered.cpp /EHsc /Femaxloc_buffered.exe
20+
icx-cl -fsycl maxloc_buffered.cpp /EHsc /Femaxloc_buffered.exe
2121

2222
maxloc_usm.exe: maxloc_usm.cpp
23-
dpcpp maxloc_usm.cpp /EHsc /Femaxloc_usm.exe
23+
icx-cl -fsycl maxloc_usm.cpp /EHsc /Femaxloc_usm.exe
2424

2525
clean:
2626
del /q maxloc_operator.exe maxloc_implicit.exe maxloc_buffered.exe maxloc_usm.exe

‎Libraries/oneMKL/black_scholes/makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ LIBS = OpenCL.lib
2121
all: black_scholes.run
2222

2323
black_scholes.exe: black_scholes.cpp
24-
dpcpp black_scholes.cpp $(CFLAGS) $(LIBS) -o black_scholes.exe
24+
icx-cl -fsycl black_scholes.cpp $(CFLAGS) $(LIBS) -o black_scholes.exe
2525

2626
black_scholes.run: black_scholes.exe
2727
.\black_scholes.exe $(N)

‎Libraries/oneMKL/block_cholesky_decomposition/makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ all: factor.exe solve.exe
77
DPCPP_OPTS=/I"$(MKLROOT)\include" /Qmkl /DMKL_ILP64 /EHsc -fsycl-device-code-split=per_kernel OpenCL.lib
88

99
factor.exe: factor.cpp dpbltrf.cpp auxi.cpp
10-
dpcpp factor.cpp dpbltrf.cpp auxi.cpp /Fefactor.exe $(DPCPP_OPTS)
10+
icx-cl -fsycl factor.cpp dpbltrf.cpp auxi.cpp /Fefactor.exe $(DPCPP_OPTS)
1111

1212
solve.exe: solve.cpp dpbltrf.cpp dpbltrs.cpp auxi.cpp
13-
dpcpp solve.cpp dpbltrf.cpp dpbltrs.cpp auxi.cpp /Fesolve.exe $(DPCPP_OPTS)
13+
icx-cl -fsycl solve.cpp dpbltrf.cpp dpbltrs.cpp auxi.cpp /Fesolve.exe $(DPCPP_OPTS)
1414

1515
clean:
1616
del /q factor.exe factor.exp factor.lib solve.exe solve.exp solve.lib

‎Libraries/oneMKL/block_lu_decomposition/makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ all: factor.exe solve.exe
77
DPCPP_OPTS=/I"$(MKLROOT)\include" /Qmkl /DMKL_ILP64 /EHsc -fsycl-device-code-split=per_kernel OpenCL.lib
88

99
factor.exe: factor.cpp dgeblttrf.cpp auxi.cpp
10-
dpcpp factor.cpp dgeblttrf.cpp auxi.cpp /Fefactor.exe $(DPCPP_OPTS)
10+
icx-cl -fsycl factor.cpp dgeblttrf.cpp auxi.cpp /Fefactor.exe $(DPCPP_OPTS)
1111

1212
solve.exe: solve.cpp dgeblttrf.cpp dgeblttrs.cpp auxi.cpp
13-
dpcpp solve.cpp dgeblttrf.cpp dgeblttrs.cpp auxi.cpp /Fesolve.exe $(DPCPP_OPTS)
13+
icx-cl -fsycl solve.cpp dgeblttrf.cpp dgeblttrs.cpp auxi.cpp /Fesolve.exe $(DPCPP_OPTS)
1414

1515
clean:
1616
del /q factor.exe factor.exp factor.lib solve.exe solve.exp solve.lib

‎Libraries/oneMKL/computed_tomography/makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ run: computed_tomography.exe
1010
DPCPP_OPTS=/I"$(MKLROOT)\include" /Qmkl /EHsc -fsycl-device-code-split=per_kernel OpenCL.lib
1111

1212
computed_tomography.exe: computed_tomography.cpp
13-
dpcpp computed_tomography.cpp /Fecomputed_tomography.exe $(DPCPP_OPTS)
13+
icx-cl -fsycl computed_tomography.cpp /Fecomputed_tomography.exe $(DPCPP_OPTS)
1414

1515
clean:
1616
del /q computed_tomography.exe computed_tomography.exp computed_tomography.lib

‎Libraries/oneMKL/fourier_correlation/makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ run_all: fcorr_1d_buff.exe fcorr_1d_usm.exe
1212
DPCPP_OPTS=-DMKL_ILP64 -I"%MKLROOT%\include" /Qmkl sycl.lib OpenCL.lib /EHsc
1313

1414
fcorr_1d_buff.exe: fcorr_1d_buffers.cpp
15-
dpcpp fcorr_1d_buffers.cpp /Fefcorr_1d_buff.exe $(DPCPP_OPTS)
15+
icx-cl -fsycl fcorr_1d_buffers.cpp /Fefcorr_1d_buff.exe $(DPCPP_OPTS)
1616

1717
fcorr_1d_usm.exe: fcorr_1d_usm.cpp
18-
dpcpp fcorr_1d_usm.cpp /Fefcorr_1d_usm.exe $(DPCPP_OPTS)
18+
icx-cl -fsycl fcorr_1d_usm.cpp /Fefcorr_1d_usm.exe $(DPCPP_OPTS)
1919

2020
fcorr_2d_usm.exe: fcorr_2d_usm.cpp
21-
dpcpp fcorr_2d_usm.cpp /Fefcorr_2d_usm.exe $(DPCPP_OPTS)
21+
icx-cl -fsycl fcorr_2d_usm.cpp /Fefcorr_2d_usm.exe $(DPCPP_OPTS)
2222

2323
clean:
2424
del /q fcorr_1d_buff.exe fcorr_1d_usm.exe fcorr_2d_usm.exe

‎Libraries/oneMKL/matrix_mul_mkl/makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ run: matrix_mul_mkl.exe
1010
DPCPP_OPTS=/I"$(MKLROOT)\include" /Qmkl /EHsc -fsycl-device-code-split=per_kernel OpenCL.lib
1111

1212
matrix_mul_mkl.exe: matrix_mul_mkl.cpp
13-
dpcpp matrix_mul_mkl.cpp /Fematrix_mul_mkl.exe $(DPCPP_OPTS)
13+
icx-cl -fsycl matrix_mul_mkl.cpp /Fematrix_mul_mkl.exe $(DPCPP_OPTS)
1414

1515
clean:
1616
del /q matrix_mul_mkl.exe matrix_mul_mkl.exp matrix_mul_mkl.lib

‎Libraries/oneMKL/monte_carlo_pi/makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ run: mc_pi.exe mc_pi_usm.exe mc_pi_device_api.exe
1212
DPCPP_OPTS=/I"$(MKLROOT)\include" /Qmkl /DMKL_ILP64 /EHsc -fsycl-device-code-split=per_kernel -fno-sycl-early-optimizations OpenCL.lib
1313

1414
mc_pi.exe: mc_pi.cpp
15-
dpcpp mc_pi.cpp /Femc_pi.exe $(DPCPP_OPTS)
15+
icx-cl -fsycl mc_pi.cpp /Femc_pi.exe $(DPCPP_OPTS)
1616

1717
mc_pi_usm.exe: mc_pi_usm.cpp
18-
dpcpp mc_pi_usm.cpp /Femc_pi_usm.exe $(DPCPP_OPTS)
18+
icx-cl -fsycl mc_pi_usm.cpp /Femc_pi_usm.exe $(DPCPP_OPTS)
1919

2020
mc_pi_device_api.exe: mc_pi_device_api.cpp
21-
dpcpp mc_pi_device_api.cpp /Femc_pi_device_api.exe $(DPCPP_OPTS)
21+
icx-cl -fsycl mc_pi_device_api.cpp /Femc_pi_device_api.exe $(DPCPP_OPTS)
2222

2323
clean:
2424
del /q mc_pi.exe mc_pi_usm.exe mc_pi_device_api.exe

‎Libraries/oneMKL/random_sampling_without_replacement/makefile

+14-3
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,26 @@ run: lottery.exe lottery_usm.exe lottery_device_api.exe
1212
DPCPP_OPTS=/I"$(MKLROOT)\include" /Qmkl /DMKL_ILP64 /EHsc -fsycl-device-code-split=per_kernel -fno-sycl-early-optimizations OpenCL.lib
1313

1414
lottery.exe: lottery.cpp
15-
dpcpp lottery.cpp /Felottery.exe $(DPCPP_OPTS)
15+
icx-cl -fsycl lottery.cpp /Felottery.exe $(DPCPP_OPTS)
1616

1717
lottery_usm.exe: lottery_usm.cpp
18-
dpcpp lottery_usm.cpp /Felottery_usm.exe $(DPCPP_OPTS)
18+
icx-cl -fsycl lottery_usm.cpp /Felottery_usm.exe $(DPCPP_OPTS)
1919

2020
lottery_device_api.exe: lottery_device_api.cpp
21-
dpcpp lottery_device_api.cpp /Felottery_device_api.exe $(DPCPP_OPTS)
21+
icx-cl -fsycl lottery_device_api.cpp /Felottery_device_api.exe $(DPCPP_OPTS)
2222

2323
clean:
2424
del /q lottery.exe lottery_usm.exe lottery_device_api.exe
2525

2626
pseudo: clean run all
27+
28+
# DPCPP_OPTS = $(MKL_COPTS) -fsycl-device-code-split=per_kernel -fno-sycl-early-optimizations $(MKL_LIBS)
29+
30+
# lottery: lottery.cpp
31+
# icpx $< -fsycl -o $@ $(DPCPP_OPTS)
32+
33+
# lottery_usm: lottery_usm.cpp
34+
# icpx $< -fsycl -o $@ $(DPCPP_OPTS)
35+
36+
# lottery_device_api: lottery_device_api.cpp
37+
# icpx $< -fsycl -o $@ $(DPCPP_OPTS)

‎Libraries/oneMKL/sparse_conjugate_gradient/makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ run: sparse_cg.exe
1010
DPCPP_OPTS=/I"$(MKLROOT)\include" /Qmkl /EHsc -fsycl-device-code-split=per_kernel OpenCL.lib
1111

1212
sparse_cg.exe: sparse_cg.cpp
13-
dpcpp sparse_cg.cpp /Fesparse_cg.exe $(DPCPP_OPTS)
13+
icx-cl -fsycl sparse_cg.cpp /Fesparse_cg.exe $(DPCPP_OPTS)
1414

1515
clean:
1616
del /q sparse_cg.exe sparse_cg.exp sparse_cg.lib

‎Libraries/oneMKL/student_t_test/makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ run: t_test.exe t_test_usm.exe
1111
DPCPP_OPTS=/I"$(MKLROOT)\include" /Qmkl /DMKL_ILP64 /EHsc -fsycl-device-code-split=per_kernel -fno-sycl-early-optimizations OpenCL.lib
1212

1313
t_test.exe: t_test.cpp
14-
dpcpp t_test.cpp /Fet_test.exe $(DPCPP_OPTS)
14+
icx-cl -fsycl t_test.cpp /Fet_test.exe $(DPCPP_OPTS)
1515

1616
t_test_usm.exe: t_test_usm.cpp
17-
dpcpp t_test_usm.cpp /Fet_test_usm.exe $(DPCPP_OPTS)
17+
icx-cl -fsycl t_test_usm.cpp /Fet_test_usm.exe $(DPCPP_OPTS)
1818

1919
clean:
2020
del /q t_test.exe t_test_usm.exe

‎Libraries/oneTBB/tbb-async-sycl/CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
cmake_minimum_required (VERSION 3.4)
22

33
if (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows")
4-
set(CMAKE_CXX_COMPILER "dpcpp-cl")
4+
set(CMAKE_CXX_COMPILER "icx-cl")
5+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsycl")
56
else()
67
set(CMAKE_CXX_COMPILER "icpx")
78
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsycl")

‎Libraries/oneTBB/tbb-resumable-tasks-sycl/CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
cmake_minimum_required (VERSION 3.4)
22

33
if (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows")
4-
set(CMAKE_CXX_COMPILER "dpcpp-cl")
4+
set(CMAKE_CXX_COMPILER "icx-cl")
5+
set(CMAKE_CXX_FLAGS "fsycl")
6+
57
else()
68
set(CMAKE_CXX_COMPILER "icpx")
79
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsycl")

‎Libraries/oneTBB/tbb-task-sycl/CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
cmake_minimum_required (VERSION 3.4)
22

33
if (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows")
4-
set(CMAKE_CXX_COMPILER "dpcpp-cl")
4+
set(CMAKE_CXX_COMPILER "icx-cl")
5+
set(CMAKE_CXX_FLAGS "fsycl")
6+
57
else()
68
set(CMAKE_CXX_COMPILER "icpx")
79
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsycl")

0 commit comments

Comments
 (0)