Skip to content

Commit

Permalink
[shortfin] Upgrade package build dockerfile to manylinux_2_28. (#627)
Browse files Browse the repository at this point in the history
Progress on #130.

The manylinux2014 image includes gcc 10.2.1 by default while
manylinux_2_28 includes gcc 12.2.1. At one point we had warnings/errors
building on the newer gcc version, but that is no longer the case.

With the new Rust dependency coming from
#610, we will likely want to
revive
https://github.com/nod-ai/base-docker-images/blob/main/dockerfiles/manylinux_x86_64.Dockerfile,
add more dependencies there, then switch from the upstream `quay.io/...`
image to that `ghcr.io/nod-ai/...` image.

Tested locally with `OUTPUT_DIR="/tmp/wheelhouse" sudo -E
./build_tools/build_linux_package.sh`. If the nightly package build
fails for some reason we can easily revert this.
  • Loading branch information
ScottTodd authored Dec 2, 2024
1 parent 1896d7a commit 4666afe
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions shortfin/build_tools/build_linux_package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,8 @@ REPO_ROOT="$(cd "$THIS_DIR"/../../ && pwd)"
SCRIPT_NAME="$(basename $0)"
ARCH="$(uname -m)"

# TODO(#130): Update to manylinux_2_28, upstream or a fork
# * upstream uses a version of gcc that has build warnings/errors
# * https://github.com/nod-ai/base-docker-images is a bit out of date but can include a recent clang
# MANYLINUX_DOCKER_IMAGE="${MANYLINUX_DOCKER_IMAGE:-quay.io/pypa/manylinux_2_28_${ARCH}:latest}"
MANYLINUX_DOCKER_IMAGE="${MANYLINUX_DOCKER_IMAGE:-quay.io/pypa/manylinux2014_${ARCH}:latest}"
# Note: we can switch to https://github.com/nod-ai/base-docker-images as needed for extra deps.
MANYLINUX_DOCKER_IMAGE="${MANYLINUX_DOCKER_IMAGE:-quay.io/pypa/manylinux_2_28_${ARCH}:latest}"
PYTHON_VERSIONS="${OVERRIDE_PYTHON_VERSIONS:-cp311-cp311 cp312-cp312 cp313-cp313}"
OUTPUT_DIR="${OUTPUT_DIR:-${THIS_DIR}/wheelhouse}"

Expand Down

0 comments on commit 4666afe

Please sign in to comment.