Skip to content

Commit e986753

Browse files
authored
migrate manylinux2014 to manylinux2.28 (#312)
Addresses recently failing CI build wheel step (ie https://github.com/intel/ScalableVectorSearch/actions/runs/24045150157/job/70127677449?pr=311) by replacing outdated manylinux2014 CI build wheel docker file with existing manylinux2.28
1 parent 02dea9d commit e986753

7 files changed

Lines changed: 12 additions & 74 deletions

File tree

.github/.licenserc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ header:
4848
- cmake/mkl_functions
4949
- cmake/mkl_functions_ivf
5050
- cmake/patches/tomlplusplus_v330.patch
51-
- docker/x86_64/manylinux2014/oneAPI.repo
51+
- docker/x86_64/manylinux228/oneAPI.repo
5252
- docs/cpp/index/loader-compatibility.csv
5353
- docs/requirements.txt
5454
- AGENTS.md

.github/workflows/cibuildwheel.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ jobs:
3838

3939
- name: Build Container
4040
run: |
41-
cd ${GITHUB_WORKSPACE}/docker/x86_64/manylinux2014
42-
./build.sh
41+
cd ${GITHUB_WORKSPACE}/docker/x86_64/manylinux228
42+
docker build -t svs-manylinux228 .
4343
4444
- name: Install cibuildwheel
4545
run: python -m pip install cibuildwheel

bindings/python/pyproject.toml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,10 @@ archs = ["x86_64"]
3535
build-frontend = "pip"
3636
config-settings = {}
3737
dependency-versions = "pinned"
38-
environment.CC = "/opt/rh/devtoolset-11/root/usr/bin/cc"
39-
environment.CXX = "/opt/rh/devtoolset-11/root/usr/bin/c++"
38+
environment.CC = "/opt/rh/gcc-toolset-11/root/usr/bin/cc"
39+
environment.CXX = "/opt/rh/gcc-toolset-11/root/usr/bin/c++"
40+
environment.MKLROOT = "/opt/intel/oneapi/mkl/latest"
41+
environment.CMAKE_PREFIX_PATH = "/opt/intel/oneapi/mkl/latest/lib/cmake"
4042
# Compile multiple versions for difference microarchitectures
4143
environment.SVS_MULTIARCH = "YES"
4244
environment-pass = []
@@ -45,7 +47,7 @@ build-verbosity = "3"
4547
# Run inside the container because the version of pip used depends on the python version
4648
# we're building for.
4749
before-build = "pip install ninja"
48-
before-all = "yum --disablerepo=epel install -y devtoolset-11-gcc devtoolset-11-gcc-c++"
50+
before-all = "yum install -y gcc-toolset-11"
4951
repair-wheel-command = ""
5052

5153
test-command = ""
@@ -55,10 +57,10 @@ test-extras = []
5557

5658
container-engine = "docker"
5759

58-
# Requires creation of the `svs-manylinux2014` container image.
59-
# Execute the build script SVS_ROOT/docker/x86_64/manylinux2014/build.sh
60-
manylinux-x86_64-image = "svs-manylinux2014"
61-
manylinux-pypy_x86_64-image = "svs-manylinux2014"
60+
# Requires creation of the `svs-manylinux228` container image.
61+
# Execute: docker build -t svs-manylinux228 SVS_ROOT/docker/x86_64/manylinux228/
62+
manylinux-x86_64-image = "svs-manylinux228"
63+
manylinux-pypy_x86_64-image = "svs-manylinux228"
6264

6365
[tool.cibuildwheel.linux]
6466
repair-wheel-command = "auditwheel repair -w {dest_dir} {wheel}"

docker/x86_64/manylinux2014/Dockerfile

Lines changed: 0 additions & 28 deletions
This file was deleted.

docker/x86_64/manylinux2014/build.sh

Lines changed: 0 additions & 16 deletions
This file was deleted.

docker/x86_64/manylinux2014/entry.sh

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)