Change saving order from F to C (#42)

medyan-dev · Nov 27, 2023 · 04dd43e · 04dd43e · nhz2 · Nov 27, 2023
1 parent 809e231
commit 04dd43e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "SmallZarrGroups"
 uuid = "d423b6e5-1c84-4ae2-8d2d-b903aee15ac7"
 authors = ["nhz2 <[email protected]>"]
-version = "0.7.1"
+version = "0.8.0"
 
 [deps]
 AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"
@@ -25,5 +25,5 @@ DataStructures = "0.18"
 JSON3 = "1"
 StructArrays = "0.6"
 TranscodingStreams = "0.9, 0.10"
-ZipArchives = "0.3, 0.4, 0.5, 1"
+ZipArchives = "1"
 julia = "1.8"
diff --git a/src/loading.jl b/src/loading.jl
@@ -108,7 +108,7 @@ function load_dir(reader::AbstractReader)::ZGroup
                 end
             end
 
-            zarray = if metadata.is_column_major
+            zarray = if metadata.is_column_major || ndims(array) ≤ 1
                 ZArray(array;
                     chunks = Tuple(chunks),
                     compressor = metadata.compressor,

diff --git a/src/saving.jl b/src/saving.jl
@@ -89,7 +89,8 @@ function _save_zarray(writer::AbstractWriter, key_prefix::String, z::ZArray)
     if zarr_size != 0 && !any(iszero, shape)
         chunks = Tuple(z.chunks)
         # store chunks
-        shaped_chunkdata = zeros(UInt8, zarr_size, chunks...)
+        shaped_chunkdata = zeros(UInt8, zarr_size, reverse(chunks)...)
+        permuted_shaped_chunkdata = PermutedDimsArray(shaped_chunkdata, (1, ndims(z)+1:-1:2...))
         shaped_array = if dtype.julia_size == 1
             reshape(reinterpret(reshape, UInt8, data), 1, shape...)
         else
@@ -102,7 +103,7 @@ function _save_zarray(writer::AbstractWriter, key_prefix::String, z::ZArray)
             real_chunksize = chunkstop .- chunkstart .+ 1
             # now create overlapping views
             array_view = view(shaped_array, :, (range.(chunkstart, chunkstop))...)
-            chunk_view = view(shaped_chunkdata, :, (range.(1, real_chunksize))...)
+            chunk_view = view(permuted_shaped_chunkdata, :, (range.(1, real_chunksize))...)
             # TODO check if the data can just be directly copied.
             for (zarr_byte, julia_byte) in enumerate(dtype.byteorder)
                 selectdim(chunk_view, 1, zarr_byte) .= selectdim(array_view, 1, julia_byte)
@@ -122,7 +123,7 @@ function _save_zarray(writer::AbstractWriter, key_prefix::String, z::ZArray)
             "dtype": $dtype_str,
             "fill_value": null,
             "filters": null,
-            "order": "F",
+            "order": "C",
             "shape": [$(join(shape, ", "))],
             "zarr_format": 2
         }