Skip to content

Commit 3d29d25

Browse files
committed
Revert "Fix incompatibility among manylinux2014 and rhel8"
This reverts commit e367bfe.
1 parent e367bfe commit 3d29d25

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -160,15 +160,12 @@ jobs:
160160
CIBW_ENVIRONMENT_PASS_LINUX: CIBW_ARCHS
161161
CIBW_ENVIRONMENT_WINDOWS: CTRANSLATE2_ROOT='${{ github.workspace }}\install'
162162
CIBW_ENVIRONMENT_MACOS: "CTRANSLATE2_ROOT='/usr/local' MACOSX_DEPLOYMENT_TARGET=10.13"
163-
CIBW_BEFORE_ALL_LINUX: |
164-
dnf install -y gcc-toolset-12-gcc gcc-toolset-12-gcc-c++ &&
165-
source /opt/rh/gcc-toolset-12/enable &&
166-
python/tools/prepare_build_environment_linux.sh
163+
CIBW_BEFORE_ALL_LINUX: python/tools/prepare_build_environment_linux.sh
167164
CIBW_BEFORE_ALL_MACOS: python/tools/prepare_build_environment_macos.sh
168165
CIBW_BEFORE_ALL_WINDOWS: bash python/tools/prepare_build_environment_windows.sh
169166
CIBW_BEFORE_BUILD: pip install -r python/install_requirements.txt
170-
CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
171-
CIBW_MANYLINUX_AARCH64_IMAGE: manylinux_2_28
167+
CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
168+
CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014
172169
CIBW_ARCHS: ${{ matrix.arch }}
173170
CIBW_SKIP: pp* *-musllinux_*
174171

docs/installation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ The Python wheels have the following requirements:
1212

1313
* OS: Linux (x86-64, AArch64), macOS (x86-64, ARM64), Windows (x86-64)
1414
* Python version: >= 3.7
15-
* pip version: >= 19.3 to support `manylinux_2_28` wheels
15+
* pip version: >= 19.3 to support `manylinux2014` wheels
1616

1717
```{admonition} GPU support
1818
The Linux and Windows Python wheels support GPU execution. Install [CUDA](https://developer.nvidia.com/cuda-toolkit) 12.x to use the GPU.

python/tools/prepare_build_environment_linux.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ if [ "$CIBW_ARCHS" == "aarch64" ]; then
2020

2121
else
2222
# Install CUDA 12.2:
23-
dnf install -y dnf-utils # make yum still usable
2423
yum-config-manager --add-repo https://developer.download.nvidia.com/compute/cuda/repos/rhel8/x86_64/cuda-rhel8.repo
2524
# error mirrorlist.centos.org doesn't exists anymore.
2625
sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo

0 commit comments

Comments
 (0)