Skip to content

Only copy include files (compiler, module choice) that are used #2163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
climbfuji merged 1 commit into from
Oct 14, 2026
Merged

Only copy include files (compiler, module choice) that are used #2163

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 24 additions & 2 deletions spack-ext/lib/spack-stack/stack/stack_env.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,16 @@
# spack-stack.
check_file = ".spackstack"

default_config_yamls = [
"concretizer.yaml",
"config.yaml",
"include.yaml",
"mirrors.yaml",
"modules.yaml",
"packages.yaml",
"repos.yaml",
"toolchains.yaml",
]

def get_git_revision_short_hash(path) -> str:
return (
Expand Down Expand Up @@ -136,13 +146,14 @@ def _copy_common_includes(self):
"""Copy common directory into environment and add includes to spack.yaml."""
env_common_dir = os.path.join(self.env_dir(), "common")
logging.info(f"Copying common includes from {common_path} ...\n ... to {env_common_dir}")
shutil.copytree(common_path, env_common_dir)
os.makedirs(env_common_dir, exist_ok=True)

# Add includes for common configs. Higher precedence items are added first.
(compiler_name, _) = compiler_name_and_version_from_string(self.compiler)
packages_compiler_yaml = f"packages_{compiler_name}.yaml"
packages_compiler_yaml_path = os.path.join(common_path, packages_compiler_yaml)
if os.path.exists(packages_compiler_yaml_path):
shutil.copy(packages_compiler_yaml_path, env_common_dir)
self.includes.append(os.path.join("common", packages_compiler_yaml))
else:
if self.treatwarningsaserrors:
Expand All @@ -154,8 +165,13 @@ def _copy_common_includes(self):
modules_yaml_modulesys = f"modules_{lmod_or_tcl}.yaml"
modules_yaml_modulesys_path = os.path.join(common_path, modules_yaml_modulesys)
if os.path.exists(modules_yaml_modulesys_path):
shutil.copy(modules_yaml_modulesys_path, env_common_dir)
self.includes.append(os.path.join("common", modules_yaml_modulesys))

for config_yaml in default_config_yamls:
config_yaml_path = os.path.join(common_path, config_yaml)
if os.path.exists(config_yaml_path):
shutil.copy(config_yaml_path, env_common_dir)
self.includes.append("common")

def site_configs_dir(self):
Expand All @@ -175,12 +191,13 @@ def _copy_site_includes(self):
site_path = self.site_configs_dir()
env_site_dir = os.path.join(self.env_dir(), site_name)
logging.info(f"Copying site includes from {self.site_configs_dir()} ...\n ... to {env_site_dir}")
shutil.copytree(self.site_configs_dir(), env_site_dir)
os.makedirs(env_site_dir, exist_ok = True)

# Add includes for site configs. Higher precedence items are added first.
packages_compiler_yaml = f"packages_{self.compiler}.yaml"
packages_compiler_yaml_path = os.path.join(site_path, packages_compiler_yaml)
if os.path.exists(packages_compiler_yaml_path):
shutil.copy(packages_compiler_yaml_path, env_site_dir)
self.includes.append(os.path.join(site_name, packages_compiler_yaml))
else:
if self.treatwarningsaserrors:
Expand All @@ -192,8 +209,13 @@ def _copy_site_includes(self):
modules_yaml_modulesys = f"modules_{lmod_or_tcl}.yaml"
modules_yaml_modulesys_path = os.path.join(site_path, modules_yaml_modulesys)
if os.path.exists(modules_yaml_modulesys_path):
shutil.copy(modules_yaml_modulesys_path, env_site_dir)
self.includes.append(os.path.join(site_name, modules_yaml_modulesys))

for config_yaml in default_config_yamls:
config_yaml_path = os.path.join(site_path, config_yaml)
if os.path.exists(config_yaml_path):
shutil.copy(config_yaml_path, env_site_dir)
self.includes.append(site_name)

def get_upstream_realpaths(self, upstream_path):
Expand Down
Loading