diff --git a/.gitmodules b/.gitmodules index e0b64dbc3..a30b6f91a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,10 +4,6 @@ [submodule "src/tpl/umpire/camp"] path = src/tpl/umpire/camp url = https://github.com/LLNL/camp.git -[submodule ".radiuss-ci"] - path = .radiuss-ci - url = https://github.com/LLNL/radiuss-ci - branch = feature/umpire-ci [submodule "scripts/radiuss-spack-configs"] path = scripts/radiuss-spack-configs url = https://github.com/LLNL/radiuss-spack-configs diff --git a/.radiuss-ci b/.radiuss-ci deleted file mode 160000 index f4e490e57..000000000 --- a/.radiuss-ci +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f4e490e571af8341c1305362f0894856c4ff9ad4 diff --git a/.spack_env/darwin/spack.yaml b/.spack_env/darwin/spack.yaml deleted file mode 100644 index 3a9fae912..000000000 --- a/.spack_env/darwin/spack.yaml +++ /dev/null @@ -1,54 +0,0 @@ -# -# It describes a set of packages to be installed, along with -# configuration settings. -spack: - include: - - ../../scripts/radiuss-spack-configs/darwin/compilers.yaml - - ../../scripts/radiuss-spack-configs/darwin/packages.yaml - repos: [../../.spack_packages/] - specs: [umpire@develop] - view: false - packages: - camp: - version: [master] - target: [] - compiler: [] - buildable: true - providers: {} - blt: - version: [develop] - target: [] - compiler: [] - buildable: true - providers: {} - develop: - umpire: - path: ../../ - spec: umpire@develop - compilers: - - compiler: - spec: apple-clang@12.0.0 - paths: - cc: /usr/bin/clang - cxx: /usr/bin/clang++ - f77: /usr/local/bin/gfortran - fc: /usr/local/bin/gfortran - flags: {} - operating_system: catalina - target: x86_64 - modules: [] - environment: {unset: []} - extra_rpaths: [] - - compiler: - spec: gcc@10.2.0 - paths: - cc: /usr/local/bin/gcc-10 - cxx: /usr/local/bin/g++-10 - f77: /usr/local/bin/gfortran-10 - fc: /usr/local/bin/gfortran-10 - flags: {} - operating_system: catalina - target: x86_64 - modules: [] - environment: {} - extra_rpaths: [] diff --git a/.spack_env/llnl/spack.yaml b/.spack_env/llnl/spack.yaml deleted file mode 100644 index f78f41e64..000000000 --- a/.spack_env/llnl/spack.yaml +++ /dev/null @@ -1,27 +0,0 @@ -# -# It describes a set of packages to be installed, along with -# configuration settings. -spack: - include: - - ../../scripts/radiuss-spack-configs/$SYS_TYPE/compilers.yaml - - ../../scripts/radiuss-spack-configs/$SYS_TYPE/packages.yaml - repos: [../../.spack_packages/] - specs: [umpire@develop+cuda cuda_arch=70] - view: false - packages: - camp: - version: [0.1.0] - target: [] - compiler: [] - buildable: true - providers: {} - blt: - version: [develop] - target: [] - compiler: [] - buildable: true - providers: {} - develop: - umpire: - path: ../../ - spec: umpire@develop diff --git a/.spack_packages/packages/umpire/camp_target_umpire_3.0.0.patch b/.spack_packages/packages/umpire/camp_target_umpire_3.0.0.patch deleted file mode 100644 index 2deb565cd..000000000 --- a/.spack_packages/packages/umpire/camp_target_umpire_3.0.0.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/umpire-config.cmake.in b/umpire-config.cmake.in -index a98ad5fe..4e54e173 100644 ---- a/umpire-config.cmake.in -+++ b/umpire-config.cmake.in -@@ -7,6 +7,13 @@ - get_filename_component(UMPIRE_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) - set(UMPIRE_INCLUDE_DIRS "@CMAKE_INSTALL_PREFIX@/include") - -+if (NOT TARGET camp) -+ if (NOT DEFINED camp_DIR) -+ set(camp_DIR @CMAKE_INSTALL_PREFIX@/lib/cmake/camp) -+ endif () -+ find_package(camp REQUIRED) -+endif () -+ - set(Umpire_VERSION_MAJOR @Umpire_VERSION_MAJOR@) - set(Umpire_VERSION_MINOR @Umpire_VERSION_MINOR@) - set(Umpire_VERSION_PATCH @Umpire_VERSION_PATCH@) diff --git a/.spack_packages/packages/umpire/cmake_version_check.patch b/.spack_packages/packages/umpire/cmake_version_check.patch deleted file mode 100644 index 05f80e0b6..000000000 --- a/.spack_packages/packages/umpire/cmake_version_check.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/umpire/CMakeLists.txt b/src/umpire/CMakeLists.txt -index 18518f13..c2e45e03 100644 ---- a/src/umpire/CMakeLists.txt -+++ b/src/umpire/CMakeLists.txt -@@ -105,7 +105,7 @@ blt_add_library( - DEPENDS_ON ${umpire_depends} - DEFINES ${umpire_defines}) - --if (NOT WIN32 AND CMAKE_VERSION VERSION_GREATER 3.17) -+if (NOT WIN32 AND NOT ${CMAKE_VERSION} VERSION_LESS 3.18) - target_link_options( - umpire INTERFACE - $>:-rdynamic>> diff --git a/.spack_packages/packages/umpire/package.py b/.spack_packages/packages/umpire/package.py deleted file mode 100644 index 8490275ca..000000000 --- a/.spack_packages/packages/umpire/package.py +++ /dev/null @@ -1,215 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -import os -import socket - -import llnl.util.tty as tty - - -class Umpire(CachedCMakePackage, CudaPackage, ROCmPackage): - """An application-focused API for memory management on NUMA & GPU - architectures""" - - homepage = 'https://github.com/LLNL/Umpire' - git = 'https://github.com/LLNL/Umpire.git' - - maintainers = ['davidbeckingsale'] - - version('develop', branch='develop', submodules=True) - version('main', branch='main', submodules=True) - version('6.0.0', tag='v6.0.0', submodules=True) - version('5.0.1', tag='v5.0.1', submodules=True) - version('5.0.0', tag='v5.0.0', submodules=True) - version('4.1.2', tag='v4.1.2', submodules=True) - version('4.1.1', tag='v4.1.1', submodules=True) - version('4.1.0', tag='v4.1.0', submodules=True) - version('4.0.1', tag='v4.0.1', submodules=True) - version('4.0.0', tag='v4.0.0', submodules=True) - version('3.0.0', tag='v3.0.0', submodules=True) - version('2.1.0', tag='v2.1.0', submodules=True) - version('2.0.0', tag='v2.0.0', submodules=True) - version('1.1.0', tag='v1.1.0', submodules=True) - version('1.0.1', tag='v1.0.1', submodules=True) - version('1.0.0', tag='v1.0.0', submodules=True) - version('0.3.5', tag='v0.3.5', submodules=True) - version('0.3.4', tag='v0.3.4', submodules=True) - version('0.3.3', tag='v0.3.3', submodules=True) - version('0.3.2', tag='v0.3.2', submodules=True) - version('0.3.1', tag='v0.3.1', submodules=True) - version('0.3.0', tag='v0.3.0', submodules=True) - version('0.2.4', tag='v0.2.4', submodules=True) - version('0.2.3', tag='v0.2.3', submodules=True) - version('0.2.2', tag='v0.2.2', submodules=True) - version('0.2.1', tag='v0.2.1', submodules=True) - version('0.2.0', tag='v0.2.0', submodules=True) - version('0.1.4', tag='v0.1.4', submodules=True) - version('0.1.3', tag='v0.1.3', submodules=True) - - patch('camp_target_umpire_3.0.0.patch', when='@3.0.0') - patch('cmake_version_check.patch', when='@4.1.0:main') - - variant('fortran', default=False, description='Build C/Fortran API') - variant('c', default=True, description='Build C API') - variant('numa', default=False, description='Enable NUMA support') - variant('shared', default=False, description='Enable Shared libs') - variant('openmp', default=False, description='Build with OpenMP support') - variant('deviceconst', default=False, - description='Enables support for constant device memory') - variant('examples', default=True, description='Build Umpire Examples') - variant('tests', default='none', values=('none', 'basic', 'benchmarks'), - multi=False, description='Tests to run') - - depends_on('cmake@3.8:', type='build') - depends_on('cmake@3.9:', when='+cuda', type='build') - - depends_on('blt@0.4.1:', type='build', when='@6.0.0:') - depends_on('blt@0.4.0:', type='build', when='@4.1.3:5.0.1') - depends_on('blt@0.3.6:', type='build', when='@:4.1.2') - - depends_on('camp', when='@5.0.0:') - depends_on('camp@0.2.2', when='@6.0.0:') - depends_on('camp@0.1.0', when='@5.0.0:5.0.1') - - with when('@5.0.0:'): - with when('+cuda'): - depends_on('camp+cuda') - for sm_ in CudaPackage.cuda_arch_values: - depends_on('camp+cuda cuda_arch={0}'.format(sm_), - when='cuda_arch={0}'.format(sm_)) - - with when('+rocm'): - depends_on('camp+rocm') - for arch_ in ROCmPackage.amdgpu_targets: - depends_on('camp+rocm amdgpu_target={0}'.format(arch_), - when='amdgpu_target={0}'.format(arch_)) - - conflicts('+numa', when='@:0.3.2') - conflicts('~c', when='+fortran', msg='Fortran API requires C API') - - # device allocator exports device code, which requires static libs - # currently only available for cuda. - conflicts('+shared', when='+cuda') - - - def _get_sys_type(self, spec): - sys_type = spec.architecture - if "SYS_TYPE" in env: - sys_type = env["SYS_TYPE"] - return sys_type - - @property - def cache_name(self): - hostname = socket.gethostname() - if "SYS_TYPE" in env: - hostname = hostname.rstrip('1234567890') - return "{0}-{1}-{2}@{3}.cmake".format( - hostname, - self._get_sys_type(self.spec), - self.spec.compiler.name, - self.spec.compiler.version - ) - - def initconfig_compiler_entries(self): - spec = self.spec - entries = super(Umpire, self).initconfig_compiler_entries() - - if '+fortran' in spec and self.compiler.fc is not None: - entries.append(cmake_cache_option("ENABLE_FORTRAN", True)) - else: - entries.append(cmake_cache_option("ENABLE_FORTRAN", False)) - - entries.append(cmake_cache_option("ENABLE_C", '+c' in spec)) - - return entries - - def initconfig_hardware_entries(self): - spec = self.spec - entries = super(Umpire, self).initconfig_hardware_entries() - - if '+cuda' in spec: - entries.append(cmake_cache_option("ENABLE_CUDA", True)) - - if not spec.satisfies('cuda_arch=none'): - cuda_arch = spec.variants['cuda_arch'].value - entries.append(cmake_cache_string("CUDA_ARCH", 'sm_{0}'.format(cuda_arch[0]))) - entries.append(cmake_cache_string("CMAKE_CUDA_ARCHITECTURES={0}".format(cuda_arch[0]))) - flag = '-arch sm_{0}'.format(cuda_arch[0]) - entries.append(cmake_cache_string("CMAKE_CUDA_FLAGS", '{0}'.format(flag))) - - entries.append(cmake_cache_option("ENABLE_DEVICE_CONST", spec.satisfies('+deviceconst'))) - else: - entries.append(cmake_cache_option("ENABLE_CUDA", False)) - - if '+rocm' in spec: - entries.append(cmake_cache_option("ENABLE_HIP", True)) - entries.append(cmake_cache_path("HIP_ROOT_DIR", '{0}'.format(spec['hip'].prefix))) - archs = self.spec.variants['amdgpu_target'].value - if archs != 'none': - arch_str = ",".join(archs) - entries.append(cmake_cache_string("HIP_HIPCC_FLAGS", '--amdgpu-target={0}'.format(arch_str))) - else: - entries.append(cmake_cache_option("ENABLE_HIP", False)) - - return entries - - def initconfig_package_entries(self): - spec = self.spec - entries = [] - - # TPL locations - entries.append("#------------------{0}".format("-" * 60)) - entries.append("# TPLs") - entries.append("#------------------{0}\n".format("-" * 60)) - - entries.append(cmake_cache_path("BLT_SOURCE_DIR", spec['blt'].prefix)) - if spec.satisfies('@5.0.0:'): - entries.append(cmake_cache_path("camp_DIR" ,spec['camp'].prefix)) - entries.append(cmake_cache_option("ENABLE_NUMA", '+numa' in spec)) - entries.append(cmake_cache_option("ENABLE_OPENMP", '+openmp' in spec)) - entries.append(cmake_cache_option("ENABLE_BENCHMARKS", 'tests=benchmarks' in spec)) - entries.append(cmake_cache_option("ENABLE_EXAMPLES", '+examples' in spec)) - entries.append(cmake_cache_option("BUILD_SHARED_LIBS", '+shared' in spec)) - entries.append(cmake_cache_option("ENABLE_TESTS", not 'tests=none' in spec)) - - return entries - - def cmake_args(self): - spec = self.spec - - options = [] - - return options - - def test(self): - """Perform stand-alone checks on the installed package.""" - if self.spec.satisfies('@:1') or \ - not os.path.isdir(self.prefix.bin): - tty.info('Skipping: checks not installed in bin for v{0}'. - format(self.version)) - return - - # Run a subset of examples PROVIDED installed - # tutorials with readily checkable outputs. - checks = { - 'malloc': ['99 should be 99'], - 'recipe_dynamic_pool_heuristic': ['in the pool', 'releas'], - 'recipe_no_introspection': ['has allocated', 'used'], - 'strategy_example': ['Available allocators', 'HOST'], - 'tut_copy': ['Copied source data'], - 'tut_introspection': - ['Allocator used is HOST', 'size of the allocation'], - 'tut_memset': ['Set data from HOST'], - 'tut_move': ['Moved source data', 'HOST'], - 'tut_reallocate': ['Reallocated data'], - 'vector_allocator': [''], - } - - for exe in checks: - expected = checks[exe] - reason = 'test: checking output from {0}'.format(exe) - self.run_test(exe, [], expected, 0, installed=False, - purpose=reason, skip_missing=True, - work_dir=self.prefix.bin) diff --git a/.spack_packages/repo.yaml b/.spack_packages/repo.yaml deleted file mode 100644 index 76d86e93d..000000000 --- a/.spack_packages/repo.yaml +++ /dev/null @@ -1,2 +0,0 @@ -repo: - namespace: 'packages'