diff --git a/.github/.licenserc.yaml b/.github/.licenserc.yaml index 0b1b372d5..089b97a9f 100644 --- a/.github/.licenserc.yaml +++ b/.github/.licenserc.yaml @@ -48,7 +48,7 @@ header: - cmake/mkl_functions - cmake/mkl_functions_ivf - cmake/patches/tomlplusplus_v330.patch - - docker/x86_64/manylinux2014/oneAPI.repo + - docker/x86_64/manylinux228/oneAPI.repo - docs/cpp/index/loader-compatibility.csv - docs/requirements.txt - AGENTS.md diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml index f854100fa..6ab5644f9 100644 --- a/.github/workflows/cibuildwheel.yml +++ b/.github/workflows/cibuildwheel.yml @@ -38,8 +38,8 @@ jobs: - name: Build Container run: | - cd ${GITHUB_WORKSPACE}/docker/x86_64/manylinux2014 - ./build.sh + cd ${GITHUB_WORKSPACE}/docker/x86_64/manylinux228 + docker build -t svs-manylinux228 . - name: Install cibuildwheel run: python -m pip install cibuildwheel diff --git a/bindings/python/pyproject.toml b/bindings/python/pyproject.toml index 444c13297..2081845c6 100644 --- a/bindings/python/pyproject.toml +++ b/bindings/python/pyproject.toml @@ -35,8 +35,10 @@ archs = ["x86_64"] build-frontend = "pip" config-settings = {} dependency-versions = "pinned" -environment.CC = "/opt/rh/devtoolset-11/root/usr/bin/cc" -environment.CXX = "/opt/rh/devtoolset-11/root/usr/bin/c++" +environment.CC = "/opt/rh/gcc-toolset-11/root/usr/bin/cc" +environment.CXX = "/opt/rh/gcc-toolset-11/root/usr/bin/c++" +environment.MKLROOT = "/opt/intel/oneapi/mkl/latest" +environment.CMAKE_PREFIX_PATH = "/opt/intel/oneapi/mkl/latest/lib/cmake" # Compile multiple versions for difference microarchitectures environment.SVS_MULTIARCH = "YES" environment-pass = [] @@ -45,7 +47,7 @@ build-verbosity = "3" # Run inside the container because the version of pip used depends on the python version # we're building for. before-build = "pip install ninja" -before-all = "yum --disablerepo=epel install -y devtoolset-11-gcc devtoolset-11-gcc-c++" +before-all = "yum install -y gcc-toolset-11" repair-wheel-command = "" test-command = "" @@ -55,10 +57,10 @@ test-extras = [] container-engine = "docker" -# Requires creation of the `svs-manylinux2014` container image. -# Execute the build script SVS_ROOT/docker/x86_64/manylinux2014/build.sh -manylinux-x86_64-image = "svs-manylinux2014" -manylinux-pypy_x86_64-image = "svs-manylinux2014" +# Requires creation of the `svs-manylinux228` container image. +# Execute: docker build -t svs-manylinux228 SVS_ROOT/docker/x86_64/manylinux228/ +manylinux-x86_64-image = "svs-manylinux228" +manylinux-pypy_x86_64-image = "svs-manylinux228" [tool.cibuildwheel.linux] repair-wheel-command = "auditwheel repair -w {dest_dir} {wheel}" diff --git a/docker/x86_64/manylinux2014/Dockerfile b/docker/x86_64/manylinux2014/Dockerfile deleted file mode 100644 index 1935f6aef..000000000 --- a/docker/x86_64/manylinux2014/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2024 Intel Corporation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FROM quay.io/pypa/manylinux2014_x86_64:2024-07-15-c746fd8 - -COPY ./oneAPI.repo /etc/yum.repos.d/oneAPI.repo - -# Install gcc-11 -RUN yum --disablerepo=epel install -y \ - devtoolset-11-gcc \ - devtoolset-11-gcc-c++ \ - intel-oneapi-mkl \ - intel-oneapi-mkl-devel - -# Enable CMake to find the config files for Intel(R) MKL. -COPY ./entry.sh . -ENTRYPOINT ["./entry.sh"] diff --git a/docker/x86_64/manylinux2014/build.sh b/docker/x86_64/manylinux2014/build.sh deleted file mode 100755 index 9eb35ee38..000000000 --- a/docker/x86_64/manylinux2014/build.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -# Copyright 2024 Intel Corporation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -docker build -t svs-manylinux2014 . diff --git a/docker/x86_64/manylinux2014/entry.sh b/docker/x86_64/manylinux2014/entry.sh deleted file mode 100755 index 8f3a5d8c6..000000000 --- a/docker/x86_64/manylinux2014/entry.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -# Copyright 2024 Intel Corporation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - - -# setup Intel(R) MKL environment variables -source /opt/intel/oneapi/setvars.sh -# Run the requested command -exec "$@" diff --git a/docker/x86_64/manylinux2014/oneAPI.repo b/docker/x86_64/manylinux228/oneAPI.repo similarity index 100% rename from docker/x86_64/manylinux2014/oneAPI.repo rename to docker/x86_64/manylinux228/oneAPI.repo