diff options
| author | Chris White <white238@llnl.gov> | 2021-12-21 01:40:16 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-21 10:40:16 +0100 |
| commit | 0a43dd1019b69cab7f411a2f7224e16c206ba3e2 (patch) | |
| tree | 2e2c4633695e3aaa2bad243c482546eebe991bd6 /var | |
| parent | a6d89853d433e4f355fd40a02ff409ce0669c8f0 (diff) | |
| download | spack-0a43dd1019b69cab7f411a2f7224e16c206ba3e2.tar.gz spack-0a43dd1019b69cab7f411a2f7224e16c206ba3e2.tar.bz2 spack-0a43dd1019b69cab7f411a2f7224e16c206ba3e2.tar.xz spack-0a43dd1019b69cab7f411a2f7224e16c206ba3e2.zip | |
axom: add v0.6.1, fixed e4s builds (#28067)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/axom/package.py | 20 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/axom/scr_examples_gtest.patch | 50 |
2 files changed, 64 insertions, 6 deletions
diff --git a/var/spack/repos/builtin/packages/axom/package.py b/var/spack/repos/builtin/packages/axom/package.py index 8f7e59ec2c..d644ac134a 100644 --- a/var/spack/repos/builtin/packages/axom/package.py +++ b/var/spack/repos/builtin/packages/axom/package.py @@ -40,6 +40,8 @@ class Axom(CachedCMakePackage, CudaPackage): version('main', branch='main', submodules=True) version('develop', branch='develop', submodules=True) + version('0.6.1', tag='v0.6.1', submodules=True) + version('0.6.0', tag='v0.6.0', submodules=True) version('0.5.0', tag='v0.5.0', submodules=True) version('0.4.0', tag='v0.4.0', submodules=True) version('0.3.3', tag='v0.3.3', submodules=True) @@ -48,6 +50,8 @@ class Axom(CachedCMakePackage, CudaPackage): version('0.3.0', tag='v0.3.0', submodules=True) version('0.2.9', tag='v0.2.9', submodules=True) + patch('scr_examples_gtest.patch', when='@0.6.0:0.6.1') + root_cmakelists_dir = 'src' # ----------------------------------------------------------------------- @@ -100,18 +104,22 @@ class Axom(CachedCMakePackage, CudaPackage): depends_on("lua", when="+lua") depends_on("scr", when="+scr") - depends_on("kvtree@master", when="+scr") + depends_on("kvtree@main", when="+scr") depends_on("dtcmp", when="+scr") - depends_on("raja~openmp", when="+raja~openmp") - depends_on("raja+openmp", when="+raja+openmp") - depends_on("raja+cuda", when="+raja+cuda") - with when('+umpire'): - depends_on('umpire@5.0.1:5') + depends_on('umpire@6.0.0:', when='@0.6.0:') + depends_on('umpire@5:5.0.1', when='@:0.5.0') depends_on('umpire +openmp', when='+openmp') depends_on('umpire +cuda', when='+cuda') + with when('+raja'): + depends_on('raja@0.14.0:', when='@0.6.0:') + depends_on('raja@:0.13.0', when='@:0.5.0') + depends_on("raja~openmp", when="~openmp") + depends_on("raja+openmp", when="+openmp") + depends_on("raja+cuda", when="+cuda") + for sm_ in CudaPackage.cuda_arch_values: depends_on('raja cuda_arch={0}'.format(sm_), when='+raja cuda_arch={0}'.format(sm_)) diff --git a/var/spack/repos/builtin/packages/axom/scr_examples_gtest.patch b/var/spack/repos/builtin/packages/axom/scr_examples_gtest.patch new file mode 100644 index 0000000000..7fb7539e1d --- /dev/null +++ b/var/spack/repos/builtin/packages/axom/scr_examples_gtest.patch @@ -0,0 +1,50 @@ +diff --git a/src/axom/sidre/examples/spio/CMakeLists.txt b/src/axom/sidre/examples/spio/CMakeLists.txt +index b4013c7fd..8558b8e4a 100644 +--- a/src/axom/sidre/examples/spio/CMakeLists.txt ++++ b/src/axom/sidre/examples/spio/CMakeLists.txt +@@ -21,7 +21,7 @@ if (SCR_FOUND) + list(APPEND example_sources IO_SCR_Output.cpp) + endif() + +-set(spio_example_depends axom gtest ${EXTRA_LIBS}) ++set(spio_example_depends axom ${EXTRA_LIBS}) + blt_list_append(TO spio_example_depends ELEMENTS hdf5 IF HDF5_FOUND) + blt_list_append(TO spio_example_depends ELEMENTS scr IF SCR_FOUND) + +@@ -39,17 +39,23 @@ foreach(src ${example_sources}) + ) + endforeach() + +- if(AXOM_ENABLE_TESTS) +- if(SCR_FOUND) +- if(ENABLE_MPI) +- axom_add_test( +- NAME spio_IO_SCR_Checkpoint +- COMMAND spio_IO_SCR_Checkpoint_ex +- NUM_MPI_TASKS 4 ) +- else() +- axom_add_test( +- NAME spio_IO_SCR_Checkpoint +- COMMAND spio_IO_SCR_Checkpoint_ex ) +- endif() +- endif() ++if(SCR_FOUND AND AXOM_ENABLE_TESTS) ++ blt_add_executable( ++ NAME spio_scr_ex ++ SOURCES spio_scr.cpp ++ OUTPUT_DIR ${EXAMPLE_OUTPUT_DIRECTORY} ++ DEPENDS_ON ${spio_example_depends} scr gtest ++ FOLDER axom/sidre/examples ++ ) ++ ++ if(ENABLE_MPI) ++ axom_add_test( ++ NAME spio_IO_SCR_Checkpoint ++ COMMAND spio_IO_SCR_Checkpoint_ex ++ NUM_MPI_TASKS 4 ) ++ else() ++ axom_add_test( ++ NAME spio_IO_SCR_Checkpoint ++ COMMAND spio_IO_SCR_Checkpoint_ex ) + endif() ++endif() |