Breakout Zarr v2 files from acquire-project#76

aliddell · Oct 19, 2023 · 774d85a · 774d85a
1 parent 79851b2
commit 774d85a
Show file tree

Hide file tree

Showing 40 changed files with 2,212 additions and 1,800 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,9 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Added
+
+- Ship debug libs for C-Blosc on Linux and Mac.
+
+### Changed
+
+- Upgrades C-Blosc from v1.21.4 to v1.21.5.
+
 ### Fixed
 
 - A bug where enabling multiscale without specifying the tile size would cause an error.
+- Exceptions thrown off the main thread are now caught and logged, and Zarr throws an error in `append`.
 
 ## [0.1.4](https://github.com/acquire-project/acquire-driver-zarr/compare/v0.1.3...v0.1.4) - 2023-08-11
 

diff --git a/src/3rdParty/cblosc/CMakeLists.txt b/src/3rdParty/cblosc/CMakeLists.txt
@@ -7,10 +7,10 @@ if(WIN32)
     set(libd "${pwd}/lib/win64/libblosc-debug.lib")
 elseif(APPLE)
     set(lib "${pwd}/lib/osx/libblosc.a")
-    set(libd ${lib})
+    set(libd "${pwd}/lib/osx/libblosc-debug.a")
 elseif(LINUX)
     set(lib "${pwd}/lib/linux-amd64/libblosc.a")
-    set(libd ${lib})
+    set(libd "${pwd}/lib/linux-amd64/libblosc-debug.a")
 endif()
 
 message(STATUS "C-Blosc: ${pwd}")

diff --git a/src/3rdParty/cblosc/lib/linux-amd64/libblosc-debug.a b/src/3rdParty/cblosc/lib/linux-amd64/libblosc-debug.a
diff --git a/src/3rdParty/cblosc/lib/linux-amd64/libblosc.a b/src/3rdParty/cblosc/lib/linux-amd64/libblosc.a
diff --git a/src/3rdParty/cblosc/lib/osx/README.md b/src/3rdParty/cblosc/lib/osx/README.md
@@ -1,6 +1,6 @@
 The library here was built as follows.
 
-Against v1.21.4 (2c2f9bd) of the c-blosc source hosted at:
+Against v1.21.5 (d306135) of the c-blosc source hosted at:
 https://github.com/Blosc/c-blosc
 
 It's a universal binary compiled for `arm64` and `x86_64`.

diff --git a/src/3rdParty/cblosc/lib/osx/libblosc-debug.a b/src/3rdParty/cblosc/lib/osx/libblosc-debug.a
diff --git a/src/3rdParty/cblosc/lib/osx/libblosc.a b/src/3rdParty/cblosc/lib/osx/libblosc.a
diff --git a/src/3rdParty/cblosc/lib/win64/libblosc-debug.lib b/src/3rdParty/cblosc/lib/win64/libblosc-debug.lib
diff --git a/src/3rdParty/cblosc/lib/win64/libblosc.lib b/src/3rdParty/cblosc/lib/win64/libblosc.lib
diff --git a/src/3rdParty/cblosc/lib/win64/libblosc.pdb b/src/3rdParty/cblosc/lib/win64/libblosc.pdb
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,26 +1,26 @@
 add_subdirectory(3rdParty)
 
-if(NOT TARGET acquire-core-logger)
-        add_subdirectory(acquire-core-libs)
-endif()
+if (NOT TARGET acquire-core-logger)
+    add_subdirectory(acquire-core-libs)
+endif ()
 
 set(tgt acquire-driver-zarr)
 add_library(${tgt} MODULE
         prelude.h
-        tiled.frame.hh
-        tiled.frame.cpp
-        chunk.writer.hh
-        chunk.writer.cpp
-        frame.scaler.hh
-        frame.scaler.cpp
+        common.hh
+        common.cpp
+        writers/writer.hh
+        writers/writer.cpp
+        writers/chunk.writer.hh
+        writers/chunk.writer.cpp
+        writers/shard.writer.hh
+        writers/shard.writer.cpp
+        writers/blosc.compressor.hh
+        writers/blosc.compressor.cpp
         zarr.hh
         zarr.cpp
-        zarr.encoder.hh
-        zarr.encoder.cpp
-        zarr.raw.hh
-        zarr.raw.cpp
-        zarr.blosc.hh
-        zarr.blosc.cpp
+        zarr.v2.hh
+        zarr.v2.cpp
         zarr.driver.c
 )
 target_enable_simd(${tgt})

diff --git a/src/chunk.writer.cpp b/src/chunk.writer.cpp