Skip to content

Commit

Permalink
chore(deps): update GPU FPK (oneapi-src#2607)
Browse files Browse the repository at this point in the history
  • Loading branch information
homksei authored Dec 4, 2023
1 parent fd15e16 commit 3a15026
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 16 deletions.
8 changes: 4 additions & 4 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ load("@onedal//dev/bazel/deps:micromkl.bzl", "micromkl_repo", "micromkl_dpc_repo
micromkl_repo(
name = "micromkl",
root_env_var = "MKLFPKROOT",
url = "https://github.com/oneapi-src/oneDAL/releases/download/Dependencies/mklfpk_lnx_20221214.tgz",
sha256 = "34001657cfe7127ff0de9d6bf0cb4d9fc4d0be1037e5615f8c899c7193a8be8b",
url = "https://github.com/oneapi-src/oneDAL/releases/download/Dependencies/mklfpk_lnx_20230413.tgz",
sha256 = "e99dd6fb18f1fda382c53373262d1bb44c1b58aa6edff94cfb0e9d8dcd3395ed",
)

micromkl_dpc_repo(
name = "micromkl_dpc",
root_env_var = "MKLGPUFPKROOT",
url = "https://github.com/oneapi-src/oneDAL/releases/download/Dependencies/mklgpufpk_lnx_20221214.tgz",
sha256 = "1bd9e3ef850d95d1ee00e0f04943c8ed2490175fca6a7b331cab91a124ab301e",
url = "https://github.com/oneapi-src/oneDAL/releases/download/Dependencies/mklgpufpk_lnx_20231019.tgz",
sha256 = "c0321dc22c7353e0ec1a8fa98cf61b5142bc8bca0985ae7c83dbc8a295573360",
)

load("@onedal//dev/bazel/deps:openblas.bzl", "openblas_repo")
Expand Down
4 changes: 2 additions & 2 deletions dev/download_micromkl.bat
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ rem req: PowerShell 3.0+
powershell.exe -command "if ($PSVersionTable.PSVersion.Major -ge 3) {exit 1} else {Write-Host \"The script requires PowerShell 3.0 or above (current version: $($PSVersionTable.PSVersion.Major).$($PSVersionTable.PSVersion.Minor))\"}" && goto Error_load

set MKLURLROOT=https://github.com/oneapi-src/oneDAL/releases/download/Dependencies/
set MKLVERSION=20221214
set MKLGPUVERSION=20221214
set MKLVERSION=20230413
set MKLGPUVERSION=20231019

set MKLPACKAGE=mklfpk_win_%MKLVERSION%
set MKLGPUPACKAGE=mklgpufpk_win_%MKLGPUVERSION%
Expand Down
4 changes: 2 additions & 2 deletions dev/download_micromkl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
#===============================================================================

MKLFPK_URL_ROOT="https://github.com/oneapi-src/oneDAL/releases/download/Dependencies/"
MKLFPK_VERSION="20221214"
MKLFPK_VERSION="20230413"
MKLFPK_VERSION_MAC="20210426"
MKLGPUFPK_VERSION="20221214"
MKLGPUFPK_VERSION="20231019"
WITH_GPU=true

while true ; do
Expand Down
9 changes: 3 additions & 6 deletions dev/make/deps.mkl.mk
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,9 @@ RELEASEDIR.include.mklgpufpk := $(RELEASEDIR.include)/services/internal/sycl/mat

MKLGPUFPKDIR:= $(if $(wildcard $(DIR)/__deps/mklgpufpk/$(_OS)/*),$(DIR)/__deps/mklgpufpk/$(_OS),$(subst \,/,$(MKLGPUFPKROOT)))
MKLGPUFPKDIR.include := $(MKLGPUFPKDIR)/include
ifeq ($(MKL_FPK_GPU_VERSION_LINE),2024.0.0)
MKLGPUFPKDIR.libia := $(MKLGPUFPKDIR)/lib/
else
MKLGPUFPKDIR.libia := $(MKLGPUFPKDIR)/lib/$(_IA)
endif
mklgpufpk.LIBS_A := $(MKLGPUFPKDIR.libia)/$(plib)daal_sycl$d.$(a)
MKLGPUFPKDIR.lib := $(MKLGPUFPKDIR)/lib/

mklgpufpk.LIBS_A := $(MKLGPUFPKDIR.lib)/$(plib)daal_sycl$d.$(a)
mklgpufpk.HEADERS := $(MKLGPUFPKDIR.include)/mkl_dal_sycl.hpp $(MKLGPUFPKDIR.include)/mkl_dal_blas_sycl.hpp

daaldep.math_backend.incdir := $(MKLFPKDIR.include) $(MKLGPUFPKDIR.include)
Expand Down
4 changes: 2 additions & 2 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -284,9 +284,9 @@ RELEASEDIR.include.mklgpufpk := $(RELEASEDIR.include)/services/internal/sycl/mat

MKLGPUFPKDIR:= $(if $(wildcard $(DIR)/__deps/mklgpufpk/$(_OS)/*),$(DIR)/__deps/mklgpufpk/$(_OS),$(subst \,/,$(MKLGPUFPKROOT)))
MKLGPUFPKDIR.include := $(MKLGPUFPKDIR)/include
MKLGPUFPKDIR.libia := $(MKLGPUFPKDIR)/lib
MKLGPUFPKDIR.lib := $(MKLGPUFPKDIR)/lib

mklgpufpk.LIBS_A := $(MKLGPUFPKDIR.libia)/$(plib)daal_sycl$d.$(a)
mklgpufpk.LIBS_A := $(MKLGPUFPKDIR.lib)/$(plib)daal_sycl$d.$(a)
mklgpufpk.HEADERS := $(MKLGPUFPKDIR.include)/mkl_dal_sycl.hpp $(MKLGPUFPKDIR.include)/mkl_dal_blas_sycl.hpp

include dev/make/deps.$(BACKEND_CONFIG).mk
Expand Down

0 comments on commit 3a15026

Please sign in to comment.