Merge branch 'master' into master

Author: JohanMabille

.azure-pipelines/azure-pipelines-linux.yml

@@ -0,0 +1,47 @@
+name: CI
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches: [master]
+concurrency:
+  group: ${{ github.workflow }}-${{ github.job }}-${{ github.ref }}
+  cancel-in-progress: true
+defaults:
+  run:
+    shell: bash -e -l {0}
+jobs:
+  unix:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-24.04, macos-15]
+
+    steps:
+
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Set conda environment
+      uses: mamba-org/setup-micromamba@main
+      with:
+        environment-name: myenv
+        environment-file: environment-dev.yml
+
+    - name: Configure using CMake
+      run: cmake -G Ninja -Bbuild -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DDOWNLOAD_GTEST=ON -DHAVE_ALL_DEPS=ON
+
+    - name: Generate data for zlib test
+      working-directory: build/test
+      run: python -c 'import struct, zlib; open("files/test.zl", "wb").write(zlib.compress(struct.pack("4d", 3.0, 2.0, 1.0, 0.0), level=1))'
+
+    - name: Build
+      working-directory: build
+      run: cmake --build . --target test_xtensor_io_lib --parallel 8
+
+    - name: Run tests
+      working-directory: build/test
+      run: |
+        export GTEST_FILTER="-xio_gdal_handler.read_vsigs"
+        ./test_xtensor_io_lib

.azure-pipelines/azure-pipelines-osx.yml

@@ -7,7 +7,7 @@
 # The full license is in the file LICENSE, distributed with this software. #
 ############################################################################
 
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.30)
 project(xtensor-io)
 
 set(XTENSOR_IO_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
@@ -42,7 +42,7 @@ message(STATUS "Building xtensor-io v${${PROJECT_NAME}_VERSION}")
 # Dependencies
 # ============
 
-set (xtensor_REQUIRED_VERSION 0.23.0)
+set (xtensor_REQUIRED_VERSION 0.25.0)
 if(TARGET xtensor)
     set(xtensor_VERSION ${XTENSOR_VERSION_MAJOR}.${XTENSOR_VERSION_MINOR}.${XTENSOR_VERSION_PATCH})
     if( NOT ${xtensor_VERSION} VERSION_GREATER_EQUAL ${xtensor_REQUIRED_VERSION})
@@ -121,6 +121,7 @@ endforeach()
 set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_SOURCE_DIR}/modules")
 
 add_library(xtensor-io INTERFACE)
+target_compile_features(xtensor-io INTERFACE cxx_std_17)
 
 include_directories(${GTEST_INCLUDE_DIRS})
 
@@ -197,18 +198,8 @@ endif()
 
 if(HAVE_HighFive)
   find_package(HighFive REQUIRED)
-  find_package(HDF5 REQUIRED)
-  message(STATUS "HighFive ${HighFive_VERSION} and HDF5 ${HDF5_VERSION} found, HDF5 file support enabled")
-  find_package(HDF5 REQUIRED)
-  get_target_property(HighFive_INCLUDE_DIRECTORIES_EXTRACTED HighFive INTERFACE_INCLUDE_DIRECTORIES)
-  target_include_directories(xtensor-io
-      INTERFACE
-      ${HighFive_INCLUDE_DIRECTORIES_EXTRACTED}
-  )
-  target_link_libraries(xtensor-io
-      INTERFACE
-      ${HDF5_LIBRARIES}
-  )
+  message(STATUS "HighFive ${HighFive_VERSION} found, HDF5 file support enabled")
+  target_link_libraries(xtensor-io INTERFACE HighFive::HighFive)
 else()
   message(STATUS "HighFive not enabled: use -DHAVE_HighFive=ON for HDF5 file support")
 endif()
@@ -245,15 +236,11 @@ else()
 endif()
 
 if(HAVE_storage_client)
-  find_package(storage_client REQUIRED)
-  message(STATUS "storage_client ${storage_client_VERSION} found, Google Cloud Storage IO handler support enabled")
-  target_include_directories(xtensor-io
-    INTERFACE
-      ${storage_client_INCLUDE_DIRS}
-  )
+  find_package(google_cloud_cpp_storage REQUIRED)
+  message(STATUS "google_cloud_cpp_storage ${google_cloud_cpp_storage_VERSION} found, Google Cloud Storage IO handler support enabled")
   target_link_libraries(xtensor-io
     INTERFACE
-      storage_client
+      google-cloud-cpp::storage
   )
 else()
   message(STATUS "storage_client not enabled: use -DHAVE_storage_client=ON for Google Cloud Storage IO handler support")

.azure-pipelines/unix-build.yml

@@ -27,8 +27,7 @@ Reading and writing image, sound and npz file formats to and from xtensor data s
 ```bash
 mamba install xtensor-io -c conda-forge
 ```
-
-- `xtensor-io` depends on `xtensor` `^0.24.0` and [filesystem](https://github.com/gulrak/filesystem).
+- `xtensor-io` depends on `xtensor` `^0.26.0` and [filesystem](https://github.com/gulrak/filesystem).
 
 - `OpenImageIO`, `libsndfile`, `zlib`, `HighFive`, and `blosc` are optional dependencies to `xtensor-io`
 

.github/workflows/main.yml

@@ -4,16 +4,18 @@ channels:
 dependencies:
   # Build dependencies
   - cmake
+  - ninja
   # Host dependencies
-  - openimageio=2.2.7
-  - libsndfile=1.0.30
-  - zlib=1.2.11
-  - highfive=2.1.1 
-  - blosc
-  - gdal
+  - openimageio >=3.1,<4
+  - fmt >=12.2,<13
+  - libsndfile >=1.2,<2
+  - zlib >=1.3,<2
+  - highfive >=3.3,<4
+  - blosc >=1.21,<2
+  - gdal >=3.13,<4
   - nlohmann_json
-  - google-cloud-cpp=1.21.0
-  - aws-sdk-cpp
-  - xtensor=0.24.0
-  - cpp-filesystem
+  - google-cloud-cpp >=3.0,<4
+  - aws-sdk-cpp >=1.11,<2
+  - xtensor=0.26.0
+  - cpp-filesystem >=1.5,<2
 

CMakeLists.txt

@@ -15,9 +15,9 @@
 
 #include <sndfile.hh>
 
-#include <xtensor/xarray.hpp>
-#include <xtensor/xtensor.hpp>
-#include <xtensor/xeval.hpp>
+#include <xtensor/containers/xarray.hpp>
+#include <xtensor/containers/xtensor.hpp>
+#include <xtensor/core/xeval.hpp>
 
 #include "xtensor_io_config.hpp"
 

README.md

@@ -8,8 +8,8 @@
 
 #include <xtl/xsequence.hpp>
 
-#include "xtensor/xarray.hpp"
-#include "xtensor/xchunked_array.hpp"
+#include "xtensor/containers/xarray.hpp"
+#include "xtensor/chunk/xchunked_array.hpp"
 #include "xfile_array.hpp"
 
 namespace xt