Skip to content
This repository was archived by the owner on Aug 15, 2025. It is now read-only.

Update s390x builder#1802

Merged
huydhn merged 6 commits intopytorch:mainfrom
AlekseiNikiforovIBM:update_s390x_builder
May 3, 2024
Merged

Update s390x builder#1802
huydhn merged 6 commits intopytorch:mainfrom
AlekseiNikiforovIBM:update_s390x_builder

Conversation

@AlekseiNikiforovIBM
Copy link
Copy Markdown
Contributor

Update binary checks for s390x build

@AlekseiNikiforovIBM AlekseiNikiforovIBM marked this pull request as ready for review April 26, 2024 20:21
- name: Build Docker Image
run: |
manywheel/build_docker.sh
build-docker-cpu-s390x:
Copy link
Copy Markdown
Contributor

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?

Copy link
Copy Markdown
Contributor Author

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.

@@ -1,18 +1,15 @@
FROM --platform=linux/s390x docker.io/redhat/ubi9 as base
FROM --platform=linux/s390x docker.io/ubuntu:24.04 as base
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: If it works, we can stick with ubuntu for now. Otherwise, let's use AlmaLinux 8 as mentioned in https://github.com/pypa/manylinux per our discussion.

bash "${SCRIPTPATH}/build_rocm.sh"
;;
cpu | cpu-cxx11-abi)
cpu | cpu-cxx11-abi | cpu-s390x)
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should cpu-s390x be removed from here too?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

@huydhn huydhn merged commit 44938bf into pytorch:main May 3, 2024
tinglvv pushed a commit to tinglvv/builder that referenced this pull request May 20, 2024
* Disable automatic building of s390x docker image

* Update docker image and build scripts for s390x

* Switch devtoolset to 13

There is a not yet investigated build failure
caused by gcc 12, but it doesn't reproduce
with gcc 13.

* Adapt binaries check for s390x

* Switch to ubuntu:24.04 for s390x

* Update libgomp.so.1 path for s390x
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants