Skip to content

Compilator update #1349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 14, 2023
Merged

Compilator update #1349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4674648
Change compiler in makefiles
IgorOchocki Feb 8, 2023
9b6bb5c
Change compiler in cmake files
IgorOchocki Feb 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DirectProgramming/C++SYCL/GraphTraversal/bitonic-sort/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5)


if(WIN32)
set(CMAKE_CXX_COMPILER "dpcpp-cl")
set(CMAKE_CXX_COMPILER "icx-cl")
else()
set(CMAKE_CXX_COMPILER "icpx")
endif()
Expand Down
2 changes: 1 addition & 1 deletion DirectProgramming/C++SYCL/GraphTraversal/hidden-markov-models/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
cmake_minimum_required(VERSION 3.5)

if(WIN32)
set(CMAKE_CXX_COMPILER "dpcpp-cl")
set(CMAKE_CXX_COMPILER "icx-cl")
else()
set(CMAKE_CXX_COMPILER "icpx")
endif()
Expand Down
6 changes: 3 additions & 3 deletions DirectProgramming/C++SYCL/N-BodyMethods/Nbody/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
if(WIN32)
set(CMAKE_CXX_COMPILER "dpcpp-cl")
set(CMAKE_C_COMPILER "dpcpp-cl")
set(CMAKE_CXX_COMPILER "icx-cl")
set(CMAKE_C_COMPILER "icx-cl")
else()
set(CMAKE_CXX_COMPILER "icpx")
endif()
Expand All @@ -9,7 +9,7 @@ if(NOT DEFINED ${CMAKE_BUILD_TYPE})
set(CMAKE_BUILD_TYPE "RELEASE")
endif()
if( CMAKE_BUILD_TYPE STREQUAL "DEBUG" )
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fsycl")
endif()
cmake_minimum_required (VERSION 3.4)
project (NBODY)
Expand Down
2 changes: 1 addition & 1 deletion DirectProgramming/C++SYCL/ParallelPatterns/PrefixSum/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
cmake_minimum_required(VERSION 3.5)

if(WIN32)
set(CMAKE_CXX_COMPILER "dpcpp")
set(CMAKE_CXX_COMPILER "icx-cl")
else()
set(CMAKE_CXX_COMPILER "icpx")
endif()
Expand Down
3 changes: 2 additions & 1 deletion DirectProgramming/C++SYCL/SpectralMethods/DiscreteCosineTransform/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
if(WIN32)
set(CMAKE_CXX_COMPILER "dpcpp-cl")
set(CMAKE_CXX_COMPILER "icx-cl")
set(CMAKE_CXX_FLAGS "fsycl")
else()
set(CMAKE_CXX_COMPILER "icpx")
endif()
Expand Down
8 changes: 4 additions & 4 deletions Libraries/oneDPL/maxloc_reductions/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ run_all: maxloc_operator.exe maxloc_implicit.exe maxloc_buffered.exe maxloc_usm.
.\maxloc_usm

maxloc_operator.exe: maxloc_operator.cpp
dpcpp maxloc_operator.cpp /Femaxloc_operator.exe
icx-cl -fsycl maxloc_operator.cpp /Femaxloc_operator.exe

maxloc_implicit.exe: maxloc_implicit.cpp
dpcpp maxloc_implicit.cpp /EHsc /Femaxloc_implicit.exe
icx-cl -fsycl maxloc_implicit.cpp /EHsc /Femaxloc_implicit.exe

maxloc_buffered.exe: maxloc_buffered.cpp
dpcpp maxloc_buffered.cpp /EHsc /Femaxloc_buffered.exe
icx-cl -fsycl maxloc_buffered.cpp /EHsc /Femaxloc_buffered.exe

maxloc_usm.exe: maxloc_usm.cpp
dpcpp maxloc_usm.cpp /EHsc /Femaxloc_usm.exe
icx-cl -fsycl maxloc_usm.cpp /EHsc /Femaxloc_usm.exe

clean:
del /q maxloc_operator.exe maxloc_implicit.exe maxloc_buffered.exe maxloc_usm.exe
Expand Down
2 changes: 1 addition & 1 deletion Libraries/oneMKL/black_scholes/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ LIBS = OpenCL.lib
all: black_scholes.run

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

black_scholes.run: black_scholes.exe
.\black_scholes.exe $(N)
Expand Down
4 changes: 2 additions & 2 deletions Libraries/oneMKL/block_cholesky_decomposition/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ all: factor.exe solve.exe
DPCPP_OPTS=/I"$(MKLROOT)\include" /Qmkl /DMKL_ILP64 /EHsc -fsycl-device-code-split=per_kernel OpenCL.lib

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

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

clean:
del /q factor.exe factor.exp factor.lib solve.exe solve.exp solve.lib
4 changes: 2 additions & 2 deletions Libraries/oneMKL/block_lu_decomposition/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ all: factor.exe solve.exe
DPCPP_OPTS=/I"$(MKLROOT)\include" /Qmkl /DMKL_ILP64 /EHsc -fsycl-device-code-split=per_kernel OpenCL.lib

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

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

clean:
del /q factor.exe factor.exp factor.lib solve.exe solve.exp solve.lib
2 changes: 1 addition & 1 deletion Libraries/oneMKL/computed_tomography/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ run: computed_tomography.exe
DPCPP_OPTS=/I"$(MKLROOT)\include" /Qmkl /EHsc -fsycl-device-code-split=per_kernel OpenCL.lib

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

clean:
del /q computed_tomography.exe computed_tomography.exp computed_tomography.lib
Expand Down
6 changes: 3 additions & 3 deletions Libraries/oneMKL/fourier_correlation/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ run_all: fcorr_1d_buff.exe fcorr_1d_usm.exe
DPCPP_OPTS=-DMKL_ILP64 -I"%MKLROOT%\include" /Qmkl sycl.lib OpenCL.lib /EHsc

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

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

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

clean:
del /q fcorr_1d_buff.exe fcorr_1d_usm.exe fcorr_2d_usm.exe
Expand Down
2 changes: 1 addition & 1 deletion Libraries/oneMKL/matrix_mul_mkl/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ run: matrix_mul_mkl.exe
DPCPP_OPTS=/I"$(MKLROOT)\include" /Qmkl /EHsc -fsycl-device-code-split=per_kernel OpenCL.lib

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

clean:
del /q matrix_mul_mkl.exe matrix_mul_mkl.exp matrix_mul_mkl.lib
Expand Down
6 changes: 3 additions & 3 deletions Libraries/oneMKL/monte_carlo_pi/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ run: mc_pi.exe mc_pi_usm.exe mc_pi_device_api.exe
DPCPP_OPTS=/I"$(MKLROOT)\include" /Qmkl /DMKL_ILP64 /EHsc -fsycl-device-code-split=per_kernel -fno-sycl-early-optimizations OpenCL.lib

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

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

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

clean:
del /q mc_pi.exe mc_pi_usm.exe mc_pi_device_api.exe
Expand Down
17 changes: 14 additions & 3 deletions Libraries/oneMKL/random_sampling_without_replacement/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,26 @@ run: lottery.exe lottery_usm.exe lottery_device_api.exe
DPCPP_OPTS=/I"$(MKLROOT)\include" /Qmkl /DMKL_ILP64 /EHsc -fsycl-device-code-split=per_kernel -fno-sycl-early-optimizations OpenCL.lib

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

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

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

clean:
del /q lottery.exe lottery_usm.exe lottery_device_api.exe

pseudo: clean run all

# DPCPP_OPTS = $(MKL_COPTS) -fsycl-device-code-split=per_kernel -fno-sycl-early-optimizations $(MKL_LIBS)

# lottery: lottery.cpp
# icpx $< -fsycl -o $@ $(DPCPP_OPTS)

# lottery_usm: lottery_usm.cpp
# icpx $< -fsycl -o $@ $(DPCPP_OPTS)

# lottery_device_api: lottery_device_api.cpp
# icpx $< -fsycl -o $@ $(DPCPP_OPTS)
2 changes: 1 addition & 1 deletion Libraries/oneMKL/sparse_conjugate_gradient/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ run: sparse_cg.exe
DPCPP_OPTS=/I"$(MKLROOT)\include" /Qmkl /EHsc -fsycl-device-code-split=per_kernel OpenCL.lib

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

clean:
del /q sparse_cg.exe sparse_cg.exp sparse_cg.lib
Expand Down
4 changes: 2 additions & 2 deletions Libraries/oneMKL/student_t_test/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ run: t_test.exe t_test_usm.exe
DPCPP_OPTS=/I"$(MKLROOT)\include" /Qmkl /DMKL_ILP64 /EHsc -fsycl-device-code-split=per_kernel -fno-sycl-early-optimizations OpenCL.lib

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

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

clean:
del /q t_test.exe t_test_usm.exe
Expand Down
3 changes: 2 additions & 1 deletion Libraries/oneTBB/tbb-async-sycl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
cmake_minimum_required (VERSION 3.4)

if (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows")
set(CMAKE_CXX_COMPILER "dpcpp-cl")
set(CMAKE_CXX_COMPILER "icx-cl")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsycl")
else()
set(CMAKE_CXX_COMPILER "icpx")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsycl")
Expand Down
4 changes: 3 additions & 1 deletion Libraries/oneTBB/tbb-resumable-tasks-sycl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
cmake_minimum_required (VERSION 3.4)

if (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows")
set(CMAKE_CXX_COMPILER "dpcpp-cl")
set(CMAKE_CXX_COMPILER "icx-cl")
set(CMAKE_CXX_FLAGS "fsycl")

else()
set(CMAKE_CXX_COMPILER "icpx")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsycl")
Expand Down
4 changes: 3 additions & 1 deletion Libraries/oneTBB/tbb-task-sycl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
cmake_minimum_required (VERSION 3.4)

if (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows")
set(CMAKE_CXX_COMPILER "dpcpp-cl")
set(CMAKE_CXX_COMPILER "icx-cl")
set(CMAKE_CXX_FLAGS "fsycl")

else()
set(CMAKE_CXX_COMPILER "icpx")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsycl")
Expand Down