From ff13f3953e700c92117314d46bc1a338f817bb6d Mon Sep 17 00:00:00 2001 From: Abhinav Bhatele Date: Tue, 11 Sep 2018 14:10:49 -0700 Subject: ecp-proxy-apps: update dependencies for release 1.0 and 1.1 (#9217) --- var/spack/repos/builtin/packages/comd/package.py | 2 +- .../builtin/packages/ecp-proxy-apps/package.py | 30 +++++++++++++--------- 2 files changed, 19 insertions(+), 13 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/comd/package.py b/var/spack/repos/builtin/packages/comd/package.py index baa9c89d59..8cdad9087b 100644 --- a/var/spack/repos/builtin/packages/comd/package.py +++ b/var/spack/repos/builtin/packages/comd/package.py @@ -35,7 +35,7 @@ class Comd(MakefilePackage): versions of CoMD will be released to incorporate the lessons learned from the co-design process.""" - tags = ['proxy-app', 'ecp-proxy-app'] + tags = ['proxy-app'] homepage = "http://www.exmatex.org/comd.html" url = "https://github.com/ECP-copa/CoMD/archive/v1.1.tar.gz" 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 4dd71335a8..6dc23ed2c3 100644 --- a/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py +++ b/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py @@ -40,20 +40,26 @@ class EcpProxyApps(Package): tags = ['proxy-app', 'ecp-proxy-app'] - version('1.0', '5a26b184f506afeb7d221f15c0e8f153') + version('1.1', '15825c318acd3726fd8e72803b1c1090') + version('1.0', '8b3f00f05e6cde88d8d913da4293ee62') - depends_on('amg@1.0', when='@1.0') - depends_on('candle-benchmarks@1.0', when='@1.0') + # Added with release 1.1 + depends_on('examinimd@1.0', when='@1.1:') + + depends_on('amg@1.0', when='@1.0:') + depends_on('candle-benchmarks@1.0', when='@1.0:') + depends_on('laghos@1.0', when='@1.0:') + depends_on('macsio@1.0', when='@1.0:') + depends_on('miniamr@1.4.0', when='@1.0:') + depends_on('minife@2.1.0', when='@1.0:') + depends_on('minitri@1.0', when='@1.0:') + depends_on('nekbone@17.0', when='@1.0:') + depends_on('sw4lite@1.0', when='@1.0:') + depends_on('swfft@1.0', when='@1.0:') + depends_on('xsbench@14', when='@1.0:') + + # Removed after release 1.0 depends_on('comd@1.1', when='@1.0') - depends_on('laghos@1.0', when='@1.0') - depends_on('macsio@1.0', when='@1.0') - depends_on('miniamr@1.4.0', when='@1.0') - depends_on('minife@2.1.0', when='@1.0') - depends_on('minitri@1.0', when='@1.0') - depends_on('nekbone@17.0', when='@1.0') - depends_on('sw4lite@1.0', when='@1.0') - depends_on('swfft@1.0', when='@1.0') - depends_on('xsbench@14', when='@1.0') # Dummy install for now, will be removed when metapackage is available def install(self, spec, prefix): -- cgit v1.2.3-70-g09d2