diff --git a/repos/c2sm/packages/eckit/package.py b/repos/c2sm/packages/eckit/package.py deleted file mode 100644 index d262995fb5..0000000000 --- a/repos/c2sm/packages/eckit/package.py +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2013-2020 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) - -# -from spack import * -from spack.pkg.builtin.eckit import Eckit as SpackEckit - - -class Eckit(SpackEckit): - - git = 'https://github.com/ecmwf/eckit.git' - - version("1.20.2", - sha256= - "9c11ddaaf346e40d11312b81ca7f1b510017f26618f4c0f5c5c59c37623fbac8") - version('1.20.0', branch='1.20.0') diff --git a/repos/c2sm/packages/fdb/package.py b/repos/c2sm/packages/fdb/package.py deleted file mode 100644 index 734b0c8a98..0000000000 --- a/repos/c2sm/packages/fdb/package.py +++ /dev/null @@ -1,99 +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) - -from spack.package import * - - -class Fdb(CMakePackage): - """FDB (Fields DataBase) is a domain-specific object store developed at - ECMWF for storing, indexing and retrieving GRIB data.""" - - homepage = "https://github.com/ecmwf/fdb" - url = "https://github.com/ecmwf/fdb/archive/refs/tags/5.7.8.tar.gz" - - maintainers = ["skosukhin"] - - version("5.11.17", - sha256= - "375c6893c7c60f6fdd666d2abaccb2558667bd450100817c0e1072708ad5591e") - version("5.10.8", - sha256= - "6a0db8f98e13c035098dd6ea2d7559f883664cbf9cba8143749539122ac46099") - version("5.7.8", - sha256= - "6adac23c0d1de54aafb3c663d077b85d0f804724596623b381ff15ea4a835f60") - version("master", git='https://github.com/ecmwf/fdb.git', branch='master') - version("develop", - git='https://github.com/ecmwf/fdb.git', - branch='develop') - version("inspect", - git='https://github.com/ecmwf/fdb.git', - branch='feature/c_inspect') - version("fastinspect", - git='https://github.com/ecmwf/fdb.git', - branch='feature/FDB-300_fastInspect') - - variant("tools", default=True, description="Build the command line tools") - variant( - "backends", - values=any_combination_of( - # FDB backend in indexed filesystem with table-of-contents with - # additional support for Lustre filesystem stripping control: - "lustre", - # Backends that will be added later: - # FDB backend in persistent memory (NVRAM): - # 'pmem', # (requires https://github.com/ecmwf/pmem) - # FDB backend in CEPH object store (using Rados): - # 'rados' # (requires eckit with RADOS support) - ), - description="List of supported backends", - ) - - depends_on("cmake@3.12:", type="build") - depends_on("ecbuild@3.7:", type="build") - - depends_on("eckit@1.16:") - depends_on("eckit+admin", when="+tools") - - depends_on("eccodes@2.10:") - depends_on("eccodes+tools", when="+tools") - - depends_on("metkit@1.5:+grib") - - depends_on("lustre", when="backends=lustre") - - # Starting version 1.7.0, metkit installs GribHandle.h to another directory. - # That is accounted for only starting version 5.8.0: - # patch("metkit_1.7.0.patch", when="fdb@:5.7.10+tools^metkit@1.7.0:") - - # Download test data before running a test: - patch( - "https://github.com/ecmwf/fdb/commit/86e06b60f9a2d76a389a5f49bedd566d4c2ad2b2.patch?full_index=1", - sha256= - "8b4bf3a473ec86fd4d7672faa7d74292dde443719299f2ba59a2c8501d6f0906", - when="@5.7.1:5.7.10+tools", - ) - - def cmake_args(self): - enable_build_tools = "+tools" in self.spec - - args = [ - self.define("CMAKE_INSTALL_LIBDIR", 'lib'), - self.define("ENABLE_FDB_BUILD_TOOLS", enable_build_tools), - self.define("ENABLE_BUILD_TOOLS", enable_build_tools), - # We cannot disable the FDB backend in indexed filesystem with - # table-of-contents because some default test programs and tools - # cannot be built without it: - self.define("ENABLE_TOCFDB", True), - self.define("ENABLE_LUSTRE", "backends=lustre" in self.spec), - self.define("ENABLE_PMEMFDB", False), - self.define("ENABLE_RADOSFDB", False), - # The tests download additional data (~10MB): - self.define("ENABLE_TESTS", self.run_tests), - # We do not need any experimental features: - self.define("ENABLE_EXPERIMENTAL", False), - self.define("ENABLE_SANDBOX", False), - ] - return args diff --git a/repos/c2sm/packages/metkit/package.py b/repos/c2sm/packages/metkit/package.py deleted file mode 100644 index 45bef0ac25..0000000000 --- a/repos/c2sm/packages/metkit/package.py +++ /dev/null @@ -1,9 +0,0 @@ -from spack.package import * -from spack.pkg.builtin.metkit import Metkit as SpackMetkit - - -class Metkit(SpackMetkit): - - version("1.9.2", - sha256= - "35d5f67196197cc06e5c2afc6d1354981e7c85a441df79a2fbd774e0c343b0b4") diff --git a/test/integration_test.py b/test/integration_test.py index 970113c701..1edca7a476 100644 --- a/test/integration_test.py +++ b/test/integration_test.py @@ -67,15 +67,9 @@ def test_dusk(self): def test_eccodes(self): spack_info('eccodes') - def test_eckit(self): - spack_info('eckit') - def test_fckit(self): spack_info('fckit') - def test_fdb(self): - spack_info('fdb') - def test_fdb_fortran(self): spack_info('fdb-fortran') @@ -358,9 +352,6 @@ def test_libgrib1(self): def test_libxml2(self): spack_spec('libxml2') - def test_metkit(self): - spack_spec('metkit') - def test_nvidia_blas(self): spack_spec('nvidia-blas') diff --git a/test/system_test.py b/test/system_test.py index 1842ff9422..28ec2cda6e 100644 --- a/test/system_test.py +++ b/test/system_test.py @@ -286,39 +286,12 @@ def test_install_2_19_0(self): spack_install('eccodes @2.19.0') -class EckitTest(unittest.TestCase): - # All the other versions are not the responsibility of spack-c2sm - # Package tests are not run because they are flaky https://github.com/C2SM/spack-c2sm/issues/779 - - def test_install_1_20_2_gcc(self): - spack_install('eckit @1.20.2 %gcc') - - def test_install_1_20_2_nvhpc(self): - spack_install(f'eckit @1.20.2 %{nvidia_compiler}') - - def test_install_1_20_0_gcc(self): - spack_install('eckit @1.20.0 %gcc') - - def test_install_1_20_0_gcc(self): - spack_install(f'eckit @1.20.0 %{nvidia_compiler}') - - class FckitTest(unittest.TestCase): def test_install_default(self): spack_install_and_test('fckit') -class FdbTest(unittest.TestCase): - - def test_install_5_10_8_gcc(self): - spack_install_and_test('fdb @5.10.8 %gcc') - - def test_install_5_10_8_nvhpc(self): - # tests fail because compiler emitted warnings. - spack_install(f'fdb @5.10.8 %{nvidia_compiler}') - - class FdbFortranTest(unittest.TestCase): def test_install(self): @@ -513,16 +486,6 @@ def test_install_version_22_01_2020(self): spack_install_and_test('libgrib1 @22-01-2020') -class MetkitTest(unittest.TestCase): - # Package tests are not run because they fail https://github.com/C2SM/spack-c2sm/issues/784 - - def test_install_1_9_2_gcc(self): - spack_install('metkit @1.9.2 %gcc') - - def test_install_1_9_2_nvhpc(self): - spack_install(f'metkit @1.9.2 %{nvidia_compiler}') - - @pytest.mark.no_balfrin # Package is a workaround, only needed on Daint. @pytest.mark.no_tsa # Package is a workaround, only needed on Daint. class NvidiaBlasTest(unittest.TestCase):