Merged
Conversation
Also, simplify EnvironmentManifestFile, which doesn't need to keep track of both a pristine YAML and a YAML with defaults anymore.
Member
Author
|
I'll leave spack/lib/spack/spack/config.py Line 1350 in 54ee7d4 for another PR. Not clear to me if we can get rid of that easily. |
haampie
approved these changes
Jul 10, 2024
hariharan-devarajan
pushed a commit
to hariharan-devarajan/spack
that referenced
this pull request
Jul 10, 2024
psakievich
added a commit
to sandialabs/spack-manager
that referenced
this pull request
Jul 16, 2024
Address changes to spack environments and scopes See: - spack/spack#45044 - spack/spack#45135
psakievich
added a commit
to sandialabs/spack-manager
that referenced
this pull request
Jul 16, 2024
Address changes to spack environments and scopes See: - spack/spack#45044 - spack/spack#45135
psakievich
added a commit
to sandialabs/spack-manager
that referenced
this pull request
Jul 16, 2024
* Fixes for changes in core spack Address changes to spack environments and scopes See: - spack/spack#45044 - spack/spack#45135 * Fixes * Style ci * Style
diehlpk
pushed a commit
to diehlpk/spack
that referenced
this pull request
Aug 14, 2024
FrederickDeny
pushed a commit
to FrederickDeny/spack
that referenced
this pull request
Aug 26, 2024
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This just tries to remove a few
deepcopycalls.Double deepcopy in
_write_sectionThis call:
spack/lib/spack/spack/config.py
Lines 178 to 179 in 54ee7d4
is redundant, since the first thing done within the
validatefunction is to take a deepcopy of the input data.Deepcopy when processing
definitionsin YAML filesThis other call:
spack/lib/spack/spack/environment/environment.py
Lines 960 to 964 in 54ee7d4
seems to be needed to
popfrom the input. The function is reworked to avoid the need for popping.Deepcopy on YAML validation
Before #20526 the validation of a YAML file was modifying the data (!), so we were using a defensive deepcopy to be able to round-trip data:
spack/lib/spack/spack/config.py
Line 1085 in 54ee7d4
We don't need that since #20526 so here I removed the
deepcopyand simplifiedEnvironmentManifestFile, which was still keeping track of a "pristine" YAML file and a YAML file with defaults attached.Measured on the same benchmark as in #43745 on: