[oneMKL] align qmkl option and threading in all samples

mkrainiuk · mkrainiuk · commit 909c172337aa · 2024-11-05T08:40:45.000-08:00
diff --git a/Libraries/oneMKL/binomial/GNUmakefile b/Libraries/oneMKL/binomial/GNUmakefile
@@ -2,7 +2,7 @@ all: binomial_sycl
 
 init_on_host ?= 0
 
-MKL_COPTS = -DMKL_ILP64  -qmkl=sequential -qmkl-sycl-impl=rng
+MKL_COPTS = -DMKL_ILP64  -qmkl -qmkl-sycl-impl=rng
 
 binomial_sycl: src/binomial_sycl.cpp src/binomial_main.cpp src/binomial.hpp
 	icpx -fsycl -O3 -DSMALL_OPT_N=0 -DVERBOSE=1 -DREPORT_COLD=1 -DREPORT_WARM=1 -DINIT_ON_HOST=$(init_on_host)  $(MKL_COPTS) -o $@ src/binomial_main.cpp src/binomial_sycl.cpp
diff --git a/Libraries/oneMKL/binomial/makefile b/Libraries/oneMKL/binomial/makefile
@@ -4,10 +4,10 @@ all: binomial_sycl.exe
 	INIT_ON_HOST=/DINIT_ON_HOST=1
 !endif
 
-DPCPP_OPTS=-O3 /I"$(MKLROOT)\include" /DMKL_ILP64 /DVERBOSE=1 /DSMALL_OPT_N=0 /DREPORT_COLD=1 /DREPORT_WARM=1 $(INIT_ON_HOST) -fsycl -qmkl -qmkl-sycl-impl=rng -lOpenCL
+DPCPP_OPTS=-O3 /I"$(MKLROOT)\include" /DMKL_ILP64 /DVERBOSE=1 /DSMALL_OPT_N=0 /DREPORT_COLD=1 /DREPORT_WARM=1 $(INIT_ON_HOST) -fsycl /Qmkl /Qmkl-sycl-impl=rng OpenCL.lib
 
 binomial_sycl.exe: src\binomial_sycl.cpp src\binomial_main.cpp src\binomial.hpp
-	icpx $(DPCPP_OPTS) /DVERBOSE=1 /DSMALL_OPT_N=0 /DREPORT_COLD=1 /DREPORT_WARM=1 src\binomial_sycl.cpp src\binomial_main.cpp /obinomial_sycl.exe
+	icx $(DPCPP_OPTS) /DVERBOSE=1 /DSMALL_OPT_N=0 /DREPORT_COLD=1 /DREPORT_WARM=1 src\binomial_sycl.cpp src\binomial_main.cpp /obinomial_sycl.exe
 
 clean:
 	del /q binomial_sycl.exe
diff --git a/Libraries/oneMKL/black_scholes/GNUmakefile b/Libraries/oneMKL/black_scholes/GNUmakefile
@@ -7,7 +7,7 @@ all: black_scholes_sycl
 
 init_on_host ?= 0
 
-MKL_COPTS = -DMKL_ILP64 -qmkl=sequential -qmkl-sycl-impl=rng
+MKL_COPTS = -DMKL_ILP64 -qmkl -qmkl-sycl-impl=rng
 
 black_scholes_sycl: src/black_scholes_sycl.cpp
 	icpx -O3 -g -fsycl $(MKL_COPTS) -DVERBOSE=1 -DSMALL_OPT_N=0 -DINIT_ON_HOST=$(init_on_host) -o $@  src/black_scholes_sycl.cpp
diff --git a/Libraries/oneMKL/black_scholes/makefile b/Libraries/oneMKL/black_scholes/makefile
@@ -4,10 +4,10 @@ all: black_scholes_sycl.exe
         INIT_ON_HOST=/DINIT_ON_HOST=1
 !endif
 
-DPCPP_OPTS=-O3 /I"$(MKLROOT)\include" /DMKL_ILP64 /DVERBOSE=1 /DSMALL_OPT_N=0 $(INIT_ON_HOST) -fsycl -qmkl -qmkl-sycl-impl=rng -lOpenCL
+DPCPP_OPTS=-O3 /I"$(MKLROOT)\include" /DMKL_ILP64 /DVERBOSE=1 /DSMALL_OPT_N=0 $(INIT_ON_HOST) -fsycl /Qmkl /Qmkl-sycl-impl=rng OpenCL.lib
 
 black_scholes_sycl.exe: src\black_scholes_sycl.cpp
-	icpx $(DPCPP_OPTS) src\black_scholes_sycl.cpp /oblack_scholes_sycl.exe
+	icx $(DPCPP_OPTS) src\black_scholes_sycl.cpp /oblack_scholes_sycl.exe
 
 clean:
 	del /q black_scholes_sycl.exe
diff --git a/Libraries/oneMKL/block_cholesky_decomposition/GNUmakefile b/Libraries/oneMKL/block_cholesky_decomposition/GNUmakefile
@@ -4,7 +4,7 @@ all: factor solve
 	./factor
 	./solve
 
-MKL_COPTS = -DMKL_ILP64  -qmkl=sequential -qmkl-sycl-impl="blas,lapack"
+MKL_COPTS = -DMKL_ILP64  -qmkl -qmkl-sycl-impl="blas,lapack"
 
 factor: factor.cpp dpbltrf.cpp auxi.cpp
 	icpx $^ -o $@ -fsycl -fsycl-device-code-split=per_kernel $(MKL_COPTS)
diff --git a/Libraries/oneMKL/block_lu_decomposition/GNUmakefile b/Libraries/oneMKL/block_lu_decomposition/GNUmakefile
@@ -4,7 +4,7 @@ all: factor solve
 	./factor
 	./solve
 
-MKL_COPTS = -DMKL_ILP64  -qmkl=sequential -qmkl-sycl-impl="blas,lapack"
+MKL_COPTS = -DMKL_ILP64  -qmkl -qmkl-sycl-impl="blas,lapack"
 
 factor: factor.cpp dgeblttrf.cpp auxi.cpp
 	icpx $^ -o $@ -fsycl -fsycl-device-code-split=per_kernel $(MKL_COPTS)
diff --git a/Libraries/oneMKL/computed_tomography/GNUmakefile b/Libraries/oneMKL/computed_tomography/GNUmakefile
@@ -7,7 +7,7 @@ all: run
 run: computed_tomography
 	./computed_tomography 400 400 input.bmp radon.bmp restored.bmp
 
-MKL_COPTS = -DMKL_ILP64  -qmkl=sequential -qmkl-sycl-impl=dft
+MKL_COPTS = -DMKL_ILP64  -qmkl -qmkl-sycl-impl=dft
 
 DPCPP_OPTS = $(MKL_COPTS) -fsycl-device-code-split=per_kernel
 
diff --git a/Libraries/oneMKL/fourier_correlation/GNUmakefile b/Libraries/oneMKL/fourier_correlation/GNUmakefile
@@ -9,7 +9,7 @@ run_all: fcorr_1d_buff fcorr_1d_usm fcorr_2d_usm
 	./fcorr_1d_usm 4096
 	./fcorr_2d_usm
 
-DPCPP_OPTS = -DMKL_ILP64 -qmkl=parallel -qmkl-sycl-impl="blas,dft,rng,vm"
+DPCPP_OPTS = -DMKL_ILP64 -qmkl -qmkl-sycl-impl="blas,dft,rng,vm"
 
 fcorr_1d_buff: fcorr_1d_buffers.cpp
 	icpx $< -fsycl -o $@ $(DPCPP_OPTS)
diff --git a/Libraries/oneMKL/guided_cuBLAS_examples_SYCL_Migration/02_sycl_dpct_migrated/CMakeLists.txt b/Libraries/oneMKL/guided_cuBLAS_examples_SYCL_Migration/02_sycl_dpct_migrated/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsycl -std=c++17 -qmkl")
-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -qmkl=sequential -qmkl-sycl-impl=blas")
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -qmkl -qmkl-sycl-impl=blas")
 
 include_directories(${CMAKE_SOURCE_DIR}/02_sycl_dpct_migrated/Common/)
 add_subdirectory("Level-1")
diff --git a/Libraries/oneMKL/guided_cuRAND_examples_SYCL_migration/02_sycl_dpct_migrated/CMakeLists.txt b/Libraries/oneMKL/guided_cuRAND_examples_SYCL_migration/02_sycl_dpct_migrated/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsycl -std=c++17 -qmkl")
-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -qmkl=sequential -qmkl-sycl-impl=rng")
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -qmkl -qmkl-sycl-impl=rng")
 
 include_directories(${CMAKE_SOURCE_DIR}/02_sycl_dpct_migrated/Common/)
 add_subdirectory("mrg32k3a")
diff --git a/Libraries/oneMKL/matrix_mul_mkl/GNUmakefile b/Libraries/oneMKL/matrix_mul_mkl/GNUmakefile
@@ -9,7 +9,7 @@ run: matrix_mul_mkl
 	./matrix_mul_mkl double
 
 INCLUDE_COMMON=../../../common
-MKL_COPTS = -DMKL_ILP64  -qmkl=sequential -qmkl-sycl-impl=blas
+MKL_COPTS = -DMKL_ILP64  -qmkl -qmkl-sycl-impl=blas
 
 DPCPP_OPTS = -O2 $(MKL_COPTS)
 
diff --git a/Libraries/oneMKL/monte_carlo_european_opt/GNUmakefile b/Libraries/oneMKL/monte_carlo_european_opt/GNUmakefile
@@ -18,7 +18,7 @@ endif
 # setting initial random number generation on host
 init_on_host ?= 0
 
-MKL_COPTS = -DMKL_ILP64 $(GENERATOR) -qmkl=sequential -qmkl-sycl-impl=rng -Wall -Wformat-security -Werror=format-security
+MKL_COPTS = -DMKL_ILP64 $(GENERATOR) -qmkl -qmkl-sycl-impl=rng -Wall -Wformat-security -Werror=format-security
 
 DPCPP_OPTS = $(MKL_COPTS) -fsycl -DINIT_ON_HOST=$(init_on_host)
 
diff --git a/Libraries/oneMKL/monte_carlo_pi/GNUmakefile b/Libraries/oneMKL/monte_carlo_pi/GNUmakefile
@@ -9,7 +9,7 @@ run: mc_pi mc_pi_usm mc_pi_device_api
 	./mc_pi_usm
 	./mc_pi_device_api
 
-MKL_COPTS = -DMKL_ILP64  -qmkl=sequential -qmkl-sycl-impl=rng
+MKL_COPTS = -DMKL_ILP64  -qmkl -qmkl-sycl-impl=rng
 
 DPCPP_OPTS = $(MKL_COPTS) -fsycl-device-code-split=per_kernel -fno-sycl-early-optimizations $(MKL_LIBS)
 
diff --git a/Libraries/oneMKL/random_sampling_without_replacement/GNUmakefile b/Libraries/oneMKL/random_sampling_without_replacement/GNUmakefile
@@ -9,7 +9,7 @@ run: lottery lottery_usm lottery_device_api
 		./lottery_usm
 		./lottery_device_api
 
-MKL_COPTS = -DMKL_ILP64  -qmkl=sequential -qmkl-sycl-impl=rng
+MKL_COPTS = -DMKL_ILP64  -qmkl -qmkl-sycl-impl=rng
 
 DPCPP_OPTS = $(MKL_COPTS) -fsycl-device-code-split=per_kernel -fno-sycl-early-optimizations
 
diff --git a/Libraries/oneMKL/sparse_conjugate_gradient/GNUmakefile b/Libraries/oneMKL/sparse_conjugate_gradient/GNUmakefile
@@ -7,7 +7,7 @@ all: run
 run: sparse_cg
 	./sparse_cg
 
-MKL_COPTS = -DMKL_ILP64  -qmkl=sequential -qmkl-sycl-impl="blas,sparse"
+MKL_COPTS = -DMKL_ILP64  -qmkl -qmkl-sycl-impl="blas,sparse"
 
 DPCPP_OPTS = $(MKL_COPTS) -fsycl-device-code-split=per_kernel
 
diff --git a/Libraries/oneMKL/student_t_test/GNUmakefile b/Libraries/oneMKL/student_t_test/GNUmakefile
@@ -8,7 +8,7 @@ run: t_test t_test_usm
 	./t_test
 	./t_test_usm
 
-MKL_COPTS = -DMKL_ILP64  -qmkl=sequential -qmkl-sycl-impl="stats,rng"
+MKL_COPTS = -DMKL_ILP64  -qmkl -qmkl-sycl-impl="stats,rng"
 
 DPCPP_OPTS = $(MKL_COPTS) -fsycl-device-code-split=per_kernel -fno-sycl-early-optimizations
 
