Back to one xtensor-zarr-gdal shared library

Author: davidbrochart

CMakeLists.txt

@@ -109,10 +109,6 @@ set(XTENSOR_ZARR_HEADERS
     ${XTENSOR_ZARR_INCLUDE_DIR}/xtensor-zarr/xtensor_zarr_config_cling.hpp
 )
 
-set(XTENSOR_ZARR_LOCAL_SOURCE
-    ${XTENSOR_ZARR_SOURCE_DIR}/xtensor-zarr-local.cpp
-)
-
 set(XTENSOR_ZARR_GDAL_SOURCE
     ${XTENSOR_ZARR_SOURCE_DIR}/xtensor-zarr-gdal.cpp
 )
@@ -305,9 +301,7 @@ endmacro()
 
 set (xtensor_zarr_targets "")
 if (XTENSOR_ZARR_BUILD_SHARED_LIBS)
-    xtensor_zarr_create_target(${XTENSOR_ZARR_LOCAL_SOURCE} xtensor-zarr-local SHARED xtensor-zarr-local)
     xtensor_zarr_create_target(${XTENSOR_ZARR_GDAL_SOURCE} xtensor-zarr-gdal SHARED xtensor-zarr-gdal)
-    list(APPEND xtensor_zarr_targets xtensor-zarr-local)
     list(APPEND xtensor_zarr_targets xtensor-zarr-gdal)
 
     target_link_libraries(xtensor-zarr-gdal

README.md

@@ -13,25 +13,18 @@ Implementation of the Zarr core protocol (version 2 and 3) based on xtensor
 
 ## Installation
 
-`xtensor-zarr` comes with:
-
-- `libxtensor-zarr-gdal`: a shared library for accessing stores through a GDAL Virtual File System.
-- `libxtensor-zarr-local`: a shared library for accessing stores through the local file system.
-
-Appart from these stores, `xtensor-zarr` is a header-only library.
+`xtensor-zarr` comes with a `libxtensor-zarr-gdal` shared library for accessing stores through GDAL's Virtual File System or the local file system. For all other stores, `xtensor-zarr` is a header-only library.
 
 We provide a package for the mamba (or conda) package manager:
 
 ```bash
 mamba install xtensor-zarr -c conda-forge
 ```
 
-- `xtensor-zarr` depends on `xtensor` `^0.23.8`, `xtensor-io` `^0.12.7`, `zarray` `^0.0.7`, `nlohmann_json` `^3.9.1`, `Blosc` `^1.21.0` and `zlib` `^1.2.11`.
+- `xtensor-zarr` depends on `xtensor` `^0.23.8`, `xtensor-io` `^0.12.7`, `zarray` `^0.0.7`, `nlohmann_json` `^3.9.1`, `Blosc` `^1.21.0`, `zlib` `^1.2.11`, `gdal` `^3.0.0` and `cpp-filesystem` `^1.3.0`.
 
-- `gdal` `^3.0.0`, `cpp-filesystem` `^1.3.0`, `google-cloud-cpp` and `aws-sdk-cpp` are optional dependencies to `xtensor-zarr`.
+- `google-cloud-cpp` and `aws-sdk-cpp` are optional dependencies to `xtensor-zarr`.
 
-  - `gdal` is required to access a store using GDAL's Virtual File System.
-  - `cpp-filesystem` is required to access a store in the local file system.
   - `google-cloud-cpp` is required to access a store in Google Cloud Storage.
   - `aws-sdk-cpp` is required to access a store in AWS S3.
 

src/xtensor-zarr-gdal.cpp

@@ -2,6 +2,11 @@
 
 namespace xt
 {
+    template XTENSOR_ZARR_API void xzarr_register_compressor<xzarr_file_system_store, xio_gzip_config>();
+    template XTENSOR_ZARR_API void xzarr_register_compressor<xzarr_file_system_store, xio_zlib_config>();
+    template XTENSOR_ZARR_API void xzarr_register_compressor<xzarr_file_system_store, xio_blosc_config>();
+    template class XTENSOR_ZARR_API xchunked_array_factory<xzarr_file_system_store>;
+
     template XTENSOR_ZARR_API void xzarr_register_compressor<xzarr_gdal_store, xio_gzip_config>();
     template XTENSOR_ZARR_API void xzarr_register_compressor<xzarr_gdal_store, xio_zlib_config>();
     template XTENSOR_ZARR_API void xzarr_register_compressor<xzarr_gdal_store, xio_blosc_config>();

src/xtensor-zarr-local.cpp

@@ -12,7 +12,6 @@ cmake_minimum_required(VERSION 3.8)
 if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
     project(xtensor-zarr-test)
 
-    find_package(xtensor-zarr-local REQUIRED CONFIG)
     find_package(xtensor-zarr-gdal REQUIRED CONFIG)
     find_package(xtensor-zarr REQUIRED CONFIG)
     set(XTENSOR_ZARR_INCLUDE_DIR ${xtensor_INCLUDE_DIRS})
@@ -102,7 +101,6 @@ target_compile_features(test_xtensor_zarr PRIVATE cxx_std_14)
 
 target_link_libraries(test_xtensor_zarr
     PRIVATE
-    xtensor-zarr-local
     xtensor-zarr-gdal
     PUBLIC
     xtensor-zarr