zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

py-torchaudio, py-torchtext: rpath fixup (#47404)

Browse Source 
* py-torchaudio, py-torchtext: rpath fixup

also add missing dependency on Spack ffmpeg to torchaudio.

* py-torchaudio: add torio rpath
This commit is contained in:
Harmen Stoppels 2024-11-05 09:36:26 +01:00 committed by GitHub
parent 75c169d870
commit 1297dd7fbc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
var/spack/repos/builtin/packages/py-torchaudio/package.py
View File

@ -104,6 +104,9 @@ class PyTorchaudio(PythonPackage):
depends_on("cmake@3.5:", when="@0.8:", type="build") depends_on("cmake@3.5:", when="@0.8:", type="build")
depends_on("ninja", when="@0.8:", type="build") depends_on("ninja", when="@0.8:", type="build")
# prior to 2.1 ffmpeg was vendored
depends_on("ffmpeg@:6", when="@2.1:")
# setup.py # setup.py
depends_on("py-setuptools", type="build") depends_on("py-setuptools", type="build")
depends_on("py-pybind11", when="@0.12:", type=("build", "link")) depends_on("py-pybind11", when="@0.12:", type=("build", "link"))
@ -118,6 +121,22 @@ class PyTorchaudio(PythonPackage):
) )
conflicts("^cuda@12.5:", when="@:2.1") conflicts("^cuda@12.5:", when="@:2.1")
def patch(self):
# Add missing rpaths, which requires patching due to hardcoded cmake_args
if self.spec.satisfies("@0.8:"):
rpaths = [f"{python_platlib}/torchaudio/lib", f"{python_platlib}/torio/lib"]
cmake_args = [
f"-DCMAKE_INSTALL_RPATH={';'.join(rpaths)}",
"-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON",
]
cmake_str = ", ".join(f"'{arg}'" for arg in cmake_args)
filter_file(
"cmake_args = [",
f"cmake_args = [{cmake_str},",
"tools/setup_helpers/extension.py",
string=True,
)
def flag_handler(self, name, flags): def flag_handler(self, name, flags):
# https://github.com/pytorch/vision/issues/8653 # https://github.com/pytorch/vision/issues/8653
if name == "ldflags": if name == "ldflags":
@ -129,6 +148,12 @@ def setup_build_environment(self, env):
# tools/setup_helpers/extension.py # tools/setup_helpers/extension.py
env.set("BUILD_SOX", 0) env.set("BUILD_SOX", 0)
if self.spec.satisfies("@2.1:"):
env.set("FFMPEG_ROOT", self.spec["ffmpeg"].prefix)
else:
# a specific ffmpeg is built but not installed, so just disable
env.set("USE_FFMPEG", "0")
if "+cuda" in self.spec["py-torch"]: if "+cuda" in self.spec["py-torch"]:
env.set("USE_CUDA", 1) env.set("USE_CUDA", 1)
else: else:

15
var/spack/repos/builtin/packages/py-torchtext/package.py
View File

@ -93,3 +93,18 @@ class PyTorchtext(PythonPackage):
depends_on("py-pybind11", when="@0.8:", type=("build", "link")) depends_on("py-pybind11", when="@0.8:", type=("build", "link"))
depends_on("py-six", when="@:0.6", type=("build", "run")) depends_on("py-six", when="@:0.6", type=("build", "run"))
depends_on("py-sentencepiece", when="@:0.7", type=("build", "run")) depends_on("py-sentencepiece", when="@:0.7", type=("build", "run"))
def patch(self):
# Add missing rpaths, which requires patching due to hardcoded cmake_args
if self.spec.satisfies("@0.13:"):
cmake_args = [
f"-DCMAKE_INSTALL_RPATH={python_platlib}/torchtext/lib",
"-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON",
]
cmake_str = ", ".join(f"'{arg}'" for arg in cmake_args)
filter_file(
"cmake_args = [",
f"cmake_args = [{cmake_str},",
"tools/setup_helpers/extension.py",
string=True,
)