Use Python's built-in machinery to import compilers (#23290)
This commit is contained in:
parent
8a7bfe97c3
commit
0d173bb32b
1 changed files with 7 additions and 8 deletions
|
@ -22,11 +22,10 @@
|
||||||
import spack.spec
|
import spack.spec
|
||||||
import spack.config
|
import spack.config
|
||||||
import spack.architecture
|
import spack.architecture
|
||||||
import spack.util.imp as simp
|
|
||||||
from spack.util.environment import get_path
|
from spack.util.environment import get_path
|
||||||
from spack.util.naming import mod_to_class
|
from spack.util.naming import mod_to_class
|
||||||
|
|
||||||
_imported_compilers_module = 'spack.compilers'
|
|
||||||
_path_instance_vars = ['cc', 'cxx', 'f77', 'fc']
|
_path_instance_vars = ['cc', 'cxx', 'f77', 'fc']
|
||||||
_flags_instance_vars = ['cflags', 'cppflags', 'cxxflags', 'fflags']
|
_flags_instance_vars = ['cflags', 'cppflags', 'cxxflags', 'fflags']
|
||||||
_other_instance_vars = ['modules', 'operating_system', 'environment',
|
_other_instance_vars = ['modules', 'operating_system', 'environment',
|
||||||
|
@ -470,17 +469,17 @@ def get_compiler_duplicates(compiler_spec, arch_spec):
|
||||||
@llnl.util.lang.memoized
|
@llnl.util.lang.memoized
|
||||||
def class_for_compiler_name(compiler_name):
|
def class_for_compiler_name(compiler_name):
|
||||||
"""Given a compiler module name, get the corresponding Compiler class."""
|
"""Given a compiler module name, get the corresponding Compiler class."""
|
||||||
assert(supported(compiler_name))
|
assert supported(compiler_name)
|
||||||
|
|
||||||
# Hack to be able to call the compiler `apple-clang` while still
|
# Hack to be able to call the compiler `apple-clang` while still
|
||||||
# using a valid python name for the module
|
# using a valid python name for the module
|
||||||
module_name = compiler_name
|
submodule_name = compiler_name
|
||||||
if compiler_name == 'apple-clang':
|
if compiler_name == 'apple-clang':
|
||||||
module_name = compiler_name.replace('-', '_')
|
submodule_name = compiler_name.replace('-', '_')
|
||||||
|
|
||||||
file_path = os.path.join(spack.paths.compilers_path, module_name + ".py")
|
module_name = '.'.join(['spack', 'compilers', submodule_name])
|
||||||
compiler_mod = simp.load_source(_imported_compilers_module, file_path)
|
module_obj = __import__(module_name, fromlist=[None])
|
||||||
cls = getattr(compiler_mod, mod_to_class(compiler_name))
|
cls = getattr(module_obj, mod_to_class(compiler_name))
|
||||||
|
|
||||||
# make a note of the name in the module so we can get to it easily.
|
# make a note of the name in the module so we can get to it easily.
|
||||||
cls.name = compiler_name
|
cls.name = compiler_name
|
||||||
|
|
Loading…
Reference in a new issue