go back to origin/master mercury

perf-regression/cooley/run-regression-ofi-rxm.sh

@@ -17,7 +17,6 @@ JOBDIR=$PWD/mochi-regression-job-$$
 
 # scratch area to clone and build things
 mkdir $SANDBOX
-cp spack-mercury-exp.patch $SANDBOX/
 cp spack-shell.patch  $SANDBOX/
 cp spack-rdma-core-rundir.patch $SANDBOX/
 cp packages.yaml $SANDBOX/
@@ -36,8 +35,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
 patch -p1 < ../spack-shell.patch
 patch -p1 < ../spack-rdma-core-rundir.patch

perf-regression/cooley/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")

perf-regression/theta/run-regression.sh

@@ -22,7 +22,6 @@ JOBDIR=$PWD/mochi-regression-job-$$
 
 # scratch area to clone and build things
 mkdir -p $SANDBOX
-cp spack-mercury-exp.patch $SANDBOX/
 cp spack-shell.patch  $SANDBOX/
 cp packages.yaml  $SANDBOX/
 
@@ -40,8 +39,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
 patch -p1 < ../spack-shell.patch
 export SPACK_SHELL=bash

perf-regression/theta/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")