Update s390x builder #1802
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -137,18 +137,3 @@ jobs: | |
| - name: Build Docker Image | ||
| run: | | ||
| manywheel/build_docker.sh | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,15 @@ | ||
| FROM --platform=linux/s390x docker.io/ubuntu:24.04 as base | ||
|
|
||
|
There was a problem hiding this comment. Note: If it works, we can stick with ubuntu for now. Otherwise, let's use |
||
| # Language variables | ||
| ENV LC_ALL=C.UTF-8 | ||
| ENV LANG=C.UTF-8 | ||
| ENV LANGUAGE=C.UTF-8 | ||
|
|
||
| # Installed needed OS packages. This is to support all | ||
| # the binary builds (torch, vision, audio, text, data) | ||
| RUN apt update ; apt upgrade -y | ||
| RUN apt install -y \ | ||
| build-essential \ | ||
| autoconf \ | ||
| automake \ | ||
| bzip2 \ | ||
|
|
@@ -27,20 +24,19 @@ RUN dnf install -y --allowerasing \ | |
| util-linux \ | ||
| wget \ | ||
| which \ | ||
| xz-utils \ | ||
| less \ | ||
| zstd \ | ||
| cmake \ | ||
| python3 \ | ||
| python3-dev \ | ||
| python3-setuptools \ | ||
| python3-yaml \ | ||
| python3-typing-extensions \ | ||
| libblas-dev \ | ||
| libopenblas-dev \ | ||
| liblapack-dev \ | ||
| libatlas-base-dev | ||
|
|
||
| # git236+ would refuse to run git commands in repos owned by other users | ||
| # Which causes version check to fail, as pytorch repo is bind-mounted into the image | ||
|
|
@@ -57,9 +53,21 @@ ADD ./common/install_openssl.sh install_openssl.sh | |
| RUN bash ./install_openssl.sh && rm install_openssl.sh | ||
| ENV SSL_CERT_FILE=/opt/_internal/certs.pem | ||
|
|
||
| # EPEL for cmake | ||
| FROM base as patchelf | ||
| # Install patchelf | ||
| ADD ./common/install_patchelf.sh install_patchelf.sh | ||
| RUN bash ./install_patchelf.sh && rm install_patchelf.sh | ||
| RUN cp $(which patchelf) /patchelf | ||
|
|
||
| FROM patchelf as python | ||
| # build python | ||
| COPY manywheel/build_scripts /build_scripts | ||
| ADD ./common/install_cpython.sh /build_scripts/install_cpython.sh | ||
| RUN bash build_scripts/build.sh && rm -r build_scripts | ||
|
|
||
| FROM openssl as final | ||
| COPY --from=python /opt/python /opt/python | ||
| COPY --from=python /opt/_internal /opt/_internal | ||
| COPY --from=python /opt/python/cp37-cp37m/bin/auditwheel /usr/local/bin/auditwheel | ||
| COPY --from=patchelf /usr/local/bin/patchelf /usr/local/bin/patchelf | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,7 +15,7 @@ case "${GPU_ARCH_TYPE:-BLANK}" in | |
| rocm) | ||
| bash "${SCRIPTPATH}/build_rocm.sh" | ||
| ;; | ||
| cpu | cpu-cxx11-abi | cpu-s390x) | ||
|
There was a problem hiding this comment. Should There was a problem hiding this comment. No, with this change, I can remove commit pytorch/pytorch@2928b2c Or I can also drop this change and keep it as just "cpu" for s390x. But for aarch64 "cpu-aarch64" is used, so I did similar "cpu-s390x" for s390x. |
||
| bash "${SCRIPTPATH}/build_cpu.sh" | ||
| ;; | ||
| *) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this a correct understanding that we can now remove this and let Docker pull figure out the correct CPU arch (s390x) corresponding to this change pytorch/pytorch@2928b2c?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, since I couldn't find where I could download built image for s390x, I just built it manually and backed it into my github actions runner docker image. So it's available locally and isn't needed to be built. I'm also fine with actually building it here and downloading it by actions runner, if it's publicly available somewhere.