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