Skip to content

Commit 7de2b6b

Browse files
luhenryclaude
andcommitted
patches: fix OPENBLAS_VERSION override being clobbered
DOCKER_GPU_BUILD_ARG's --build-arg OPENBLAS_VERSION=v0.3.34 was silently overridden: build.sh unconditionally appends its own --build-arg "OPENBLAS_VERSION=${OPENBLAS_VERSION:-}" later on the docker build command line, and a later --build-arg for the same key wins, so the build still picked up the default v0.3.33 and failed the same way. Set OPENBLAS_VERSION as a plain shell variable in the case branch instead, which flows into that later --build-arg correctly. Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
1 parent 1d65b2a commit 7de2b6b

1 file changed

Lines changed: 10 additions & 5 deletions

File tree

patches/torch/2.13.0/0001-CI-Add-manywheel-Dockerfile-for-riscv64.patch

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,19 @@ manylinux2_39_riscv64-builder:cpu-riscv64 image in build.sh.
99

1010
Pin OPENBLAS_VERSION to v0.3.34: v0.3.33 (install_openblas.sh's default)
1111
fails to build on riscv64 with "'coremsg' undeclared" in
12-
dynamic_riscv64.c; v0.3.34 declares that buffer.
12+
dynamic_riscv64.c; v0.3.34 declares that buffer. Set as a plain shell
13+
variable (not folded into DOCKER_GPU_BUILD_ARG) since build.sh
14+
unconditionally appends its own `--build-arg "OPENBLAS_VERSION=..."`
15+
after DOCKER_GPU_BUILD_ARG on the docker build command line, and a
16+
later --build-arg for the same key silently wins.
1317

1418
Upstream-Status: To upstream
1519

1620
Signed-off-by: RISE Project CI <ci@riseproject.dev>
1721
---
1822
.ci/docker/manywheel/Dockerfile_2_39_riscv64 | 66 +++++++++++++++++++++++++++++++++
19-
.ci/docker/manywheel/build.sh | 10 ++++++
20-
2 files changed, 76 insertions(+)
23+
.ci/docker/manywheel/build.sh | 11 +++++++
24+
2 files changed, 77 insertions(+)
2125

2226
diff --git a/.ci/docker/manywheel/Dockerfile_2_39_riscv64 b/.ci/docker/manywheel/Dockerfile_2_39_riscv64
2327
new file mode 100644
@@ -94,7 +98,7 @@ new file mode 100644
9498
diff --git a/.ci/docker/manywheel/build.sh b/.ci/docker/manywheel/build.sh
9599
--- a/.ci/docker/manywheel/build.sh
96100
+++ b/.ci/docker/manywheel/build.sh
97-
@@ -43,6 +43,16 @@
101+
@@ -43,6 +43,17 @@
98102
DOCKER_GPU_BUILD_ARG=" --build-arg DEVTOOLSET_VERSION=13"
99103
MANY_LINUX_VERSION="2_28_aarch64"
100104
;;
@@ -105,7 +109,8 @@ diff --git a/.ci/docker/manywheel/build.sh b/.ci/docker/manywheel/build.sh
105109
+ # See https://riseproject-dev.github.io/python-wheels/
106110
+ # v0.3.33 (install_openblas.sh's default) fails to build on riscv64
107111
+ # with "'coremsg' undeclared" in dynamic_riscv64.c; v0.3.34 fixes it.
108-
+ DOCKER_GPU_BUILD_ARG=" --platform linux/riscv64 --build-arg DEVTOOLSET_VERSION=14 --build-arg PIP_EXTRA_INDEX_URL=https://pypi.riseproject.dev/simple --build-arg PIP_PREFER_BINARY=1 --build-arg OPENBLAS_VERSION=v0.3.34"
112+
+ OPENBLAS_VERSION="v0.3.34"
113+
+ DOCKER_GPU_BUILD_ARG=" --platform linux/riscv64 --build-arg DEVTOOLSET_VERSION=14 --build-arg PIP_EXTRA_INDEX_URL=https://pypi.riseproject.dev/simple --build-arg PIP_PREFER_BINARY=1"
109114
+ MANY_LINUX_VERSION="2_39_riscv64"
110115
+ ;;
111116
manylinuxs390x-builder:cpu-s390x)

0 commit comments

Comments
 (0)