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

Tab to spaces (#22362)

Browse Source
This commit is contained in:
Harmen Stoppels 2021-03-18 07:20:06 +01:00 committed by GitHub
parent 441d09cc27
commit 15645147ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/spack/env/cc vendored
View File

@ -502,9 +502,9 @@ for dir in "${isystem_includes[@]}"; do args+=("-isystem" "$dir"); done
IFS=':' read -ra spack_include_dirs <<< "$SPACK_INCLUDE_DIRS" IFS=':' read -ra spack_include_dirs <<< "$SPACK_INCLUDE_DIRS"
if [[ $mode == cpp || $mode == cc || $mode == as || $mode == ccld ]]; then if [[ $mode == cpp || $mode == cc || $mode == as || $mode == ccld ]]; then
if [[ "$isystem_was_used" == "true" ]] ; then if [[ "$isystem_was_used" == "true" ]] ; then
for dir in "${spack_include_dirs[@]}"; do args+=("-isystem" "$dir"); done for dir in "${spack_include_dirs[@]}"; do args+=("-isystem" "$dir"); done
else else
for dir in "${spack_include_dirs[@]}"; do args+=("-I$dir"); done for dir in "${spack_include_dirs[@]}"; do args+=("-I$dir"); done
fi fi
fi fi

4
share/spack/setup-env.sh
View File

@ -303,12 +303,12 @@ _spack_pathadd PATH "${_sp_prefix%/}/bin"
# Check whether a function of the given name is defined # Check whether a function of the given name is defined
# #
_spack_fn_exists() { _spack_fn_exists() {
LANG= type $1 2>&1 | grep -q 'function' LANG= type $1 2>&1 | grep -q 'function'
} }
need_module="no" need_module="no"
if ! _spack_fn_exists use && ! _spack_fn_exists module; then if ! _spack_fn_exists use && ! _spack_fn_exists module; then
need_module="yes" need_module="yes"
fi; fi;
# Define the spack shell function with some informative no-ops, so when users # Define the spack shell function with some informative no-ops, so when users

8
share/spack/setup-tutorial-env.sh
View File

@ -95,16 +95,16 @@ INSTANCEID=$(curl http://169.254.169.254/latest/meta-data//instance-id)
# Get the ID of the Amazon EBS volume associated with the instance. # Get the ID of the Amazon EBS volume associated with the instance.
VOLUMEID=$(aws ec2 describe-instances \ VOLUMEID=$(aws ec2 describe-instances \
--instance-id $INSTANCEID \ --instance-id $INSTANCEID \
--query "Reservations[0].Instances[0].BlockDeviceMappings[0].Ebs.VolumeId" \ --query "Reservations[0].Instances[0].BlockDeviceMappings[0].Ebs.VolumeId" \
--output text) --output text)
# Resize the EBS volume. # Resize the EBS volume.
aws ec2 modify-volume --volume-id $VOLUMEID --size $SIZE aws ec2 modify-volume --volume-id $VOLUMEID --size $SIZE
# Wait for the resize to finish. # Wait for the resize to finish.
while [ \ while [ \
"$(aws ec2 describe-volumes-modifications \ "$(aws ec2 describe-volumes-modifications \
--volume-id $VOLUMEID \ --volume-id $VOLUMEID \
--filters Name=modification-state,Values="optimizing","completed" \ --filters Name=modification-state,Values="optimizing","completed" \
--query "length(VolumesModifications)"\ --query "length(VolumesModifications)"\