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

spack mirror create --all: include patches (#41579)

Browse Source
This commit is contained in:
Harmen Stoppels 2023-12-13 20:00:44 +01:00 committed by GitHub
parent a0c7b10c76
commit f63dbbe75d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
lib/spack/spack/package_base.py
View File

@ -1035,15 +1035,26 @@ def _make_stage(self):
# To fetch the current version # To fetch the current version
source_stage = self._make_root_stage(self.fetcher) source_stage = self._make_root_stage(self.fetcher)
# Extend it with all resources and patches # all_stages is source + resources + patches
all_stages = StageComposite() all_stages = StageComposite()
all_stages.append(source_stage) all_stages.append(source_stage)
all_stages.extend( all_stages.extend(
self._make_resource_stage(source_stage, r) for r in self._get_needed_resources() self._make_resource_stage(source_stage, r) for r in self._get_needed_resources()
) )
all_stages.extend( if self.spec.concrete:
p.stage for p in self.spec.patches if isinstance(p, spack.patch.UrlPatch) all_stages.extend(
) p.stage for p in self.spec.patches if isinstance(p, spack.patch.UrlPatch)
)
else:
# The only code path that gets here is spack mirror create --all which just needs all
# matching patches.
all_stages.extend(
p.stage
for when_spec, patch_list in self.patches.items()
if self.spec.intersects(when_spec)
for p in patch_list
if isinstance(p, spack.patch.UrlPatch)
)
return all_stages return all_stages
@property @property
@ -1743,28 +1754,16 @@ def _if_ninja_target_execute(self, target, *args, **kwargs):
inspect.getmodule(self).ninja(target, *args, **kwargs) inspect.getmodule(self).ninja(target, *args, **kwargs)
def _get_needed_resources(self): def _get_needed_resources(self):
resources = [] # We use intersects here cause it would also work if self.spec is abstract
# Select the resources that are needed for this build resources = [
if self.spec.concrete: resource
for when_spec, resource_list in self.resources.items(): for when_spec, resource_list in self.resources.items()
if when_spec in self.spec: if self.spec.intersects(when_spec)
resources.extend(resource_list) for resource in resource_list
else: ]
for when_spec, resource_list in self.resources.items(): # Sorts the resources by the length of the string representing their destination. Since any
# Note that variant checking is always strict for specs where # nested resource must contain another resource's path, that should work
# the name is not specified. But with strict variant checking, return sorted(resources, key=lambda res: len(res.destination))
# only variants mentioned in 'other' are checked. Here we only
# want to make sure that no constraints in when_spec
# conflict with the spec, so we need to invoke
# when_spec.satisfies(self.spec) vs.
# self.spec.satisfies(when_spec)
if when_spec.intersects(self.spec):
resources.extend(resource_list)
# Sorts the resources by the length of the string representing their
# destination. Since any nested resource must contain another
# resource's name in its path, it seems that should work
resources = sorted(resources, key=lambda res: len(res.destination))
return resources
def _resource_stage(self, resource): def _resource_stage(self, resource):
pieces = ["resource", resource.name, self.spec.dag_hash()] pieces = ["resource", resource.name, self.spec.dag_hash()]