summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMassimiliano Culpo <massimiliano.culpo@gmail.com>2023-11-10 14:56:04 +0100
committerGitHub <noreply@github.com>2023-11-10 13:56:04 +0000
commitfbf02b561ae628ea14302d4b55a02e3ee2f4ec2c (patch)
treeac3b0571112da8e1578ce140b84b6417c458288e /lib
parent4027a2139b053251dafc2de38d24eac4d69d42a0 (diff)
downloadspack-fbf02b561ae628ea14302d4b55a02e3ee2f4ec2c.tar.gz
spack-fbf02b561ae628ea14302d4b55a02e3ee2f4ec2c.tar.bz2
spack-fbf02b561ae628ea14302d4b55a02e3ee2f4ec2c.tar.xz
spack-fbf02b561ae628ea14302d4b55a02e3ee2f4ec2c.zip
gromacs et al: fix ^mkl pattern (#41002)
The ^mkl pattern was used to refer to three packages even though none of software using it was depending on "mkl". This pattern, which follows Hyrum's law, is now being removed in favor of a more explicit one. In this PR gromacs, abinit, lammps, and quantum-espresso are modified. Intel packages are also modified to provide "lapack" and "blas" together.
Diffstat (limited to 'lib')
-rw-r--r--lib/spack/spack/build_systems/oneapi.py7
-rw-r--r--lib/spack/spack/package.py1
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/spack/spack/build_systems/oneapi.py b/lib/spack/spack/build_systems/oneapi.py
index 1961eb312c..4c432c0cac 100644
--- a/lib/spack/spack/build_systems/oneapi.py
+++ b/lib/spack/spack/build_systems/oneapi.py
@@ -9,11 +9,10 @@ import platform
import shutil
from os.path import basename, dirname, isdir
-from llnl.util.filesystem import find_headers, find_libraries, join_path
+from llnl.util.filesystem import find_headers, find_libraries, join_path, mkdirp
from llnl.util.link_tree import LinkTree
from spack.directives import conflicts, variant
-from spack.package import mkdirp
from spack.util.environment import EnvironmentModifications
from spack.util.executable import Executable
@@ -212,3 +211,7 @@ class IntelOneApiStaticLibraryList:
@property
def ld_flags(self):
return "{0} {1}".format(self.search_flags, self.link_flags)
+
+
+#: Tuple of Intel math libraries, exported to packages
+INTEL_MATH_LIBRARIES = ("intel-mkl", "intel-oneapi-mkl", "intel-parallel-studio")
diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py
index ee6fb0ed8c..79df48cd17 100644
--- a/lib/spack/spack/package.py
+++ b/lib/spack/spack/package.py
@@ -50,6 +50,7 @@ from spack.build_systems.msbuild import MSBuildPackage
from spack.build_systems.nmake import NMakePackage
from spack.build_systems.octave import OctavePackage
from spack.build_systems.oneapi import (
+ INTEL_MATH_LIBRARIES,
IntelOneApiLibraryPackage,
IntelOneApiPackage,
IntelOneApiStaticLibraryList,