Commit 1a49b881 authored by Philip Carns's avatar Philip Carns
Browse files

Merge branch 'carns/regression-pkg-rename' into 'master'

regression pkg rename

See merge request !6
parents 6828450e efcf4350
......@@ -42,7 +42,7 @@ packages:
paths:
rdma-core@20: /usr
buildable: False
ssg:
mochi-ssg:
variants: +mpi
mercury:
variants: ~boostsys
......@@ -50,6 +50,6 @@ packages:
# https://github.com/ofiwg/libfabric/issues/4806#issuecomment-461678426
libfabric:
variants: fabrics=verbs,rxm
thallium:
mochi-thallium:
variants: +cereal
......@@ -16,8 +16,8 @@ module swap PrgEnv-intel PrgEnv-gnu
module load cce
. $SANDBOX/spack/share/spack/setup-env.sh
spack load -r ssg
spack load -r bake
spack load -r mochi-ssg
spack load -r mochi-bake
spack find --loaded
......
......@@ -18,8 +18,8 @@ module swap PrgEnv-intel PrgEnv-gnu
module load cce
. $SANDBOX/spack/share/spack/setup-env.sh
spack load -r ssg
spack load -r bake
spack load -r mochi-ssg
spack load -r mochi-bake
spack find --loaded
......
......@@ -52,7 +52,7 @@ packages:
paths:
openssl@1.0.2: /usr
buildable: False
ssg:
mochi-ssg:
variants: +mpi
libfabric:
variants: fabrics=gni
......
......@@ -16,8 +16,8 @@ module swap PrgEnv-intel PrgEnv-gnu
module load cce
. $SANDBOX/spack/share/spack/setup-env.sh
spack load -r ssg
spack load -r bake
spack load -r mochi-ssg
spack load -r mochi-bake
spack find --loaded
......
......@@ -58,10 +58,10 @@ spack uninstall -R -y argobots mercury libfabric || true
# ior acts as our "apex" package here, causing several other packages to build
spack spec ior@develop +mobject
spack install ior@develop +mobject
spack spec bake
spack spec ssg ^mpich
spack install bake
spack install ssg ^mpich
spack spec mochi-bake
spack spec mochi-ssg ^mpich
spack install mochi-bake
spack install mochi-ssg ^mpich
# deliberately repeat setup-env step after building modules to ensure
......@@ -69,8 +69,8 @@ spack install ssg ^mpich
. $SANDBOX/spack/share/spack/setup-env.sh
# load ssg and bake because they are needed by things compiled outside of
# spack later in this script
spack load -r ssg
spack load -r bake
spack load -r mochi-ssg
spack load -r mochi-bake
# sds-tests
echo "=== BUILDING SDS TEST PROGRAMS ==="
......
......@@ -12,9 +12,9 @@ module swap PrgEnv-intel PrgEnv-gnu
# ssg and libfabric-1.8.0
#spack load -r ssg/lfdi2fo
spack load -r ssg
spack load -r mochi-ssg
# ssg doesn't need bake, but these ssg tests were built as part of sds-tests, which does
spack load -r bake
spack load -r mochi-bake
spack find --loaded
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment