Skip to content

Commit b77cfe4

Browse files
zoj613zoj613
committed
update
1 parent 6b0cc2c commit b77cfe4

File tree

3 files changed

+29
-29
lines changed

3 files changed

+29
-29
lines changed

‎zarr-eio/test/test_eio.ml

+10-10
Original file line numberDiff line numberDiff line change
@@ -116,17 +116,17 @@ let test_readable_writable_only
116116
assert_equal ~printer:string_of_bool false exists;
117117

118118
let cfg =
119-
{chunk_shape = [|2; 5; 5|]
119+
{chunk_shape = [2; 5; 5]
120120
;index_location = End
121121
;index_codecs = [`Bytes LE]
122-
;codecs = [`Transpose [|2; 0; 1|]; `Bytes BE]} in
122+
;codecs = [`Transpose [2; 0; 1]; `Bytes BE]} in
123123
let anode = Node.Array.(gnode / "arrnode") in
124-
let slice = [|R [|0; 5|]; I 10; R [|0; 10|]|] in
125-
let bigger_slice = [|R [|0; 6|]; L [|9; 10|] ; R [|0; 11|]|] in
124+
let slice = [R (0, 5); I 10; R (0, 10)] in
125+
let bigger_slice = [R (0, 6); L [9; 10] ; R (0, 11)] in
126126
Array.create
127-
~codecs:[`ShardingIndexed cfg] ~shape:[|100; 100; 50|] ~chunks:[|10; 15; 20|]
127+
~codecs:[`ShardingIndexed cfg] ~shape:[100; 100; 50] ~chunks:[10; 15; 20]
128128
Complex32 Complex.one anode store;
129-
let exp = Ndarray.init Complex32 [|6; 1; 11|] (Fun.const Complex.one) in
129+
let exp = Ndarray.init Complex32 [6; 1; 11] (Fun.const Complex.one) in
130130
let got = Array.read store anode slice Complex32 in
131131
assert_equal exp got;
132132
Ndarray.fill exp Complex.{re=2.0; im=0.};
@@ -136,17 +136,17 @@ let test_readable_writable_only
136136
let _ = Array.read store anode bigger_slice Complex32 in
137137
assert_equal exp got;
138138
(* test writing a bigger slice to store *)
139-
Array.write store anode bigger_slice @@ Ndarray.init Complex32 [|7; 2; 12|] (Fun.const Complex.{re=0.; im=3.0});
139+
Array.write store anode bigger_slice @@ Ndarray.init Complex32 [7; 2; 12] (Fun.const Complex.{re=0.; im=3.0});
140140
let got = Array.read store anode slice Complex32 in
141141
Ndarray.fill exp Complex.{re=0.; im=3.0};
142142
assert_equal exp got;
143-
let nshape = [|25; 28; 10|] in
143+
let nshape = [25; 28; 10] in
144144
Array.reshape store anode nshape;
145145
let meta = Array.metadata store anode in
146-
assert_equal ~printer:print_int_array nshape (Metadata.Array.shape meta);
146+
assert_equal ~printer:[%show: int list] nshape (Metadata.Array.shape meta);
147147
assert_raises
148148
(Zarr.Storage.Invalid_resize_shape)
149-
(fun () -> Array.reshape store anode [|25; 10|]);
149+
(fun () -> Array.reshape store anode [25; 10]);
150150
assert_raises
151151
(Zarr.Storage.Key_not_found "fakegroup/zarr.json")
152152
(fun () -> Array.metadata store Node.Array.(gnode / "fakegroup"));

‎zarr-lwt/test/test_lwt.ml

+9-9
Original file line numberDiff line numberDiff line change
@@ -139,16 +139,16 @@ let test_readable_writable_only
139139
let* exists = Array.exists store Node.Array.(gnode / "non-member") in
140140
assert_equal ~printer:string_of_bool false exists;
141141
let cfg =
142-
{chunk_shape = [|2; 5; 5|]
142+
{chunk_shape = [2; 5; 5]
143143
;index_location = End
144144
;index_codecs = [`Bytes LE]
145-
;codecs = [`Transpose [|2; 0; 1|]; `Bytes BE]} in
145+
;codecs = [`Transpose [2; 0; 1]; `Bytes BE]} in
146146
let anode = Node.Array.(gnode / "arrnode")
147-
and slice = [|R [|0; 5|]; I 10; R [|0; 10|]|]
148-
and bigger_slice = [|R [|0; 6|]; L [|9; 10|] ; R [|0; 11|]|]
149-
and codecs = [`ShardingIndexed cfg] and shape = [|100; 100; 50|] and chunks = [|10; 15; 20|] in
147+
and slice = [R (0, 5); I 10; R (0, 10)]
148+
and bigger_slice = [R (0, 6); L [9; 10] ; R (0, 11)]
149+
and codecs = [`ShardingIndexed cfg] and shape = [100; 100; 50] and chunks = [10; 15; 20] in
150150
let* () = Array.create ~codecs ~shape ~chunks Complex32 Complex.one anode store in
151-
let exp = Ndarray.init Complex32 [|6; 1; 11|] (Fun.const Complex.one) in
151+
let exp = Ndarray.init Complex32 [6; 1; 11] (Fun.const Complex.one) in
152152
let* got = Array.read store anode slice Complex32 in
153153
assert_equal exp got;
154154
Ndarray.fill exp Complex.{re=2.0; im=0.};
@@ -158,14 +158,14 @@ let test_readable_writable_only
158158
let* _ = Array.read store anode bigger_slice Complex32 in
159159
assert_equal exp got;
160160
(* test writing a bigger slice to store *)
161-
let* () = Array.write store anode bigger_slice @@ Ndarray.init Complex32 [|7; 2; 12|] (Fun.const Complex.{re=0.; im=3.0}) in
161+
let* () = Array.write store anode bigger_slice @@ Ndarray.init Complex32 [7; 2; 12] (Fun.const Complex.{re=0.; im=3.0}) in
162162
let* got = Array.read store anode slice Complex32 in
163163
Ndarray.fill exp Complex.{re=0.; im=3.0};
164164
assert_equal exp got;
165-
let nshape = [|25; 28; 10|] in
165+
let nshape = [25; 28; 10] in
166166
let* () = Array.reshape store anode nshape in
167167
let* meta = Array.metadata store anode in
168-
assert_equal ~printer:print_int_array nshape (Metadata.Array.shape meta);
168+
assert_equal ~printer:[%show: int list] nshape (Metadata.Array.shape meta);
169169
let* () = assert_not_implemented (fun () -> Array.rename store anode "newname") in
170170
let* () = assert_not_implemented (fun () -> Group.children store gnode) in
171171
let* () = assert_not_implemented (fun () -> hierarchy store) in

‎zarr-sync/test/test_sync.ml

+10-10
Original file line numberDiff line numberDiff line change
@@ -178,17 +178,17 @@ let test_readable_writable_only
178178
assert_equal ~printer:string_of_bool false exists;
179179

180180
let cfg =
181-
{chunk_shape = [|2; 5; 5|]
181+
{chunk_shape = [2; 5; 5]
182182
;index_location = End
183183
;index_codecs = [`Bytes LE]
184-
;codecs = [`Transpose [|2; 0; 1|]; `Bytes BE]} in
184+
;codecs = [`Transpose [2; 0; 1]; `Bytes BE]} in
185185
let anode = Node.Array.(gnode / "arrnode") in
186-
let slice = [|R [|0; 5|]; I 10; R [|0; 10|]|] in
187-
let bigger_slice = [|R [|0; 6|]; L [|9; 10|] ; R [|0; 11|]|] in
186+
let slice = [R (0, 5); I 10; R (0, 10)] in
187+
let bigger_slice = [R (0, 6); L [9; 10] ; R (0, 11)] in
188188
Array.create
189-
~codecs:[`ShardingIndexed cfg] ~shape:[|100; 100; 50|] ~chunks:[|10; 15; 20|]
189+
~codecs:[`ShardingIndexed cfg] ~shape:[100; 100; 50] ~chunks:[10; 15; 20]
190190
Complex32 Complex.one anode store;
191-
let exp = Ndarray.init Complex32 [|6; 1; 11|] (Fun.const Complex.one) in
191+
let exp = Ndarray.init Complex32 [6; 1; 11] (Fun.const Complex.one) in
192192
let got = Array.read store anode slice Complex32 in
193193
assert_equal exp got;
194194
Ndarray.fill exp Complex.{re=2.0; im=0.};
@@ -198,17 +198,17 @@ let test_readable_writable_only
198198
let _ = Array.read store anode bigger_slice Complex32 in
199199
assert_equal exp got;
200200
(* test writing a bigger slice to store *)
201-
Array.write store anode bigger_slice @@ Ndarray.init Complex32 [|7; 2; 12|] (Fun.const Complex.{re=0.; im=3.0});
201+
Array.write store anode bigger_slice @@ Ndarray.init Complex32 [7; 2; 12] (Fun.const Complex.{re=0.; im=3.0});
202202
let got = Array.read store anode slice Complex32 in
203203
Ndarray.fill exp Complex.{re=0.; im=3.0};
204204
assert_equal exp got;
205-
let nshape = [|25; 28; 10|] in
205+
let nshape = [25; 28; 10] in
206206
Array.reshape store anode nshape;
207207
let meta = Array.metadata store anode in
208-
assert_equal ~printer:print_int_array nshape (Metadata.Array.shape meta);
208+
assert_equal ~printer:[%show: int list] nshape (Metadata.Array.shape meta);
209209
assert_raises
210210
(Zarr.Storage.Invalid_resize_shape)
211-
(fun () -> Array.reshape store anode [|25; 10|]);
211+
(fun () -> Array.reshape store anode [25; 10]);
212212
assert_raises Not_implemented (fun () -> Array.rename store anode "newname");
213213
assert_raises Not_implemented (fun () -> Group.children store gnode);
214214
assert_raises Not_implemented (fun () -> hierarchy store);

0 commit comments

Comments
 (0)