From 3999b209cee590e296ee2d23f10cbf918ced0ba1 Mon Sep 17 00:00:00 2001 From: Aleksandr Solovev Date: Mon, 4 Nov 2024 15:57:54 +0100 Subject: [PATCH] dev: update bazel oneMKL deps (#2965) --- WORKSPACE | 56 ++++++++++++++++++++++++------------------ dev/bazel/deps/tbb.bzl | 8 +----- 2 files changed, 33 insertions(+), 31 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 38d50397eca..3fd57fead77 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -32,9 +32,18 @@ load("@onedal//dev/bazel/deps:tbb.bzl", "tbb_repo") tbb_repo( name = "tbb", root_env_var = "TBBROOT", - url = "https://github.com/oneapi-src/oneTBB/releases/download/v2021.7.0/oneapi-tbb-2021.7.0-lin.tgz", - sha256 = "3c2b3287c595e2bb833c025fcd271783963b7dfae8dc681440ea6afe5d550e6a", - strip_prefix = "oneapi-tbb-2021.7.0", + urls = [ + "https://files.pythonhosted.org/packages/93/4b/2e29f4266be5a66f21fc2dadcde48f9acea86119d6fb1bb2d2a451222ff7/tbb-2022.0.0-py2.py3-none-manylinux_2_28_x86_64.whl", + "https://files.pythonhosted.org/packages/ff/8c/1eb1f856a7a328242d524f1bf64f2a212d46ce5651168e7c8bc7aeaf0f44/tbb_devel-2022.0.0-py2.py3-none-manylinux_2_28_x86_64.whl", + ], + sha256s = [ + "15a15a4e3ea4c3f3198bdb3c55fac75c589e15ed2ad0bbb080900d355c5b017e", + "474e4ed1dce2efeea1d3652e295a97713df5d0ed854c937ee7d0464c38353c36", + ], + strip_prefixes = [ + "tbb-2022.0.0.data/data", + "tbb_devel-2022.0.0.data/data", + ] ) load("@onedal//dev/bazel/deps:mpi.bzl", "mpi_repo") @@ -42,16 +51,16 @@ mpi_repo( name = "mpi", root_env_var = "MPIROOT", urls = [ - "https://files.pythonhosted.org/packages/83/3c/c684b721f08f55fc1647d9bcb84e657a4b6217c078a209f2f7751b639957/impi_rt-2021.8.0-py2.py3-none-manylinux1_x86_64.whl", - "https://files.pythonhosted.org/packages/26/27/5b557da775ad23b20be85352e273dbdddd6ba2a531c6db21e3c9c02230f6/impi_devel-2021.8.0-py2.py3-none-manylinux1_x86_64.whl", + "https://files.pythonhosted.org/packages/0a/7c/0f4de62a3463e4ebcf232352b231427f3b34c6a0a1b102a94da3246cad76/impi_rt-2021.14.0-py2.py3-none-manylinux_2_28_x86_64.whl", + "https://files.pythonhosted.org/packages/10/9f/4ee3244c078b9e9e8f65ec51760e7a6e52988abba92a285ab8b0c4dbafff/impi_devel-2021.14.0-py2.py3-none-manylinux_2_28_x86_64.whl", ], sha256s = [ - "c80f86a2a9ff9d4d1b81c1559e9b9180a8c72fb9902ea7d61b07e6d71ad33225", - "65dfc774e1e853a36c2c6286ea0b8dc33ea1f1f2a6fcd271b917195e11ddc98a", + "f06ac9eba3de9609fb257d714e3041f82334ccfe27a9bec0f90007d6381dd52e", + "6a6ec66719ac4884a40a0504f4f186f51ee4169bece5f4486c31138ed6bcc87d", ], strip_prefixes = [ - "impi_rt-2021.8.0.data/data", - "impi_devel-2021.8.0.data/data", + "impi_rt-2021.14.0.data/data", + "impi_devel-2021.14.0.data/data", ] ) @@ -60,11 +69,14 @@ ccl_repo( name = "ccl", root_env_var = "CCL_ROOT", urls = [ - "https://files.pythonhosted.org/packages/38/66/889fa7f40d4142194414efb3f79379ff2830e554d99eef49ac4d8e739245/oneccl_devel-2021.8.0-py2.py3-none-manylinux1_x86_64.whl", + "https://files.pythonhosted.org/packages/c4/34/84fcf891faabfcd88e1e054a9268cdbefac8c22ab37d7eea2d9a3bda0f52/oneccl_devel-2021.14.0-py2.py3-none-manylinux_2_28_x86_64.whl", ], sha256s = [ - "58995b5dd38f92034be7c7c2da51f531b6df4ef36b09fb648757ae0a7832f802", + "580641c9d296b673d225ed3ca740b3356d7408a5c792de596a8836fde7d6c79e", ], + strip_prefixes = [ + "oneccl_devel-2021.14.0.data/data", + ] ) load("@onedal//dev/bazel/deps:mkl.bzl", "mkl_repo") @@ -72,23 +84,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/95/d8/76f53cde7c1df06fcd153b4f6fdf0516aafbfc3239ba8d5a8c354e20bbb2/mkl_static-2025.0.0-py2.py3-none-manylinux_2_28_x86_64.whl", + "https://files.pythonhosted.org/packages/b1/91/b76ab204c03f90d5ce008ba7cf6efd77168059866e96b70277fec959b940/mkl_include-2025.0.0-py2.py3-none-manylinux_2_28_x86_64.whl", + "https://files.pythonhosted.org/packages/b8/d7/ea82194db165d83e22dfedee4d45423477441202e2c321b9e96809d36e63/mkl_devel_dpcpp-2025.0.0-py2.py3-none-manylinux_2_28_x86_64.whl", ], sha256s = [ - "49d16f315f6803b1046a4796686af766ad487f9f6d98ea76b6cdb2ebd5b559f9", - #"8c2a6c6a144c5619f1df75fd550b32730f3e0632b55a15a42a95516e142ccf47", - "63ed16ece64d9420e9fe1d5e1b55e0680632b61ad1c0e5f207b17f85233fcc09", - "b80099209aef1b147b8f1c1621a47078fba2c17b2faee131939ea4d32da2c35c", + "706f92fcd6e00cc94155097a87528da52b4c3dda4616c8c334963251773a0d13", + "cf19e274bdd1449ef7285671576c545510bebff669363ee1926779192f618cdd", + "455281a590920fb58628dbc06ac007f2618c7315e4c04748c2a1b62efa01afb3", ], 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-2025.0.0.data/data", + "mkl_include-2025.0.0.data/data", + "mkl_devel_dpcpp-2025.0.0.data/data", ], ) diff --git a/dev/bazel/deps/tbb.bzl b/dev/bazel/deps/tbb.bzl index 6cce69358cd..87f243b5685 100644 --- a/dev/bazel/deps/tbb.bzl +++ b/dev/bazel/deps/tbb.bzl @@ -27,13 +27,7 @@ tbb_repo = repos.prebuilt_libs_repo_rule( "lib/libtbbmalloc.so.2", ], build_template = "@onedal//dev/bazel/deps:tbb.tpl.BUILD", - download_mapping = { - # Required directory layout and layout in the downloaded - # archives may be different. Mapping helps to setup relations - # between required layout (LHS) and downloaded (RHS). - # In this case, files from `lib/*` will be copied to `lib/intel64/*`. - "lib/": "lib/intel64/gcc4.8/", - }, + # Remove this once support for TBB 2021.11 and older versions is discontinued local_mapping = { # Required directory layout and layout in the downloaded # archives may be different. Mapping helps to setup relations