From 9431a67a272176bf163ca1955549aeaa56b49a0a Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@lanl.gov>
Date: Wed, 30 Sep 2020 11:22:15 -0600
Subject: ecp proxy apps: add v4.0 (#19059)
* ecp-proxy-apps: add v4.0
* miniamr: add v1.6.4
---
var/spack/repos/builtin/packages/ecp-proxy-apps/package.py | 6 +++++-
var/spack/repos/builtin/packages/miniamr/package.py | 8 ++++++--
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py b/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py
index d11e8e2a83..ebd2c2e3f3 100644
--- a/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py
+++ b/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py
@@ -18,6 +18,7 @@ class EcpProxyApps(BundlePackage):
homepage = "https://proxyapps.exascaleproject.org"
+ version('4.0')
version('3.0')
version('2.1')
version('2.0')
@@ -27,8 +28,11 @@ class EcpProxyApps(BundlePackage):
variant('candle', default=False,
description='Also build CANDLE Benchmarks')
+ # Added with release 4.0
+ depends_on('miniamr@1.6.4', when='@4.0:')
+
# Added with release 3.0
- depends_on('miniamr@1.4.4', when='@3.0:')
+ depends_on('miniamr@1.4.4', when='@3.0:3.1')
depends_on('xsbench@19', when='@3.0:')
depends_on('laghos@3.0', when='@3.0:')
diff --git a/var/spack/repos/builtin/packages/miniamr/package.py b/var/spack/repos/builtin/packages/miniamr/package.py
index b2166618c7..262c7cb856 100644
--- a/var/spack/repos/builtin/packages/miniamr/package.py
+++ b/var/spack/repos/builtin/packages/miniamr/package.py
@@ -18,7 +18,8 @@ class Miniamr(MakefilePackage):
tags = ['proxy-app', 'ecp-proxy-app']
- version('develop', branch='master')
+ version('master', branch='master')
+ version('1.6.4', sha256='807d50608b69fb1a61924718964be96c0a2f9fa2e37fdc027bc3f0f116544732')
version('1.4.4', sha256='b83f438ff351481b4310c46ddf63b9fffc7f29f916a5717377e72919a5b788b6')
version('1.4.3', sha256='4c3fbc1662ae3e139669fb3844134486a7488a0b6e085c3b24bebcc8d12d3ac6')
version('1.4.2', sha256='d2347e0e22a8e79aa0dc3316b67dd7c40dded39d82f6e068e6fb8c9f0766566b')
@@ -48,6 +49,9 @@ class Miniamr(MakefilePackage):
mkdir(prefix.bin)
mkdir(prefix.docs)
- install('ref/ma.x', prefix.bin)
+ if spec.satisfies('@1.6.4:'):
+ install('ref/miniAMR.x', prefix.bin)
+ else:
+ install('ref/ma.x', prefix.bin)
# Install Support Documents
install('ref/README', prefix.docs)
--
cgit v1.2.3-70-g09d2