diff options
| -rw-r--r-- | lib/spack/spack/build_systems/python.py | 6 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-torch/package.py | 31 |
2 files changed, 3 insertions, 34 deletions
diff --git a/lib/spack/spack/build_systems/python.py b/lib/spack/spack/build_systems/python.py index 085feec5fe..d1cecdac63 100644 --- a/lib/spack/spack/build_systems/python.py +++ b/lib/spack/spack/build_systems/python.py @@ -243,8 +243,8 @@ class PythonPackage(PackageBase): """Discover header files in platlib.""" # Headers may be in either location - include = inspect.getmodule(self).include - platlib = inspect.getmodule(self).platlib + include = self.prefix.join(self.spec["python"].package.include) + platlib = self.prefix.join(self.spec["python"].package.platlib) headers = find_all_headers(include) + find_all_headers(platlib) if headers: @@ -259,7 +259,7 @@ class PythonPackage(PackageBase): # Remove py- prefix in package name library = "lib" + self.spec.name[3:].replace("-", "?") - root = inspect.getmodule(self).platlib + root = self.prefix.join(self.spec["python"].package.platlib) for shared in [True, False]: libs = find_libraries(library, root, shared=shared, recursive=True) diff --git a/var/spack/repos/builtin/packages/py-torch/package.py b/var/spack/repos/builtin/packages/py-torch/package.py index 6b4b82dacb..9e5a9a8cef 100644 --- a/var/spack/repos/builtin/packages/py-torch/package.py +++ b/var/spack/repos/builtin/packages/py-torch/package.py @@ -321,37 +321,6 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage): when="@:1.9.1 ^cuda@11.4.100:", ) - @property - def headers(self): - """Discover header files in platlib.""" - - # Headers may be in either location - include = join_path(self.prefix, self.spec["python"].package.include) - platlib = join_path(self.prefix, self.spec["python"].package.platlib) - headers = find_all_headers(include) + find_all_headers(platlib) - - if headers: - return headers - - msg = "Unable to locate {} headers in {} or {}" - raise NoHeadersError(msg.format(self.spec.name, include, platlib)) - - @property - def libs(self): - """Discover libraries in platlib.""" - - # Remove py- prefix in package name - library = "lib" + self.spec.name[3:].replace("-", "?") - root = join_path(self.prefix, self.spec["python"].package.platlib) - - for shared in [True, False]: - libs = find_libraries(library, root, shared=shared, recursive=True) - if libs: - return libs - - msg = "Unable to recursively locate {} libraries in {}" - raise NoLibrariesError(msg.format(self.spec.name, root)) - @when("@1.5.0:") def patch(self): # https://github.com/pytorch/pytorch/issues/52208 |