diff options
| author | Dom Heinzeller <dom.heinzeller@icloud.com> | 2024-04-03 15:57:54 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-03 15:57:54 -0600 |
| commit | e322a8382fa1d549bd0df5d5b2d27edc03853717 (patch) | |
| tree | ddab7e3a91451171c71078fd5432784c87502888 /var | |
| parent | 53fb4795cabe8eaa7f320a422ca9e285fd269c5b (diff) | |
| download | spack-e322a8382fa1d549bd0df5d5b2d27edc03853717.tar.gz spack-e322a8382fa1d549bd0df5d5b2d27edc03853717.tar.bz2 spack-e322a8382fa1d549bd0df5d5b2d27edc03853717.tar.xz spack-e322a8382fa1d549bd0df5d5b2d27edc03853717.zip | |
py-torch: Add variant 'internal-protobuf' to build with the internal protobuf (#43056)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/py-torch/package.py | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/var/spack/repos/builtin/packages/py-torch/package.py b/var/spack/repos/builtin/packages/py-torch/package.py index 82630d7c16..95b640ec3e 100644 --- a/var/spack/repos/builtin/packages/py-torch/package.py +++ b/var/spack/repos/builtin/packages/py-torch/package.py @@ -105,6 +105,10 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage): description="Enable breakpad crash dump library", when="@1.10:1.11", ) + # py-torch has strict dependencies on old protobuf/py-protobuf versions that + # cause problems with other packages that require newer versions of protobuf + # and py-protobuf --> provide an option to use the internal/vendored protobuf. + variant("custom-protobuf", default=False, description="Use vendored protobuf") conflicts("+cuda+rocm") conflicts("+tensorpipe", when="+rocm ^hip@:5.1", msg="TensorPipe not supported until ROCm 5.2") @@ -176,14 +180,15 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage): depends_on("py-pybind11@2.10.0", when="@1.13:1", type=("build", "link", "run")) depends_on("py-pybind11@2.6.2", when="@1.8:1.12", type=("build", "link", "run")) depends_on("py-pybind11@2.3.0", when="@:1.7", type=("build", "link", "run")) - depends_on("py-protobuf@3.12.2:", when="@1.10:", type=("build", "run")) - depends_on("py-protobuf@:3.14", when="@:1.9", type=("build", "run")) - depends_on("protobuf@3.12.2:", when="@1.10:") - depends_on("protobuf@:3.14", when="@:1.9") - # https://github.com/protocolbuffers/protobuf/issues/10051 - # https://github.com/pytorch/pytorch/issues/78362 - depends_on("py-protobuf@:3", type=("build", "run")) - depends_on("protobuf@:3", type=("build", "run")) + with when("~custom-protobuf"): + depends_on("py-protobuf@3.12.2:", when="@1.10:", type=("build", "run")) + depends_on("py-protobuf@:3.14", when="@:1.9", type=("build", "run")) + depends_on("protobuf@3.12.2:", when="@1.10:") + depends_on("protobuf@:3.14", when="@:1.9") + # https://github.com/protocolbuffers/protobuf/issues/10051 + # https://github.com/pytorch/pytorch/issues/78362 + depends_on("py-protobuf@:3", type=("build", "run")) + depends_on("protobuf@:3") depends_on("eigen") # https://github.com/pytorch/pytorch/issues/60329 # depends_on("cpuinfo@2023-01-13", when="@2.1:") @@ -616,7 +621,10 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage): env.set("WITH_BLAS", "generic") # Don't use vendored third-party libraries when possible - env.set("BUILD_CUSTOM_PROTOBUF", "OFF") + if self.spec.satisfies("+custom-protobuf"): + env.set("BUILD_CUSTOM_PROTOBUF", "ON") + else: + env.set("BUILD_CUSTOM_PROTOBUF", "OFF") env.set("USE_SYSTEM_NCCL", "ON") env.set("USE_SYSTEM_EIGEN_INSTALL", "ON") env.set("pybind11_DIR", self.spec["py-pybind11"].prefix) |