Merge branch 'release/2.0.0'

Author: Ozaq

CMakeLists.txt

@@ -113,17 +113,6 @@ ecbuild_add_option( FEATURE RADOS
                     DESCRIPTION "Ceph/Rados storage support"
                     REQUIRED_PACKAGES Rados )
 
-### Armadillo
-
-ecbuild_add_option( FEATURE ARMADILLO
-                    CONDITION HAVE_EXPERIMENTAL
-                    DESCRIPTION "Armadillo linear algebra library"
-                    REQUIRED_PACKAGES Armadillo )
-
-set_package_properties( Armadillo PROPERTIES
-                        DESCRIPTION "C++ linear algebra"
-                      )
-
 ### MKL
 
 ecbuild_add_option( FEATURE MKL
@@ -146,7 +135,7 @@ ecbuild_add_option( FEATURE LZ4
 
 ecbuild_add_option( FEATURE AEC
                     DESCRIPTION "AEC support for compression"
-                    REQUIRED_PACKAGES "NAME libaec VERSION 1.0.6")
+                    REQUIRED_PACKAGES "NAME libaec VERSION 1.1.4")
 
 ecbuild_add_option( FEATURE ZIP
                     DESCRIPTION "ZIP support for compression"
@@ -263,13 +252,6 @@ if(HAVE_CURL)
   ecbuild_info("Curl version ${CURL_VERSION_STRING} -- libs [${CURL_LIBRARIES}] incs [${CURL_INCLUDE_DIRS}]")
 endif()
 
-#### Jemalloc
-
-ecbuild_add_option( FEATURE JEMALLOC
-                    DEFAULT OFF
-                    DESCRIPTION "Link against jemalloc memory allocator"
-                    REQUIRED_PACKAGES Jemalloc )
-
 #### CUDA
 
 ecbuild_add_option( FEATURE CUDA
@@ -284,29 +266,6 @@ ecbuild_add_option( FEATURE HIP
                     DESCRIPTION "HIP GPU linear algebra operations"
                     REQUIRED_PACKAGES hip hipsparse )
 
-### ViennaCL
-
-ecbuild_add_option( FEATURE VIENNACL
-                    CONDITION HAVE_EXPERIMENTAL
-                    DESCRIPTION "ViennaCL OpenCL linear algebra operations"
-                    REQUIRED_PACKAGES ViennaCL )
-
-set_package_properties( ViennaCL PROPERTIES
-                        DESCRIPTION "linear algebra library for computations on many-core architectures"
-                        TYPE RECOMMENDED
-                        PURPOSE "Dense and sparse matrix operations on OpenCL devices" )
-
-### LibRsync
-
-ecbuild_add_option( FEATURE RSYNC
-                    DEFAULT OFF
-                    DESCRIPTION "librsync implementation of the rsync algorithm"
-                    REQUIRED_PACKAGES LibRsync )
-if( HAVE_RSYNC )
-  set( LIBRSYNC_LIBRARIES rsync )
-endif()
-
-
 ### Performance tests
 
 ecbuild_add_option( FEATURE EXTRA_TESTS

README.md

@@ -1,26 +1,37 @@
-eckit
-=====
+# EcKit
+
+<div align="center">
 
 [![Latest Tag](https://img.shields.io/github/v/tag/ecmwf/eckit?label=latest&style=flat-square&logo=github)](https://github.com/ecmwf/eckit/tags)
 [![CI](https://img.shields.io/github/actions/workflow/status/ecmwf/eckit/ci.yml?branch=master&label=ci%20(master)&style=flat-square&logo=github)](https://github.com/ecmwf/eckit/actions/workflows/ci.yml)
 [![CI](https://img.shields.io/github/actions/workflow/status/ecmwf/eckit/ci.yml?branch=develop&label=ci%20(develop)&style=flat-square&logo=github)](https://github.com/ecmwf/eckit/actions/workflows/ci.yml)
+
 [![codecov](https://codecov.io/gh/ecmwf/eckit/branch/develop/graph/badge.svg)](https://codecov.io/gh/ecmwf/eckit)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/ecmwf/eckit/blob/develop/LICENSE)
+[![Project Maturity](https://github.com/ecmwf/codex/raw/refs/heads/main/Project%20Maturity/graduated_badge.svg)](https://github.com/ecmwf/codex/raw/refs/heads/main/Project%20Maturity#graduated)
 
-Project home: https://software.ecmwf.int/wiki/display/ECKIT
+</div>
 
+> [!IMPORTANT]
+> This software is **Graduated** and subject to ECMWF's guidelines on
+> [Software Maturity](https://github.com/ecmwf/codex/raw/refs/heads/main/Project%20Maturity).
 
-ecKit is a cross-platform C++ toolkit that supports development of tools and
+## Overview
+
+EcKit is a cross-platform C++ toolkit that supports development of tools and
 applications at ECMWF. It is based on code developed over the last 20 years
 within the MARS software and was re-factored out to be reused by other
-applications. It provides a an abstraction layer on top of the operating
-system, so it is easier to port code to new architectures. It is developed
-taking into account the robustness requirements of running production systems
-at ECMWF. The main focus is UNIX/POSIX systems, and it has been thoroughly
-tested on AIX, Linux and Mac OSX. Historically, the code base pre-dates and in
-some way can be seen as a leaner substitute for some 'Boost' libraries.
+applications. It provides an abstraction layer on top of the operating system,
+so it is easier to port code to new architectures. It is developed taking into
+account the robustness requirements of running production systems at ECMWF. The
+main focus is UNIX/POSIX systems, and it has been thoroughly tested on Linux
+and Mac OSX. Historically, the code base pre-dates and in some way can be seen
+as a leaner substitute for some 'Boost' libraries.
+
+## Features
 
 It features facilities to easily handle, in a cross-platform way:
+
 * multi-threading
 * json and yaml parsing
 * object serialization and persistence
@@ -35,35 +46,14 @@ It features facilities to easily handle, in a cross-platform way:
 * asynchronous processing
 * exception handling and stack dumping
 * MPI object-oriented wrapper
-* linear algebra abstraction with multiple backends (BLAS, MKL, Armadillo, Eigen3)
+* linear algebra abstraction with multiple backends (BLAS, MKL, Eigen3)
 * advanced container classes
 * space partition trees
 * file-mapped arrays
 
+## Requirements
 
-Requirements
-------------
-
-Tested compilers include:
-
-- GCC 4.9.1, 5.3.0, 6.3.0, 7.2.0
-- Intel 15.0.2, 16.0.3, 17, 18
-- CCE 8.4.5, 8.5.8, 8.6.2
-- Apple LLVM 9.1.0 (clang-902.0.39.1)
-
-Required dependencies:
-
-- CMake --- For use and installation see http://www.cmake.org/
-- ecbuild --- ECMWF library of CMake macros
-- Perl5 --- For some code generation
-
-
-Installation
-------------
-
-Eckit employs an out-of-source build/install based on CMake.
-
-Make sure ecbuild is installed and the ecbuild executable script is found ( `which ecbuild` ).
+Make sure ecbuild is installed and the ecbuild executable script is found (`which ecbuild`).
 
 Now proceed with installation as follows:
 

VERSION

@@ -1 +1 @@
-1.33.1
+2.0.0

cmake/FindArmadillo.cmake

@@ -15,7 +15,7 @@
 #
 # The following paths will be searched with priority if set in CMake or env
 #
-#  LZ4_PATH          - prefix path of the Armadillo installation
+#  LZ4_PATH          - prefix path of the LZ4 installation
 #  LZ4_ROOT              - Set this variable to the root installation
 
 # Search with priority for LZ4_PATH if given as CMake or env var

cmake/FindLZ4.cmake

@@ -9,14 +9,14 @@
 # - Try to find Rados
 # Once done this will define
 #
-#  RADOS_FOUND         - system has Armadillo
-#  RADOS_INCLUDE_DIRS  - the Armadillo include directory
-#  RADOS_LIBRARIES     - the Armadillo library
+#  RADOS_FOUND         - system has Rados
+#  RADOS_INCLUDE_DIRS  - the Rados include directory
+#  RADOS_LIBRARIES     - the Rados library
 #  RADOS_VERSION - This is set to $major.$minor.$patch (eg. 0.9.8)
 #
 # The following paths will be searched with priority if set in CMake or env
 #
-#  RADOS_PATH          - prefix path of the Armadillo installation
+#  RADOS_PATH          - prefix path of the Rados installation
 #  RADOS_ROOT              - Set this variable to the root installation
 
 # Search with priority for RADOS_PATH if given as CMake or env var

cmake/FindLibRsync.cmake

@@ -15,7 +15,7 @@
 #
 # The following paths will be searched with priority if set in CMake or env
 #
-#  SNAPPY_PATH          - prefix path of the Armadillo installation
+#  SNAPPY_PATH          - prefix path of the Snappy installation
 #  SNAPPY_ROOT              - Set this variable to the root installation
 
 # Search with priority for SNAPPY_PATH if given as CMake or env var

cmake/FindRADOS.cmake

@@ -22,7 +22,16 @@
 binary_dir = getenv("ECKIT_BUILD_DIR", str(Path(getenv("HOME"), "build", "eckit")))
 library_dirs = getenv("ECKIT_LIB_DIR", str(Path(binary_dir, "lib"))).split(":")
 
-include_dirs_default = ":".join( str(p) for p in (Path(source_dir, "src"), Path(binary_dir, "src"), Path(source_dir, "eckit", "src"), Path(binary_dir, "eckit", "src")) if p.exists())
+include_dirs_default = ":".join(
+    str(p)
+    for p in (
+        Path(source_dir, "src"),
+        Path(binary_dir, "src"),
+        Path(source_dir, "eckit", "src"),
+        Path(binary_dir, "eckit", "src"),
+    )
+    if p.exists()
+)
 include_dirs = getenv("ECKIT_INCLUDE_DIRS", include_dirs_default).split(":")
 
 extra_compile_args = ["-std=c++17"]
@@ -41,6 +50,7 @@ def _ext(name: str, sources: list, libraries: list) -> Extension:
         extra_link_args=extra_compile_args,
     )
 
+
 kwargs_set: dict[str, Any] = {}
 try:
     from setup_utils import ext_kwargs as wheel_ext_kwargs
@@ -51,7 +61,7 @@ def _ext(name: str, sources: list, libraries: list) -> Extension:
 
 version: str
 try:
-    with open("../../VERSION", 'r') as f:
+    with open("../../VERSION", "r") as f:
         version = f.readlines()[0].strip()
 except Exception:
     warnings.warn("failed to read VERSION, falling back to 0.0.0")
@@ -60,6 +70,7 @@ def _ext(name: str, sources: list, libraries: list) -> Extension:
 install_requires = ["findlibs", "pyyaml"]
 try:
     import eckitlib
+
     install_requires.append(f"eckitlib=={eckitlib.__version__}")
 except ImportError:
     warnings.warn("failed to import eckitlib, not listing as a dependency")
@@ -87,7 +98,11 @@ def _ext(name: str, sources: list, libraries: list) -> Extension:
                 ["eckit_geo"],
             ),
         ],
-        compiler_directives={"language_level": 3, "c_string_encoding": "default"},
+        compiler_directives={
+            "language_level": 3,
+            "c_string_type": "unicode",  # accept Python str
+            "c_string_encoding": "utf8",
+        },
     ),
     **kwargs_set,
 )