fixes

oneapi-src · Aug 21, 2024 · a6220db · a6220db
1 parent 40366b3
commit a6220db
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/.ci/pipeline/ci.yml b/.ci/pipeline/ci.yml
@@ -65,9 +65,11 @@ jobs:
       .ci/scripts/describe_system.sh
     displayName: 'System info'
   - script: |
+      source /opt/intel/oneapi/mkl/latest/env/vars.sh
       .ci/scripts/build.sh --compiler gnu --optimizations avx2 --target daal --conda-env ci-env
     displayName: 'make daal'
   - script: |
+      source /opt/intel/oneapi/mkl/latest/env/vars.sh
       .ci/scripts/build.sh --compiler gnu --optimizations avx2 --target onedal_c
     displayName: 'make onedal_c'
   - task: PublishPipelineArtifact@1

diff --git a/.ci/scripts/build.bat b/.ci/scripts/build.bat
@@ -31,9 +31,6 @@ pacman -S --noconfirm msys/make msys/dos2unix
 echo call .ci\env\tbb.bat
 if "%TBBROOT%"=="" if not exist .\__deps\tbb\win\tbb call .ci\env\tbb.bat || set errorcode=1
 
-echo call .\dev\download_micromkl.bat
-if "%MKLGPUFPKROOT%"=="" if not exist .\__deps\mklgpufpk\win call .\dev\download_micromkl.bat || set errorcode=1
-
 echo call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall" x64
 if "%VISUALSTUDIOVERSION%"=="" call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall" x64 || set errorcode=1
 

diff --git a/dev/make/deps.mkl.mk b/dev/make/deps.mkl.mk
@@ -17,14 +17,13 @@
 #++
 #  Math backend (MKL) definitions for makefile
 #--
-MKLFPKDIR:= $(if $(wildcard $(DIR)/__deps/mklfpk/$(_OS)/*),$(DIR)/__deps/mklfpk,                        \
-            $(if $(wildcard $(MKLROOT)/include/*),$(subst \,/,$(MKLROOT)),                        \
-            $(error Can`t find MKLFPK libs nether in $(DIR)/__deps/mklfpk/$(_OS) not in MKLFPKROOT.)))
+MKLFPKDIR:= $(if $(wildcard $(MKLROOT)/include/*),$(subst \,/,$(MKLROOT)),                        \
+            $(error Can`t find MKLROOT libs in MKLROOT.))
 MKLFPKDIR.include := $(MKLFPKDIR)/include $(MKLFPKDIR)/$(if $(OS_is_fbsd),lnx,$(_OS))/include
 MKLFPKDIR.libia   := $(MKLFPKDIR)/$(if $(OS_is_fbsd),lnx,$(_OS))/lib
 RELEASEDIR.include.mklgpufpk := $(RELEASEDIR.include)/services/internal/sycl/math
 
-MKLGPUFPKDIR:= $(if $(wildcard $(DIR)/__deps/mklgpufpk/$(_OS)/*),$(DIR)/__deps/mklgpufpk/$(_OS),$(subst \,/,$(MKLROOT)))
+MKLGPUFPKDIR:= $(MKLFPKDIR)
 MKLGPUFPKDIR.include := $(MKLGPUFPKDIR)/include/oneapi
 MKLGPUFPKDIR.lib   := $(MKLGPUFPKDIR)/lib
 
@@ -38,8 +37,8 @@ daaldep.lnx32e.mkl.thr := $(MKLROOT)/lib/$(plib)mkl_tbb_thread.$a
 daaldep.lnx32e.mkl.seq := $(MKLROOT)/lib/$(plib)mkl_sequential.$a
 daaldep.lnx32e.mkl.core := $(MKLROOT)/lib/$(plib)mkl_core.$a $(MKLROOT)/lib/$(plib)mkl_intel_ilp64.$a
 
-daaldep.win32e.mkl.thr := $(MKLROOT)/lib/$(plib)mkl_tbb_thread.$a
-daaldep.win32e.mkl.seq := $(MKLROOT)/lib/$(plib)mkl_sequential.$a
+daaldep.win32e.mkl.thr := $(MKLROOT)/lib/$(plib)mkl_tbb_thread$d.$a
+daaldep.win32e.mkl.seq := $(MKLROOT)/lib/$(plib)mkl_sequential$d.$a
 daaldep.win32e.mkl.core := $(MKLROOT)/lib/$(plib)mkl_core$d.$a $(MKLROOT)/lib/$(plib)mkl_intel_ilp64$d.$a
 
 daaldep.mac32e.mkl.thr := $(MKLFPKDIR.libia)/$(plib)daal_mkl_thread.$a