diff options
| -rw-r--r-- | lib/spack/spack/build_systems/intel.py | 8 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-torch/package.py | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/lib/spack/spack/build_systems/intel.py b/lib/spack/spack/build_systems/intel.py index b40513bfe6..4017f2e526 100644 --- a/lib/spack/spack/build_systems/intel.py +++ b/lib/spack/spack/build_systems/intel.py @@ -1048,11 +1048,19 @@ class IntelPackage(PackageBase): env_mods = { 'MKLROOT': self.normalize_path('mkl'), 'SPACK_COMPILER_EXTRA_RPATHS': self.component_lib_dir('mkl'), + 'CMAKE_PREFIX_PATH': self.normalize_path('mkl'), + 'CMAKE_LIBRARY_PATH': self.component_lib_dir('mkl'), + 'CMAKE_INCLUDE_PATH': self.component_include_dir('mkl'), } env.set('MKLROOT', env_mods['MKLROOT']) env.append_path('SPACK_COMPILER_EXTRA_RPATHS', env_mods['SPACK_COMPILER_EXTRA_RPATHS']) + env.append_path('CMAKE_PREFIX_PATH', env_mods['CMAKE_PREFIX_PATH']) + env.append_path('CMAKE_LIBRARY_PATH', + env_mods['CMAKE_LIBRARY_PATH']) + env.append_path('CMAKE_INCLUDE_PATH', + env_mods['CMAKE_INCLUDE_PATH']) debug_print("adding/modifying build env:", env_mods) diff --git a/var/spack/repos/builtin/packages/py-torch/package.py b/var/spack/repos/builtin/packages/py-torch/package.py index 5c0f74bef8..b34d0b08f7 100644 --- a/var/spack/repos/builtin/packages/py-torch/package.py +++ b/var/spack/repos/builtin/packages/py-torch/package.py @@ -180,11 +180,6 @@ class PyTorch(PythonPackage): else: env.set('NO_' + var, 'ON') - # Build system has problems locating MKL libraries - # See https://github.com/pytorch/pytorch/issues/24334 - if 'mkl' in self.spec: - env.prepend_path('CMAKE_PREFIX_PATH', self.spec['mkl'].prefix.mkl) - # Build in parallel to speed up build times env.set('MAX_JOBS', make_jobs) |