From fc06c1e08fee86066bf6e75743bb75d1a670051b Mon Sep 17 00:00:00 2001 From: Keita Iwabuchi Date: Mon, 3 May 2021 10:40:45 -0700 Subject: Metall package: add v0.13 and support test (#23403) * Metall: add version 0.2 * Add Metall v0.3 * Update Metall package to v0.4 and v0.5. * Metall package: add v0.6 * Metall package: add v0.7 * Metall package: add v0.8 and v0.9 * Add Metall package v0.10 * Metall package: set run_environment METALL_ROOT * Metall package: removed blanks * Metall package: add v0.11 and v0.12 * Metall package: change required cmake version * Metall package: support build test * Metall package: add v0.13 * Metall package: change to use setup_build_environment --- var/spack/repos/builtin/packages/metall/package.py | 31 ++++++++++++++++++---- 1 file changed, 26 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/metall/package.py b/var/spack/repos/builtin/packages/metall/package.py index bb78ab8e79..2708a6bf98 100644 --- a/var/spack/repos/builtin/packages/metall/package.py +++ b/var/spack/repos/builtin/packages/metall/package.py @@ -5,7 +5,7 @@ class Metall(CMakePackage): - """An allocator for persistent memory""" + """A Persistent Memory Allocator For Data-Centric Analytics""" homepage = "https://github.com/LLNL/metall" git = "https://github.com/LLNL/metall.git" @@ -16,6 +16,7 @@ class Metall(CMakePackage): version('master', branch='master') version('develop', branch='develop') + version('0.13', sha256='959d37d0a7e7e5b4d5e6c0334aaaeef1b463e855fa8e807042f662c993ed60b1') version('0.12', sha256='b757b354b355e866bd6d42da53b0160442f3b7f663a19ba113da1ffc1a76176e') version('0.11', sha256='7cfa6a7eaaeb7fd11ecfbe43a172a36c8cde200601d6cd3b309d7a0acf752f3c') version('0.10', sha256='58b4b5507d4db5baca315b1bed2b728981755d755b91ef63bd0b6dfaf320f46b') @@ -23,11 +24,31 @@ class Metall(CMakePackage): depends_on('cmake@3.10:', type='build') depends_on('boost@1.64:', type=('build', 'link')) + # googletest is required only for test + # 'make test' is executed if '--run-tests' or '--test=root' is specified + depends_on('googletest', type=('test')) def cmake_args(self): - args = [] - args.append('-DINSTALL_HEADER_ONLY=ON') - return args - + if self.run_tests: + args = ['-DBUILD_TEST=ON', '-DSKIP_DOWNLOAD_GTEST=ON'] + return args + else: + args = ['-DINSTALL_HEADER_ONLY=ON'] + return args + + # Set environmental variables for the build step + # setup_environment() was replaced by setup_build_environment()? + # (https://github.com/spack/spack/pull/11115) + # This page has not been updated? + # https://spack-tutorial.readthedocs.io/en/latest/tutorial_advanced_packaging.html + def setup_build_environment(self, spack_env, run_env): + # Configure the directories for test + if self.run_tests: + spack_env.set( + 'METALL_TEST_DIR', + join_path(self.build_directory, 'build_test') + ) + + # 'spack load metall' sets METALL_ROOT environmental variable def setup_run_environment(self, env): env.set('METALL_ROOT', self.prefix) -- cgit v1.2.3-60-g2f50