From a6d710eaf75df321b5df4034fcc6175a898ebcde Mon Sep 17 00:00:00 2001 From: Alexandr-Solovev Date: Tue, 1 Oct 2024 05:53:20 -0700 Subject: [PATCH 1/2] fixes --- .ci/pipeline/ci.yml | 1 - .github/workflows/nightly-build.yml | 4 ---- samples/daal/cpp/mpi/makefile_lnx | 4 +++- samples/daal/cpp/mysql/makefile_lnx | 5 ++++- samples/oneapi/dpc/ccl/makefile_lnx | 4 +++- samples/oneapi/dpc/mpi/makefile_lnx | 5 ++++- 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.ci/pipeline/ci.yml b/.ci/pipeline/ci.yml index 97078720971..7e5dd244c21 100755 --- a/.ci/pipeline/ci.yml +++ b/.ci/pipeline/ci.yml @@ -665,7 +665,6 @@ jobs: variables: release.dir: '__release_win_vc' platform.type : 'win32e' - MKL_FPK_GPU_VERSION_LINE : 2024.0.0 pool: vmImage: 'windows-2022' steps: diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml index 7802a4bd541..21551805e3c 100644 --- a/.github/workflows/nightly-build.yml +++ b/.github/workflows/nightly-build.yml @@ -73,10 +73,6 @@ jobs: uses: actions/checkout@v4 with: repository: oneapi-src/oneDAL - - name: Set MKL_FPK_GPU_VERSION_LINE - shell: bash - run: | - echo "MKL_FPK_GPU_VERSION_LINE=2024.0.0" >> "$GITHUB_ENV" - name: Install DPC++ shell: cmd run: | diff --git a/samples/daal/cpp/mpi/makefile_lnx b/samples/daal/cpp/mpi/makefile_lnx index 222852c3b95..cffb7742c2f 100644 --- a/samples/daal/cpp/mpi/makefile_lnx +++ b/samples/daal/cpp/mpi/makefile_lnx @@ -59,7 +59,9 @@ ifndef TBBROOT TBBROOT = ./../../../../../../tbb/latest endif -ifeq ($(MKL_FPK_GPU_VERSION_LINE),2024.0.0) +OLD_TBB_LAYOUT := $(if $(wildcard $(TBBROOT)/lib/intel64/),yes,no) + +ifeq ($(OLD_TBB_LAYOUT),no) TBB_PATH = "$(TBBROOT)/lib" else TBB_PATH = "$(TBBROOT)/lib/intel64/gcc4.8" diff --git a/samples/daal/cpp/mysql/makefile_lnx b/samples/daal/cpp/mysql/makefile_lnx index a0dd6494d40..f7263146155 100644 --- a/samples/daal/cpp/mysql/makefile_lnx +++ b/samples/daal/cpp/mysql/makefile_lnx @@ -57,7 +57,10 @@ endif ifndef TBBROOT TBBROOT = ./../../../../../../tbb/latest endif -ifeq ($(MKL_FPK_GPU_VERSION_LINE),2024.0.0) + +OLD_TBB_LAYOUT := $(if $(wildcard $(TBBROOT)/lib/intel64/),yes,no) + +ifeq ($(OLD_TBB_LAYOUT),no) TBB_PATH = "$(TBBROOT)/lib" else TBB_PATH = "$(TBBROOT)/lib/intel64/gcc4.8" diff --git a/samples/oneapi/dpc/ccl/makefile_lnx b/samples/oneapi/dpc/ccl/makefile_lnx index b9e9e58d06e..41066086b5c 100644 --- a/samples/oneapi/dpc/ccl/makefile_lnx +++ b/samples/oneapi/dpc/ccl/makefile_lnx @@ -71,7 +71,9 @@ ifndef TBBROOT TBBROOT = ./../../../../../tbb/latest endif -ifeq ($(MKL_FPK_GPU_VERSION_LINE),2024.0.0) +OLD_TBB_LAYOUT := $(if $(wildcard $(TBBROOT)/lib/intel64/),yes,no) + +ifeq ($(OLD_TBB_LAYOUT),no) TBB_PATH = $(TBBROOT)/lib else TBB_PATH = $(TBBROOT)/lib/intel64/gcc4.8 diff --git a/samples/oneapi/dpc/mpi/makefile_lnx b/samples/oneapi/dpc/mpi/makefile_lnx index 88ba6029c88..e22e9e9872f 100644 --- a/samples/oneapi/dpc/mpi/makefile_lnx +++ b/samples/oneapi/dpc/mpi/makefile_lnx @@ -64,7 +64,10 @@ DAAL_PATH = $(DALROOT)/lib/intel64 ifndef TBBROOT TBBROOT = ./../../../../../tbb/latest endif -ifeq ($(MKL_FPK_GPU_VERSION_LINE),2024.0.0) + +OLD_TBB_LAYOUT := $(if $(wildcard $(TBBROOT)/lib/intel64/),yes,no) + +ifeq ($(OLD_TBB_LAYOUT),no) TBB_PATH = $(TBBROOT)/lib else TBB_PATH = $(TBBROOT)/lib/intel64/gcc4.8 From 47d82f0573997917bfa9511bd91abe500b3ace8d Mon Sep 17 00:00:00 2001 From: Alexandr-Solovev Date: Wed, 2 Oct 2024 03:17:55 -0700 Subject: [PATCH 2/2] new version --- WORKSPACE | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 38d50397eca..304d37e8930 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -72,23 +72,19 @@ mkl_repo( name = "mkl", root_env_var = "MKLROOT", urls = [ - # TODO: when the issue with binutils will be solved, replace 2023.0 to 2024.2 - "https://files.pythonhosted.org/packages/76/8c/2e6fb6186fa9335a0feb7845e001e18c22627a06ae68650e5a84ca2b536d/mkl_static-2023.0.0-py2.py3-none-manylinux1_x86_64.whl", - #"https://files.pythonhosted.org/packages/c1/44/42ea3ad7bbaa65acb54c977961118d7b24ea687e7c3d64aba0a019cbfa19/mkl_static-2024.2.0-py2.py3-none-manylinux1_x86_64.whl", - "https://files.pythonhosted.org/packages/80/e4/93ddfd475420f1c24d96f3bba1f87ec31a1eea847884c4ccb243cb336a61/mkl_include-2024.2.0-py2.py3-none-manylinux1_x86_64.whl", - "https://files.pythonhosted.org/packages/c9/3a/8797ef320a04e0b939a07365f09ce11f5484150bd3600c6400391c5c36e9/mkl_devel_dpcpp-2024.2.0-py2.py3-none-manylinux1_x86_64.whl", + "https://files.pythonhosted.org/packages/05/8e/b413b09994f4a25329e08aec241abb8c4e6c835b17c4bcd47b2da69a808b/mkl_static-2024.2.2-py2.py3-none-manylinux1_x86_64.whl", + "https://files.pythonhosted.org/packages/a0/c8/490f8712ccc5b216ea83706436c076f9ad0ffb7bbf21dcbdb710791ce368/mkl_include-2024.2.2-py2.py3-none-manylinux1_x86_64.whl", + "https://files.pythonhosted.org/packages/3e/37/13b9bfbaa6fd3fcea08cc42bc587c3754e1951fefa9dd2b7e0cad3ec0837/mkl_devel_dpcpp-2024.2.2-py2.py3-none-manylinux1_x86_64.whl", ], sha256s = [ - "49d16f315f6803b1046a4796686af766ad487f9f6d98ea76b6cdb2ebd5b559f9", - #"8c2a6c6a144c5619f1df75fd550b32730f3e0632b55a15a42a95516e142ccf47", - "63ed16ece64d9420e9fe1d5e1b55e0680632b61ad1c0e5f207b17f85233fcc09", - "b80099209aef1b147b8f1c1621a47078fba2c17b2faee131939ea4d32da2c35c", + "908586f768f312fba3b3ce0dda9b8bf086c5246d0e4d1f48ef80fa7eb60764ec", + "124298b6806bc57ad3998c521699fb410a29812b35dc0e383fe8a4745cc29f11", + "8fcec40a8b03a2f17b95c65e9e65ca3e72fb32cf39a3c66d0c922954e2396bde", ], strip_prefixes = [ - "mkl_static-2023.0.0.data/data", - #"mkl_static-2024.2.0.data/data", - "mkl_include-2024.2.0.data/data", - "mkl_devel_dpcpp-2024.2.0.data/data", + "mkl_static-2024.2.2.data/data", + "mkl_include-2024.2.2.data/data", + "mkl_devel_dpcpp-2024.2.2.data/data", ], )