Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
sds-tests
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sds
sds-tests
Commits
5584c89b
Commit
5584c89b
authored
Nov 02, 2018
by
Philip Carns
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update theta tests to use spack fork
parent
ce850a59
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
30 deletions
+2
-30
perf-regression/theta/margo-regression.qsub
perf-regression/theta/margo-regression.qsub
+0
-1
perf-regression/theta/run-regression.sh
perf-regression/theta/run-regression.sh
+2
-4
perf-regression/theta/spack-shell.patch
perf-regression/theta/spack-shell.patch
+0
-25
No files found.
perf-regression/theta/margo-regression.qsub
View file @
5584c89b
...
...
@@ -15,7 +15,6 @@ get_mercury_lib_path() {
module swap PrgEnv-intel PrgEnv-gnu
module load cce
export
SPACK_SHELL
=
bash
.
$SANDBOX
/spack/share/spack/setup-env.sh
spack load
-r
ssg
...
...
perf-regression/theta/run-regression.sh
View file @
5584c89b
...
...
@@ -22,7 +22,6 @@ JOBDIR=$PWD/mochi-regression-job-$$
# scratch area to clone and build things
mkdir
-p
$SANDBOX
cp
spack-shell.patch
$SANDBOX
/
cp
packages.yaml
$SANDBOX
/
# scratch area for job submission
...
...
@@ -30,7 +29,7 @@ mkdir -p $JOBDIR
cp
margo-regression.qsub
$JOBDIR
cd
$SANDBOX
git clone https://github.com/
spack
/spack.git
git clone https://github.com/
carns
/spack.git
git clone https://xgitlab.cels.anl.gov/sds/sds-repo.git
git clone https://xgitlab.cels.anl.gov/sds/sds-tests.git
wget http://mvapich.cse.ohio-state.edu/download/mvapich/osu-micro-benchmarks-5.3.2.tar.gz
...
...
@@ -40,8 +39,7 @@ git clone https://github.com/pdlfs/mercury-runner.git
# set up most of the libraries in spack
echo
"=== BUILD SPACK PACKAGES AND LOAD ==="
cd
$SANDBOX
/spack
patch
-p1
< ../spack-shell.patch
export
SPACK_SHELL
=
bash
git checkout carns/dev-shell-detection
.
$SANDBOX
/spack/share/spack/setup-env.sh
# put packages file in place in SPACK_ROOT to set our preferences for building
# Mochi stack
...
...
perf-regression/theta/spack-shell.patch
deleted
100644 → 0
View file @
ce850a59
diff --git a/share/spack/setup-env.sh b/share/spack/setup-env.sh
index b983299..e19aa76 100755
--- a/share/spack/setup-env.sh
+++ b/share/spack/setup-env.sh
@@ -199,12 +199,17 @@
_spack_pathadd PATH "${_sp_prefix%/}/bin"
export SPACK_ROOT=${_sp_prefix}
#
-# Determine which shell is being used
+# Try to determine which shell is being used if
+# SPACK_SHELL has not already been set by the user.
+# This variable is used for the environment-modules
+# 'module' function/command to envoke 'modulecmd' with
+# the correct shell.
#
function _spack_determine_shell() {
- ps -p $$ | tail -n 1 | awk '{print $4}' | sed 's/^-//' | xargs basename
+ ps -p $$ | tail -n 1 | awk '{print $4}' | sed 's/^-//' | xargs basename
}
-export SPACK_SHELL=$(_spack_determine_shell)
+SPACK_SHELL=${SPACK_SHELL:-$(_spack_determine_shell)}
+export SPACK_SHELL
#
# Check whether a function of the given name is defined
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment