zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

builtin: minimal fix for _get_host_config_path

Browse Source
This commit is contained in:
Massimiliano Culpo 2024-11-18 13:20:52 +01:00
parent 533973671b
commit f8117e8182
No known key found for this signature in database
GPG Key ID: 3E52BB992233066C
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
var/spack/repos/builtin/packages/ascent/package.py
View File

@ -376,8 +376,9 @@ 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( compiler_str = f"{self['c'].name}-{self['c'].version}"
socket.gethostname(), sys_type, spec.compiler, spec.dag_hash() host_config_path = (
f"{socket.gethostname()}-{sys_type}-{compiler_str}" f"-ascent-{spec.dag_hash()}.cmake"
) )
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))

7
var/spack/repos/builtin/packages/conduit/package.py
View File

@ -301,10 +301,11 @@ 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(
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 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))
return host_config_path return host_config_path

8
var/spack/repos/builtin/packages/lvarray/package.py
View File

@ -121,12 +121,8 @@ 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" % ( compiler_str = f"{self['c'].name}-{self['c'].version}"
hostname, host_config_path = f"{hostname}-{self._get_sys_type(spec)}-{compiler_str}{var}.cmake"
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))

5
var/spack/repos/builtin/packages/vtk-h/package.py
View File

@ -112,8 +112,9 @@ 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( compiler_str = f"{self['cxx'].name}-{self['cxx'].version}"
socket.gethostname(), sys_type, spec.compiler, spec.dag_hash() host_config_path = (
f"{socket.gethostname()}-{sys_type}-{compiler_str}-vtkh-{spec.dag_hash()}.cmake"
) )
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))