hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

portage, tangram, wonton: update dependencies (#26886)

Browse source 
* tangram/wonton spack

* portage spack update

* wonton spack updated

* tangram spack updated

* white space removed

* Update package.py

* Update package.py

* Update package.py

* Update package.py

portage spack upstream

* Update package.py

for loop test

* Update package.py

style errors

* Update package.py

* tangram

* Update package.py

* Update package.py

* Update package.py

* Update package.py

* Update package.py

edits

* Update package.py

* Update package.py

remove @master

* Update package.py

remove @master

* Update var/spack/repos/builtin/packages/portage/package.py

Co-authored-by: Seth R. Johnson <johnsonsr@ornl.gov>

* Update var/spack/repos/builtin/packages/wonton/package.py

Co-authored-by: Seth R. Johnson <johnsonsr@ornl.gov>

* Update package.py

* Update package.py

* Update package.py

* Update package.py

Co-authored-by: Tracy Nicole Pantleo <tpantleo@varan.lanl.gov>
Co-authored-by: Tracy Nicole Pantleo - 361537 <tpantleo@darwin-fe1.lanl.gov>
Co-authored-by: Seth R. Johnson <johnsonsr@ornl.gov>
This commit is contained in:
Tracy-Pantleo 2021-11-19 20:09:56 -07:00 committed by GitHub
parent e47fa05eb8
commit 49b0952371
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 39 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
var/spack/repos/builtin/packages/portage/package.py
View file

@ -25,7 +25,6 @@ class Portage(CMakePackage):
variant('mpi', default=True, description='Support MPI')
variant('tangram', default=False, description='Use Tangram interface reconstruction package')
variant('jali', default=False, description='Include support for Jali mesh framework')
variant('flecsisp', default=False, description='Include support for FleCSI mesh framework')
variant('thrust', default=False, description='Enable on-node parallelism using NVidia Thrust library')
variant('kokkos', default=False, description='Enable on-node or device parallelism with Kokkos')
variant('openmp', default=False, description="Enable on-node parallelism using OpenMP")
@ -34,23 +33,23 @@ class Portage(CMakePackage):
depends_on("cmake@3.13:", type='build')
depends_on('mpi', when='+mpi')
depends_on('kokkos', when='+kokkos')
depends_on('thrust', when='+thrust')
depends_on('jali', when='+jali')
depends_on('tangram', when='+tangram')
depends_on('tangram+mpi', when='+tangram+mpi')
depends_on('tangram+jali', when='+tangram+jali')
depends_on('tangram+flecsisp', when='+tangram+flecsisp')
depends_on('tangram+thrust', when='+tangram+thrust')
depends_on('tangram+kokkos', when='+tangram+kokkos')
depends_on('tangram+cuda', when='+tangram+cuda')
for _variant in ['mpi', 'jali', 'openmp', 'thrust', 'kokkos', 'cuda']:
depends_on('tangram+' + _variant, when='+tangram+' + _variant)
depends_on('tangram~' + _variant, when='+tangram~' + _variant)
depends_on('wonton')
depends_on('wonton+mpi', when='+mpi')
depends_on('wonton+jali', when='+jali')
depends_on('wonton+flecsisp', when='+flecsisp')
depends_on('wonton+thrust', when='+thrust')
depends_on('wonton+kokkos', when='+kokkos')
depends_on('wonton+openmp', when='+openmp')
depends_on('wonton+cuda', when='+cuda')
# Wonton depends array
wonton_variant = ['mpi', 'jali', 'openmp', 'thrust', 'kokkos', 'cuda']
for _variant in wonton_variant:
depends_on('wonton+' + _variant, when='+' + _variant)
depends_on('wonton~' + _variant, when='~' + _variant)
# Jali needs MPI
conflicts('+jali ~mpi')
@ -84,7 +83,7 @@ def cmake_args(self):
else:
options.append('-DPORTAGE_ENABLE_Jali=OFF')
if '+flecsi' in self.spec:
if '+flecsisp' in self.spec:
options.append('-DPORTAGE_ENABLE_FleCSI=ON')
else:
options.append('-DPORTAGE_ENABLE_FleCSI=OFF')
@ -103,3 +102,8 @@ def cmake_args(self):
options.append('-DENABLE_APP_TESTS=OFF')
return options
def check(self):
if self.run_tests:
with working_dir(self.build_directory):
make("test")

20
var/spack/repos/builtin/packages/tangram/package.py
View file

@ -22,7 +22,7 @@ class Tangram(CMakePackage):
version('1.0.1', sha256='8f2f8c01bb2d726b0f64e5a5bc3aa2bd8057ccaee7a29c68f1439d16e39aaa90')
version('master', branch='master', submodules=True)
variant('mpi', default=True,
variant('mpi', default=False,
description='Enable interface reconstruction with MPI')
variant('thrust', default=False,
description='Enable on-node parallelism with NVidia Thrust')
@ -46,15 +46,12 @@ class Tangram(CMakePackage):
depends_on('cmake@3.13:', type='build')
depends_on('mpi', when='+mpi')
# Wonton depends array
wonton_depends = ['mpi', 'jali', 'openmp', 'thrust', 'kokkos', 'cuda']
depends_on('wonton')
depends_on('wonton+jali', when='+jali')
depends_on('wonton~mpi', when='~mpi')
depends_on('wonton+mpi', when='+mpi')
depends_on('wonton+thrust', when='+thrust')
depends_on('wonton+kokkos', when='+kokkos')
depends_on('wonton+cuda', when='+cuda')
depends_on('wonton+openmp', when='+openmp')
for _variant in wonton_depends:
depends_on('wonton+' + _variant, when='+' + _variant)
depends_on('wonton~' + _variant, when='~' + _variant)
def cmake_args(self):
options = []
@ -87,3 +84,8 @@ def cmake_args(self):
options.append('-DENABLE_APP_TESTS=OFF')
return options
def check(self):
if self.run_tests:
with working_dir(self.build_directory):
make("test")

14
var/spack/repos/builtin/packages/wonton/package.py
View file

@ -33,7 +33,7 @@ class Wonton(CMakePackage):
variant('kokkos', default=False, description='Enable on-node or device parallelism with Kokkos')
variant('openmp', default=False, description="Enable on-node parallelism using OpenMP")
variant('cuda', default=False, description="Enable GPU parallelism using CUDA")
variant('flecsi', default=False, description="Enable FlecSI")
# wrappers to external mesh/state libraries
variant('jali', default=False, description='Enable Jali mesh wrappers')
@ -47,6 +47,7 @@ class Wonton(CMakePackage):
depends_on('netlib-lapack +lapacke', when='+lapacke')
depends_on('mpi', when='+mpi')
depends_on('flecsi', when='+flecsi')
depends_on('jali +mstk', when='+jali')
depends_on('mpi', when='+jali')
@ -113,10 +114,8 @@ def cmake_args(self):
else:
options.append('-DWONTON_ENABLE_Jali=OFF')
if '+flecsi' in self.spec:
options.append('-DWONTON_ENABLE_FleCSI=ON')
else:
options.append('-DWONTON_ENABLE_FleCSI=OFF')
# BROKEN DEPENDENCY!!!!!!
options.append(define_from_variant('WONTON_ENABLE_FleCSI', 'flecsi'))
# Unit test variant
if self.run_tests:
@ -127,3 +126,8 @@ def cmake_args(self):
options.append('-DENABLE_APP_TESTS=OFF')
return options
def check(self):
if self.run_tests:
with working_dir(self.build_directory):
make("test")