builtin: minimal fix for _get_host_config_path
This commit is contained in:
parent
533973671b
commit
f8117e8182
@ -376,8 +376,9 @@ def _get_host_config_path(self, spec):
|
||||
# if on llnl systems, we can use the SYS_TYPE
|
||||
if "SYS_TYPE" in env:
|
||||
sys_type = env["SYS_TYPE"]
|
||||
host_config_path = "{0}-{1}-{2}-ascent-{3}.cmake".format(
|
||||
socket.gethostname(), sys_type, spec.compiler, spec.dag_hash()
|
||||
compiler_str = f"{self['c'].name}-{self['c'].version}"
|
||||
host_config_path = (
|
||||
f"{socket.gethostname()}-{sys_type}-{compiler_str}" f"-ascent-{spec.dag_hash()}.cmake"
|
||||
)
|
||||
dest_dir = spec.prefix
|
||||
host_config_path = os.path.abspath(join_path(dest_dir, host_config_path))
|
||||
|
@ -301,10 +301,11 @@ def _get_host_config_path(self, spec):
|
||||
# if on llnl systems, we can use the SYS_TYPE
|
||||
if "SYS_TYPE" in env:
|
||||
sys_type = env["SYS_TYPE"]
|
||||
host_config_path = "{0}-{1}-{2}-conduit-{3}.cmake".format(
|
||||
socket.gethostname(), sys_type, spec.compiler, spec.dag_hash()
|
||||
)
|
||||
|
||||
compiler_str = f"{self['c'].name}-{self['c'].version}"
|
||||
host_config_path = (
|
||||
f"{socket.gethostname()}-{sys_type}-{compiler_str}" f"-conduit-{spec.dag_hash()}.cmake"
|
||||
)
|
||||
dest_dir = self.stage.source_path
|
||||
host_config_path = os.path.abspath(join_path(dest_dir, host_config_path))
|
||||
return host_config_path
|
||||
|
@ -121,12 +121,8 @@ def _get_host_config_path(self, spec):
|
||||
var = "-".join([var, "cuda"])
|
||||
|
||||
hostname = socket.gethostname().rstrip("1234567890")
|
||||
host_config_path = "%s-%s-%s%s.cmake" % (
|
||||
hostname,
|
||||
self._get_sys_type(spec),
|
||||
spec.compiler,
|
||||
var,
|
||||
)
|
||||
compiler_str = f"{self['c'].name}-{self['c'].version}"
|
||||
host_config_path = f"{hostname}-{self._get_sys_type(spec)}-{compiler_str}{var}.cmake"
|
||||
|
||||
dest_dir = self.stage.source_path
|
||||
host_config_path = os.path.abspath(pjoin(dest_dir, host_config_path))
|
||||
|
@ -112,8 +112,9 @@ def _get_host_config_path(self, spec):
|
||||
# if on llnl systems, we can use the SYS_TYPE
|
||||
if "SYS_TYPE" in env:
|
||||
sys_type = env["SYS_TYPE"]
|
||||
host_config_path = "{0}-{1}-{2}-vtkh-{3}.cmake".format(
|
||||
socket.gethostname(), sys_type, spec.compiler, spec.dag_hash()
|
||||
compiler_str = f"{self['cxx'].name}-{self['cxx'].version}"
|
||||
host_config_path = (
|
||||
f"{socket.gethostname()}-{sys_type}-{compiler_str}-vtkh-{spec.dag_hash()}.cmake"
|
||||
)
|
||||
dest_dir = spec.prefix
|
||||
host_config_path = os.path.abspath(join_path(dest_dir, host_config_path))
|
||||
|
Loading…
Reference in New Issue
Block a user