Merge branch 'develop' into fix/aarch64-strcmp-issue

Author: danovaro

.github/workflows/build-wheel-wrapper.yml

@@ -0,0 +1,25 @@
+# (C) Copyright 2024- ECMWF.
+#
+# This software is licensed under the terms of the Apache Licence Version 2.0
+# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+# In applying this licence, ECMWF does not waive the privileges and immunities
+# granted to it by virtue of its status as an intergovernmental organisation
+# nor does it submit to any jurisdiction.
+
+
+name: Build Python Wrapper Wheel
+
+on:
+  # Trigger the workflow manually
+  workflow_dispatch: ~
+
+  # Allow to be called from another workflow
+  workflow_call: ~
+
+  # TODO automation trigger
+
+jobs:
+  python-wrapper-wheel:
+    name: Python Wrapper Wheel
+    uses: ecmwf-actions/reusable-workflows/.github/workflows/python-wrapper-wheel.yml@main
+    secrets: inherit

CMakeLists.txt

@@ -185,6 +185,16 @@ ecbuild_add_option( FEATURE ECKIT_GEO
                     DEFAULT OFF
                     DESCRIPTION "eckit::geo geometry library" )
 
+ecbuild_add_option( FEATURE GEO_GRID_FESOM
+                    DEFAULT ON
+                    CONDITION eckit_HAVE_ECKIT_GEO AND eckit_HAVE_ECKIT_CODEC AND eckit_HAVE_LZ4
+                    DESCRIPTION "eckit::geo geometry library support for FESOM grids" )
+
+ecbuild_add_option( FEATURE GEO_GRID_ICON
+                    DEFAULT ON
+                    CONDITION eckit_HAVE_ECKIT_GEO AND eckit_HAVE_ECKIT_CODEC AND eckit_HAVE_LZ4
+                    DESCRIPTION "eckit::geo geometry library support for ICON grids" )
+
 ecbuild_add_option( FEATURE GEO_GRID_ORCA
                     DEFAULT ON
                     CONDITION eckit_HAVE_ECKIT_GEO AND eckit_HAVE_ECKIT_CODEC AND eckit_HAVE_LZ4
@@ -205,7 +215,7 @@ ecbuild_add_option( FEATURE GEO_PROJECTION_PROJ_DEFAULT
                     CONDITION HAVE_ECKIT_GEO
                     DESCRIPTION "eckit::geo geometry library default to PROJ-based projections" )
 
-set( eckit_GEO_CACHE_PATH "/tmp/cache" )
+set( eckit_GEO_CACHE_PATH "~/.local/share/eckit/geo" )
 
 ### LAPACK
 
@@ -340,7 +350,7 @@ set( PERSISTENT_NAMESPACE "eckit" CACHE INTERNAL "" ) # needed for generating .b
 add_subdirectory( src )
 add_subdirectory( bamboo )
 add_subdirectory( doc )
-add_subdirectory( etc )
+add_subdirectory( share )
 add_subdirectory( tests )
 add_subdirectory( regressions )
 

README.md

@@ -35,8 +35,8 @@ It features facilities to easily handle, in a cross-platform way:
 * MPI object-oriented wrapper
 * linear algebra abstraction with multiple backends (BLAS, MKL, Armadillo, Eigen3)
 * advanced container classes
-    * space partition trees
-    * file-mapped arrays
+* space partition trees
+* file-mapped arrays
 
 
 Requirements

VERSION

@@ -1 +1 @@
-1.28.3
+1.28.5

bamboo/flags.cmake

@@ -1,2 +1,2 @@
-SET( ENABLE_MPI ON CACHE BOOL "Enable MPI" )
+SET( ENABLE_MPI OFF CACHE BOOL "Enable MPI" )
 SET( ENABLE_EXPERIMENTAL ON CACHE BOOL "Enable experimental features" )

python_wrapper/buildconfig

@@ -0,0 +1,16 @@
+# (C) Copyright 2024- ECMWF.
+#
+# This software is licensed under the terms of the Apache Licence Version 2.0
+# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+# In applying this licence, ECMWF does not waive the privileges and immunities
+# granted to it by virtue of its status as an intergovernmental organisation
+# nor does it submit to any jurisdiction.
+
+# to be source'd by wheelmaker's compile.sh *and* wheel-linux.sh
+# NOTE replace the whole thing with pyproject.toml? Less powerful, and quaint to use for sourcing ecbuild invocation
+# TODO we duplicate information -- pyproject.toml's `name` and `packages` are derivable from $NAME and must stay consistent
+
+NAME="eckit"
+CMAKE_PARAMS="-DENABLE_MPI=0  -DENABLE_ECKIT_GEO=1 -DENABLE_BUILD_TOOLS=OFF -DENABLE_AEC=0"
+PYPROJECT_DIR="python_wrapper"
+DEPENDENCIES='[]'

python_wrapper/setup.cfg

@@ -0,0 +1,5 @@
+[metadata]
+description = "eckitlib"
+long_description = file: README.md
+long_description_content_type = text/markdown
+author = file: AUTHORS

python_wrapper/setup.py

@@ -0,0 +1,2 @@
+from setup_utils import plain_setup
+plain_setup()