summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorAdam J. Stewart <ajstewart426@gmail.com>2022-12-05 04:37:31 -0600
committerGitHub <noreply@github.com>2022-12-05 11:37:31 +0100
commiteea3ea7675b9d0b557d8885d99b89efb977e4e80 (patch)
treedcaed16fb213cf5b3326a630687408747920ad5f /var
parent895ac2626dc7057a82ebc731b1c199b55eb0b380 (diff)
downloadspack-eea3ea7675b9d0b557d8885d99b89efb977e4e80.tar.gz
spack-eea3ea7675b9d0b557d8885d99b89efb977e4e80.tar.bz2
spack-eea3ea7675b9d0b557d8885d99b89efb977e4e80.tar.xz
spack-eea3ea7675b9d0b557d8885d99b89efb977e4e80.zip
py-torch: fix patching on ppc64le (#34283)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/py-torch/package.py35
1 files changed, 21 insertions, 14 deletions
diff --git a/var/spack/repos/builtin/packages/py-torch/package.py b/var/spack/repos/builtin/packages/py-torch/package.py
index 8533ce4f22..fa498232cb 100644
--- a/var/spack/repos/builtin/packages/py-torch/package.py
+++ b/var/spack/repos/builtin/packages/py-torch/package.py
@@ -293,35 +293,42 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage):
)
# Use patches from IBM's Open CE to enable building on Power systems
- # 03xx - patch temporary to fix a problem that when fixed upstream can be removed
+ # 01xx patches are specific to open-ce, we only include 03xx patches used in meta.yaml
+ # https://github.com/open-ce/pytorch-feedstock
patch(
- "https://github.com/open-ce/pytorch-feedstock/raw/0a145060ca8523314ec3893af935c3b140e2d0b0/pytorch-1.10/recipe/0302-cpp-extension.patch",
+ "https://github.com/open-ce/pytorch-feedstock/raw/open-ce-v1.7.4/pytorch-1.10/recipe/0302-cpp-extension.patch",
sha256="ecb3973fa7d0f4c8f8ae40433f3ca5622d730a7b16f6cb63325d1e95baff8aa2",
when="@1.10:1.11 arch=ppc64le:",
)
-
patch(
- "https://github.com/open-ce/pytorch-feedstock/raw/0a145060ca8523314ec3893af935c3b140e2d0b0/pytorch-1.10/recipe/0311-PR66085-Remove-unused-dump-method-from-VSX-vec256-methods.patch",
+ "https://github.com/open-ce/pytorch-feedstock/raw/open-ce-v1.7.4/pytorch-1.10/recipe/0311-PR66085-Remove-unused-dump-method-from-VSX-vec256-methods.patch",
sha256="f05db59f3def4c4215db7142d81029c73fe330c660492159b66d65ca5001f4d1",
- when="@1.10:1.11 arch=ppc64le:",
+ when="@1.10 arch=ppc64le:",
)
-
patch(
- "https://github.com/open-ce/pytorch-feedstock/raw/0a145060ca8523314ec3893af935c3b140e2d0b0/pytorch-1.10/recipe/0312-PR67331-Dummpy-VSX-bfloat16-implementation.patch",
+ "https://github.com/open-ce/pytorch-feedstock/raw/open-ce-v1.7.4/pytorch-1.10/recipe/0312-PR67331-Dummpy-VSX-bfloat16-implementation.patch",
sha256="860b64afa85f5e6647ebc3c91d5a0bb258784770900c9302c3599c98d5cff1ee",
- when="@1.10:1.11 arch=ppc64le:",
+ when="@1.10 arch=ppc64le:",
)
-
patch(
- "https://github.com/open-ce/pytorch-feedstock/raw/0a145060ca8523314ec3893af935c3b140e2d0b0/pytorch-1.10/recipe/0313-add-missing-vsx-dispatch.patch",
+ "https://github.com/open-ce/pytorch-feedstock/raw/open-ce-v1.7.4/pytorch-1.10/recipe/0313-add-missing-vsx-dispatch.patch",
sha256="7393c2bc0b6d41ecc813c829a1e517bee864686652e91f174cb7bcdfb10ba451",
- when="@1.10:1.11 arch=ppc64le:",
+ when="@1.10 arch=ppc64le:",
+ )
+ patch(
+ "https://github.com/open-ce/pytorch-feedstock/raw/open-ce-v1.7.4/pytorch-1.10/recipe/0314-fix-nullpointer-error.patch",
+ sha256="b9cff8966f316f58514c66a403b7a6786be3cdb252f1380a6b91c722686a4097",
+ when="@1.10 arch=ppc64le:",
)
-
patch(
- "https://github.com/open-ce/pytorch-feedstock/raw/0a145060ca8523314ec3893af935c3b140e2d0b0/pytorch-1.12/recipe/0302-cpp-extension.patch",
+ "https://github.com/open-ce/pytorch-feedstock/raw/open-ce-v1.7.4/pytorch-1.12/recipe/0302-cpp-extension.patch",
sha256="2fac519cca8997f074c263505657ff867e7ba2d6637fc8bda99c70a99be0442a",
- when="@1.12: arch=ppc64le:",
+ when="@1.12 arch=ppc64le:",
+ )
+ patch(
+ "https://github.com/open-ce/pytorch-feedstock/raw/main/pytorch-1.13/recipe/0302-cpp-extension.patch",
+ sha256="a54db63640b90e5833cc1099c0935572f5297d2d8625f62f01ac1fda79ed4569",
+ when="@1.13 arch=ppc64le:",
)
# Cherry-pick a patch to allow earlier versions of PyTorch to work with CUDA 11.4