From c1aed6faeb1588ddc227642a501c6058c983f6c5 Mon Sep 17 00:00:00 2001 From: Evseniia Komarova Date: Tue, 7 May 2024 14:14:28 +0200 Subject: [PATCH 1/2] update wheel tag with pep600 --- conda-recipe/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda-recipe/build.sh b/conda-recipe/build.sh index e93cdc7591..fa776d279b 100644 --- a/conda-recipe/build.sh +++ b/conda-recipe/build.sh @@ -26,7 +26,7 @@ export PATH=$CONDA_PREFIX/bin-llvm:$PATH # -wnx flags mean: --wheel --no-isolation --skip-dependency-check ${PYTHON} -m build -w -n -x ${PYTHON} -m wheel tags --remove --build "$GIT_DESCRIBE_NUMBER" \ - --platform-tag manylinux2014_x86_64 dist/numba_dpex*.whl + --platform-tag manylinux_2_28_x86_64 dist/numba_dpex*.whl ${PYTHON} -m pip install dist/numba_dpex*.whl \ --no-build-isolation \ --no-deps \ From 9a5bebdd0c7717e79c302f954b8db683d5c5a6f4 Mon Sep 17 00:00:00 2001 From: Yevhenii Havrylko Date: Tue, 7 May 2024 14:02:04 -0400 Subject: [PATCH 2/2] Use glibc version from conda package for tagging wheel --- conda-recipe/build.sh | 6 +++++- conda-recipe/meta.yaml | 7 ++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/conda-recipe/build.sh b/conda-recipe/build.sh index fa776d279b..a6fb6607f7 100644 --- a/conda-recipe/build.sh +++ b/conda-recipe/build.sh @@ -9,6 +9,9 @@ echo "--gcc-toolchain=${BUILD_PREFIX} --sysroot=${BUILD_PREFIX}/${HOST}/sysroot ICPXCFG="$(pwd)/icpx_for_conda.cfg" ICXCFG="$(pwd)/icpx_for_conda.cfg" +read -r GLIBC_MAJOR GLIBC_MINOR <<<"$(conda list '^sysroot_linux-64$' \ + | tail -n 1 | awk '{print $2}' | grep -oP '\d+' | head -n 2 | tr '\n' ' ')" + export ICXCFG export ICPXCFG @@ -26,7 +29,8 @@ export PATH=$CONDA_PREFIX/bin-llvm:$PATH # -wnx flags mean: --wheel --no-isolation --skip-dependency-check ${PYTHON} -m build -w -n -x ${PYTHON} -m wheel tags --remove --build "$GIT_DESCRIBE_NUMBER" \ - --platform-tag manylinux_2_28_x86_64 dist/numba_dpex*.whl + --platform-tag "manylinux_${GLIBC_MAJOR}_${GLIBC_MINOR}_x86_64" \ + dist/numba_dpex*.whl ${PYTHON} -m pip install dist/numba_dpex*.whl \ --no-build-isolation \ --no-deps \ diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 518cc2e7e5..d719dc8293 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -24,9 +24,10 @@ requirements: - {{ compiler('cxx') }} - {{ compiler('dpcpp') }} >={{ required_compiler_version }},!={{ excluded_compiler_version1 }},!={{ excluded_compiler_version2 }},!={{ excluded_compiler_version3 }} # [win] - {{ compiler('dpcpp') }} >={{ required_compiler_version }},!={{ excluded_compiler_version1 }},!={{ excluded_compiler_version2 }} # [linux] - # specific version of sysroot required by dpcpp, but 2024.0.0 package - # does not have it in meta data - - sysroot_linux-64 >=2.28 # [linux] + # Minimal supported version of sysroot (which is version of glibc) to + # have compatibility with wider range of linux distributions. + # 2.28 is the minimal supported version by dpcpp + - sysroot_linux-64 =2.28 # [linux] host: - python - pip >=24.0