Skip to content

Commit 98fbadf

Browse files
authored
remove call to binary_mirror and add more -e spack flags [deception-rebuild]
1 parent c2cde1e commit 98fbadf

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

buildsystem/spack/configure_modules.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ module list
1212

1313
# This assumes that we are installing from a binary mirror, and don't want to fetch files
1414
# Make sure to use binary_mirror.sh if this is failing
15-
spack install -j $1 && \
15+
spack -e $SPACKENV install -j $1 && \
1616

1717
# This deletes the previous modules that are installed
1818
# Either use a different module path than other users, or deal with frequent updates
1919
# To use a different module path, you must update the variable $SPACK_MODULES
2020
# This is configured for the default for the branch in /buildsystem/spack/platform/env.sh
21-
spack module tcl refresh -y && \
21+
spack -e $SPACKENV module tcl refresh -y && \
2222

2323
# We will create a new modules file, with the first line being the module path
2424
mkdir -p $base/modules && \
@@ -35,10 +35,10 @@ echo module use -a $SPACK_INSTALL/$SPACK_MODULES/$arch &> $base/modules/dependen
3535
echo module use -a $SPACK_INSTALL/$SPACK_MODULES/$arch &> $base/modules/exago.sh && \
3636

3737
# Now we can append to the files
38-
spack module tcl loads -r -x exago -x openssl exago &>> $base/modules/dependencies.sh && \
38+
spack -e $SPACKENV module tcl loads -r -x exago -x openssl exago &>> $base/modules/dependencies.sh && \
3939
# spack module tcl loads -r -x exago -x openssl exago &>> $base/modules/optimized-dependencies.sh && \
4040
# spack module tcl loads exago &>> $base/modules/exago-optimized.sh && \
41-
spack module tcl loads exago &>> $base/modules/exago.sh
41+
spack -e $SPACKENV module tcl loads exago &>> $base/modules/exago.sh
4242

4343
exit_code=$?
4444

buildsystem/spack/deception/sbatch.sh

-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ cleanup() {
4444
export MY_CLUSTER=deception
4545
cp /qfs/projects/earthshot/src/coinhsl-archive-2019.05.21.tar.gz . &&
4646
. buildsystem/spack/load_spack.sh &&
47-
. buildsystem/spack/binary_mirror.sh &&
4847
# spack clean -abm && # shouldn't run this everytime...
4948
spack -e $SPACKENV develop --no-clone --path=$(pwd) exago@develop &&
5049
mkdir hiop_dev

0 commit comments

Comments
 (0)