go back to origin/master mercury

perf-regression/bebop/run-regression.sh

@@ -16,7 +16,6 @@ JOBDIR=$PWD/mochi-regression-job-$$
 
 # scratch area to clone and build things
 mkdir -p $SANDBOX
-cp spack-mercury-exp.patch  $SANDBOX/
 cp packages.yaml $SANDBOX/
 
 # scratch area for job submission
@@ -33,8 +32,6 @@ 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/sds-repo
-patch -p1 < ../spack-mercury-exp.patch
 cd $SANDBOX/spack
 . $SANDBOX/spack/share/spack/setup-env.sh
 # put packages file in place in SPACK_ROOT to set our preferences for building

perf-regression/bebop/spack-mercury-exp.patch

-diff --git a/packages/mercury/package.py b/packages/mercury/package.py
-index 1cbe73c..898ed29 100644
---- a/packages/mercury/package.py
-+++ b/packages/mercury/package.py
-@@ -32,7 +32,7 @@ class Mercury(CMakePackage):
-     url = "https://mercury-hpc.github.io/"
- 
- 
--    version('master', git='https://github.com/mercury-hpc/mercury.git',
-+    version('master', branch='carns/dev-ofi-config-matrix', git='https://github.com/carns/mercury.git',
-             submodules=True)
- 
-     variant('cci', default=False, description="Use CCI for network transport")