From 7032f20e135bbb0b92964f1083336b29e2152051 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Sun, 25 Jul 2021 22:19:54 -0400 Subject: [PATCH 1/4] adapt changes to auditwheel directory in manylinux See pypa/manylinux#1143. --- .github/workflows/build_wheel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml index 2d522e5cf3..79e386371e 100644 --- a/.github/workflows/build_wheel.yml +++ b/.github/workflows/build_wheel.yml @@ -26,7 +26,7 @@ jobs: - name: Build wheels env: CIBW_BUILD: "cp36-* cp37-* cp38-*" - CIBW_BEFORE_BUILD: pip install tensorflow && sed -i 's/libresolv.so.2"/libresolv.so.2", "libtensorflow_framework.so.2"/g' /opt/_internal/tools/lib/python*/site-packages/auditwheel/policy/policy.json + CIBW_BEFORE_BUILD: pip install tensorflow && sed -i 's/libresolv.so.2"/libresolv.so.2", "libtensorflow_framework.so.2"/g' /opt/_internal/pipx/venvs/auditwheel/lib64/python*/site-packages/auditwheel/policy/policy.json CIBW_SKIP: "*-win32 *-manylinux_i686" run: | python -m cibuildwheel --output-dir wheelhouse From 374c2f856d6feab7bbcfc79bd09ed8bc646fb383 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Sun, 25 Jul 2021 22:30:43 -0400 Subject: [PATCH 2/4] find auditwheel path via `auditwheel --version` --- .github/workflows/build_wheel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml index 79e386371e..25bc528e80 100644 --- a/.github/workflows/build_wheel.yml +++ b/.github/workflows/build_wheel.yml @@ -26,7 +26,7 @@ jobs: - name: Build wheels env: CIBW_BUILD: "cp36-* cp37-* cp38-*" - CIBW_BEFORE_BUILD: pip install tensorflow && sed -i 's/libresolv.so.2"/libresolv.so.2", "libtensorflow_framework.so.2"/g' /opt/_internal/pipx/venvs/auditwheel/lib64/python*/site-packages/auditwheel/policy/policy.json + CIBW_BEFORE_BUILD: pip install tensorflow && sed -i 's/libresolv.so.2"/libresolv.so.2", "libtensorflow_framework.so.2"/g' $(auditwheel --version | awk 'NR==2{ print $1 }')/auditwheel/policy/policy.json CIBW_SKIP: "*-win32 *-manylinux_i686" run: | python -m cibuildwheel --output-dir wheelhouse From ef9e387ade2764cd99957c88cf9f024f1c9338d0 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Sun, 25 Jul 2021 23:17:25 -0400 Subject: [PATCH 3/4] use custom image instead --- .github/workflows/build_wheel.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml index 25bc528e80..ae7b05fdfe 100644 --- a/.github/workflows/build_wheel.yml +++ b/.github/workflows/build_wheel.yml @@ -25,8 +25,9 @@ jobs: - name: Build wheels env: - CIBW_BUILD: "cp36-* cp37-* cp38-*" - CIBW_BEFORE_BUILD: pip install tensorflow && sed -i 's/libresolv.so.2"/libresolv.so.2", "libtensorflow_framework.so.2"/g' $(auditwheel --version | awk 'NR==2{ print $1 }')/auditwheel/policy/policy.json + CIBW_BUILD: "cp36-* cp37-* cp38-* cp39-*" + CIBW_MANYLINUX_X86_64_IMAGE: ghcr.io/njzjz/manylinux2010_x86_64_tensorflow + CIBW_BEFORE_BUILD: pip install tensorflow CIBW_SKIP: "*-win32 *-manylinux_i686" run: | python -m cibuildwheel --output-dir wheelhouse From 05b1e036a1412746af7fd6ae6538984d116a3ccd Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Mon, 26 Jul 2021 21:26:19 -0400 Subject: [PATCH 4/4] Update .github/workflows/build_wheel.yml --- .github/workflows/build_wheel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml index ae7b05fdfe..ce72d9cc41 100644 --- a/.github/workflows/build_wheel.yml +++ b/.github/workflows/build_wheel.yml @@ -26,7 +26,7 @@ jobs: - name: Build wheels env: CIBW_BUILD: "cp36-* cp37-* cp38-* cp39-*" - CIBW_MANYLINUX_X86_64_IMAGE: ghcr.io/njzjz/manylinux2010_x86_64_tensorflow + CIBW_MANYLINUX_X86_64_IMAGE: ghcr.io/deepmodeling/manylinux2010_x86_64_tensorflow CIBW_BEFORE_BUILD: pip install tensorflow CIBW_SKIP: "*-win32 *-manylinux_i686" run: |