Skip to content

Commit 9d98944

Browse files
FrancescAltedFrancescAlted
committed
Add syntatic sugar for vlmeta.getall()
1 parent 6cbb5cb commit 9d98944

File tree

2 files changed

+59
-54
lines changed

2 files changed

+59
-54
lines changed

‎doc/getting_started/tutorials/01.ndarray-basics.ipynb‎

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
"cell_type": "code",
1414
"metadata": {
1515
"ExecuteTime": {
16-
"end_time": "2024-11-29T13:21:33.702594Z",
17-
"start_time": "2024-11-29T13:21:33.472471Z"
16+
"end_time": "2024-11-30T08:10:29.230037Z",
17+
"start_time": "2024-11-30T08:10:29.227554Z"
1818
}
1919
},
2020
"source": [
@@ -23,7 +23,7 @@
2323
"import blosc2"
2424
],
2525
"outputs": [],
26-
"execution_count": 1
26+
"execution_count": 10
2727
},
2828
{
2929
"cell_type": "markdown",
@@ -37,8 +37,8 @@
3737
"cell_type": "code",
3838
"metadata": {
3939
"ExecuteTime": {
40-
"end_time": "2024-11-29T13:21:34.704642Z",
41-
"start_time": "2024-11-29T13:21:33.708436Z"
40+
"end_time": "2024-11-30T08:10:30.193647Z",
41+
"start_time": "2024-11-30T08:10:29.243014Z"
4242
}
4343
},
4444
"source": [
@@ -66,7 +66,7 @@
6666
]
6767
}
6868
],
69-
"execution_count": 2
69+
"execution_count": 11
7070
},
7171
{
7272
"cell_type": "markdown",
@@ -82,8 +82,8 @@
8282
"cell_type": "code",
8383
"metadata": {
8484
"ExecuteTime": {
85-
"end_time": "2024-11-29T13:21:34.801560Z",
86-
"start_time": "2024-11-29T13:21:34.798030Z"
85+
"end_time": "2024-11-30T08:10:30.201756Z",
86+
"start_time": "2024-11-30T08:10:30.199355Z"
8787
}
8888
},
8989
"source": [
@@ -96,34 +96,34 @@
9696
"array([ 0, 1, 2, ..., 9997, 9998, 9999])"
9797
]
9898
},
99-
"execution_count": 3,
99+
"execution_count": 12,
100100
"metadata": {},
101101
"output_type": "execute_result"
102102
}
103103
],
104-
"execution_count": 3
104+
"execution_count": 12
105105
},
106106
{
107107
"cell_type": "code",
108108
"metadata": {
109109
"ExecuteTime": {
110-
"end_time": "2024-11-29T13:21:34.886568Z",
111-
"start_time": "2024-11-29T13:21:34.805606Z"
110+
"end_time": "2024-11-30T08:10:30.292065Z",
111+
"start_time": "2024-11-30T08:10:30.211219Z"
112112
}
113113
},
114114
"source": [
115115
"array[0, :] = blosc2.zeros(10000, dtype=array.dtype)\n",
116116
"array[:, 0] = blosc2.ones(10000, dtype=array.dtype)"
117117
],
118118
"outputs": [],
119-
"execution_count": 4
119+
"execution_count": 13
120120
},
121121
{
122122
"cell_type": "code",
123123
"metadata": {
124124
"ExecuteTime": {
125-
"end_time": "2024-11-29T13:21:34.893628Z",
126-
"start_time": "2024-11-29T13:21:34.890666Z"
125+
"end_time": "2024-11-30T08:10:30.298301Z",
126+
"start_time": "2024-11-30T08:10:30.296016Z"
127127
}
128128
},
129129
"source": [
@@ -136,19 +136,19 @@
136136
"array(1)"
137137
]
138138
},
139-
"execution_count": 5,
139+
"execution_count": 14,
140140
"metadata": {},
141141
"output_type": "execute_result"
142142
}
143143
],
144-
"execution_count": 5
144+
"execution_count": 14
145145
},
146146
{
147147
"cell_type": "code",
148148
"metadata": {
149149
"ExecuteTime": {
150-
"end_time": "2024-11-29T13:21:34.905537Z",
151-
"start_time": "2024-11-29T13:21:34.902555Z"
150+
"end_time": "2024-11-30T08:10:30.317025Z",
151+
"start_time": "2024-11-30T08:10:30.313933Z"
152152
}
153153
},
154154
"source": [
@@ -161,19 +161,19 @@
161161
"array([1, 0, 0, ..., 0, 0, 0])"
162162
]
163163
},
164-
"execution_count": 6,
164+
"execution_count": 15,
165165
"metadata": {},
166166
"output_type": "execute_result"
167167
}
168168
],
169-
"execution_count": 6
169+
"execution_count": 15
170170
},
171171
{
172172
"cell_type": "code",
173173
"metadata": {
174174
"ExecuteTime": {
175-
"end_time": "2024-11-29T13:21:34.960932Z",
176-
"start_time": "2024-11-29T13:21:34.919483Z"
175+
"end_time": "2024-11-30T08:10:30.361624Z",
176+
"start_time": "2024-11-30T08:10:30.320840Z"
177177
}
178178
},
179179
"source": [
@@ -186,12 +186,12 @@
186186
"array([1, 1, 1, ..., 1, 1, 1])"
187187
]
188188
},
189-
"execution_count": 7,
189+
"execution_count": 16,
190190
"metadata": {},
191191
"output_type": "execute_result"
192192
}
193193
],
194-
"execution_count": 7
194+
"execution_count": 16
195195
},
196196
{
197197
"cell_type": "markdown",
@@ -205,8 +205,8 @@
205205
"cell_type": "code",
206206
"metadata": {
207207
"ExecuteTime": {
208-
"end_time": "2024-11-29T13:21:34.969365Z",
209-
"start_time": "2024-11-29T13:21:34.965186Z"
208+
"end_time": "2024-11-30T08:10:30.370245Z",
209+
"start_time": "2024-11-30T08:10:30.366629Z"
210210
}
211211
},
212212
"source": [
@@ -229,12 +229,12 @@
229229
"array([1, 1, 1, ..., 1, 1, 1])"
230230
]
231231
},
232-
"execution_count": 8,
232+
"execution_count": 17,
233233
"metadata": {},
234234
"output_type": "execute_result"
235235
}
236236
],
237-
"execution_count": 8
237+
"execution_count": 17
238238
},
239239
{
240240
"cell_type": "markdown",
@@ -249,8 +249,8 @@
249249
"cell_type": "code",
250250
"metadata": {
251251
"ExecuteTime": {
252-
"end_time": "2024-11-29T13:21:35.131223Z",
253-
"start_time": "2024-11-29T13:21:34.984024Z"
252+
"end_time": "2024-11-30T08:10:30.418652Z",
253+
"start_time": "2024-11-30T08:10:30.378467Z"
254254
}
255255
},
256256
"source": [
@@ -275,7 +275,7 @@
275275
"traceback": [
276276
"\u001B[0;31m---------------------------------------------------------------------------\u001B[0m",
277277
"\u001B[0;31mIndexError\u001B[0m Traceback (most recent call last)",
278-
"Cell \u001B[0;32mIn[9], line 4\u001B[0m\n\u001B[1;32m 2\u001B[0m \u001B[38;5;28mprint\u001B[39m(array\u001B[38;5;241m.\u001B[39mshape)\n\u001B[1;32m 3\u001B[0m \u001B[38;5;28mprint\u001B[39m(array[\u001B[38;5;241m8_999\u001B[39m]) \u001B[38;5;66;03m# This works\u001B[39;00m\n\u001B[0;32m----> 4\u001B[0m \u001B[43marray\u001B[49m\u001B[43m[\u001B[49m\u001B[38;5;241;43m9_000\u001B[39;49m\u001B[43m]\u001B[49m \u001B[38;5;66;03m# This will raise an exception\u001B[39;00m\n",
278+
"Cell \u001B[0;32mIn[18], line 4\u001B[0m\n\u001B[1;32m 2\u001B[0m \u001B[38;5;28mprint\u001B[39m(array\u001B[38;5;241m.\u001B[39mshape)\n\u001B[1;32m 3\u001B[0m \u001B[38;5;28mprint\u001B[39m(array[\u001B[38;5;241m8_999\u001B[39m]) \u001B[38;5;66;03m# This works\u001B[39;00m\n\u001B[0;32m----> 4\u001B[0m \u001B[43marray\u001B[49m\u001B[43m[\u001B[49m\u001B[38;5;241;43m9_000\u001B[39;49m\u001B[43m]\u001B[49m \u001B[38;5;66;03m# This will raise an exception\u001B[39;00m\n",
279279
"File \u001B[0;32m~/blosc/python-blosc2/src/blosc2/ndarray.py:1411\u001B[0m, in \u001B[0;36mNDArray.__getitem__\u001B[0;34m(self, key)\u001B[0m\n\u001B[1;32m 1409\u001B[0m expr \u001B[38;5;241m=\u001B[39m blosc2\u001B[38;5;241m.\u001B[39mLazyExpr\u001B[38;5;241m.\u001B[39m_new_expr(key, \u001B[38;5;28mself\u001B[39m\u001B[38;5;241m.\u001B[39mfields, guess\u001B[38;5;241m=\u001B[39m\u001B[38;5;28;01mFalse\u001B[39;00m)\n\u001B[1;32m 1410\u001B[0m \u001B[38;5;28;01mreturn\u001B[39;00m expr\u001B[38;5;241m.\u001B[39mwhere(\u001B[38;5;28mself\u001B[39m)\n\u001B[0;32m-> 1411\u001B[0m key_, mask \u001B[38;5;241m=\u001B[39m \u001B[43mprocess_key\u001B[49m\u001B[43m(\u001B[49m\u001B[43mkey\u001B[49m\u001B[43m,\u001B[49m\u001B[43m \u001B[49m\u001B[38;5;28;43mself\u001B[39;49m\u001B[38;5;241;43m.\u001B[39;49m\u001B[43mshape\u001B[49m\u001B[43m)\u001B[49m\n\u001B[1;32m 1412\u001B[0m start, stop, step \u001B[38;5;241m=\u001B[39m get_ndarray_start_stop(\u001B[38;5;28mself\u001B[39m\u001B[38;5;241m.\u001B[39mndim, key_, \u001B[38;5;28mself\u001B[39m\u001B[38;5;241m.\u001B[39mshape)\n\u001B[1;32m 1413\u001B[0m shape \u001B[38;5;241m=\u001B[39m np\u001B[38;5;241m.\u001B[39marray([sp \u001B[38;5;241m-\u001B[39m st \u001B[38;5;28;01mfor\u001B[39;00m st, sp \u001B[38;5;129;01min\u001B[39;00m \u001B[38;5;28mzip\u001B[39m(start, stop, strict\u001B[38;5;241m=\u001B[39m\u001B[38;5;28;01mTrue\u001B[39;00m)])\n",
280280
"File \u001B[0;32m~/blosc/python-blosc2/src/blosc2/ndarray.py:68\u001B[0m, in \u001B[0;36mprocess_key\u001B[0;34m(key, shape)\u001B[0m\n\u001B[1;32m 66\u001B[0m \u001B[38;5;28;01mif\u001B[39;00m key \u001B[38;5;129;01mis\u001B[39;00m \u001B[38;5;28;01mNone\u001B[39;00m:\n\u001B[1;32m 67\u001B[0m key \u001B[38;5;241m=\u001B[39m \u001B[38;5;28mtuple\u001B[39m(\u001B[38;5;28mslice\u001B[39m(\u001B[38;5;28;01mNone\u001B[39;00m) \u001B[38;5;28;01mfor\u001B[39;00m _ \u001B[38;5;129;01min\u001B[39;00m \u001B[38;5;28mrange\u001B[39m(\u001B[38;5;28mlen\u001B[39m(shape)))\n\u001B[0;32m---> 68\u001B[0m key \u001B[38;5;241m=\u001B[39m \u001B[43mndindex\u001B[49m\u001B[38;5;241;43m.\u001B[39;49m\u001B[43mndindex\u001B[49m\u001B[43m(\u001B[49m\u001B[43mkey\u001B[49m\u001B[43m)\u001B[49m\u001B[38;5;241;43m.\u001B[39;49m\u001B[43mexpand\u001B[49m\u001B[43m(\u001B[49m\u001B[43mshape\u001B[49m\u001B[43m)\u001B[49m\u001B[38;5;241m.\u001B[39mraw\n\u001B[1;32m 69\u001B[0m mask \u001B[38;5;241m=\u001B[39m \u001B[38;5;28mtuple\u001B[39m(\u001B[38;5;28misinstance\u001B[39m(k, \u001B[38;5;28mint\u001B[39m) \u001B[38;5;28;01mfor\u001B[39;00m k \u001B[38;5;129;01min\u001B[39;00m key)\n\u001B[1;32m 70\u001B[0m key \u001B[38;5;241m=\u001B[39m \u001B[38;5;28mtuple\u001B[39m(k \u001B[38;5;28;01mif\u001B[39;00m \u001B[38;5;28misinstance\u001B[39m(k, \u001B[38;5;28mslice\u001B[39m) \u001B[38;5;28;01melse\u001B[39;00m \u001B[38;5;28mslice\u001B[39m(k, k \u001B[38;5;241m+\u001B[39m \u001B[38;5;241m1\u001B[39m, \u001B[38;5;28;01mNone\u001B[39;00m) \u001B[38;5;28;01mfor\u001B[39;00m k \u001B[38;5;129;01min\u001B[39;00m key)\n",
281281
"File \u001B[0;32m~/miniconda3-arm64/envs/python-blosc2/lib/python3.11/site-packages/ndindex/ndindex.py:371\u001B[0m, in \u001B[0;36mNDIndexCommon.expand\u001B[0;34m(self, shape)\u001B[0m\n\u001B[1;32m 300\u001B[0m \u001B[38;5;250m\u001B[39m\u001B[38;5;124mr\u001B[39m\u001B[38;5;124;03m\"\"\"\u001B[39;00m\n\u001B[1;32m 301\u001B[0m \u001B[38;5;124;03mExpand a Tuple index on an array of shape `shape`\u001B[39;00m\n\u001B[1;32m 302\u001B[0m \n\u001B[0;32m (...)\u001B[0m\n\u001B[1;32m 367\u001B[0m \n\u001B[1;32m 368\u001B[0m \u001B[38;5;124;03m\"\"\"\u001B[39;00m\n\u001B[1;32m 369\u001B[0m \u001B[38;5;28;01mfrom\u001B[39;00m \u001B[38;5;21;01m.\u001B[39;00m\u001B[38;5;21;01mtuple\u001B[39;00m \u001B[38;5;28;01mimport\u001B[39;00m Tuple\n\u001B[0;32m--> 371\u001B[0m \u001B[38;5;28;01mreturn\u001B[39;00m \u001B[43mTuple\u001B[49m\u001B[43m(\u001B[49m\u001B[38;5;28;43mself\u001B[39;49m\u001B[43m)\u001B[49m\u001B[38;5;241;43m.\u001B[39;49m\u001B[43mexpand\u001B[49m\u001B[43m(\u001B[49m\u001B[43mshape\u001B[49m\u001B[43m)\u001B[49m\n",
@@ -287,7 +287,7 @@
287287
]
288288
}
289289
],
290-
"execution_count": 9
290+
"execution_count": 18
291291
},
292292
{
293293
"cell_type": "markdown",
@@ -302,7 +302,7 @@
302302
"execution_count": 17,
303303
"metadata": {
304304
"ExecuteTime": {
305-
"end_time": "2024-11-29T13:21:35.138898Z",
305+
"end_time": "2024-11-30T08:10:30.420859Z",
306306
"start_time": "2024-11-29T12:58:13.161331Z"
307307
}
308308
},
@@ -339,7 +339,7 @@
339339
"execution_count": 15,
340340
"metadata": {
341341
"ExecuteTime": {
342-
"end_time": "2024-11-29T13:21:35.139273Z",
342+
"end_time": "2024-11-30T08:10:30.421036Z",
343343
"start_time": "2024-11-29T12:57:23.007216Z"
344344
}
345345
},
@@ -380,7 +380,7 @@
380380
"execution_count": 18,
381381
"metadata": {
382382
"ExecuteTime": {
383-
"end_time": "2024-11-29T13:21:35.145662Z",
383+
"end_time": "2024-11-30T08:10:30.427514Z",
384384
"start_time": "2024-11-29T12:58:23.326768Z"
385385
}
386386
},
@@ -420,7 +420,7 @@
420420
"execution_count": 19,
421421
"metadata": {
422422
"ExecuteTime": {
423-
"end_time": "2024-11-29T13:21:35.147458Z",
423+
"end_time": "2024-11-30T08:10:30.428165Z",
424424
"start_time": "2024-11-29T13:00:19.313163Z"
425425
}
426426
},
@@ -453,7 +453,7 @@
453453
"execution_count": 21,
454454
"metadata": {
455455
"ExecuteTime": {
456-
"end_time": "2024-11-29T13:21:35.148120Z",
456+
"end_time": "2024-11-30T08:10:30.434148Z",
457457
"start_time": "2024-11-29T13:10:25.737685Z"
458458
}
459459
},
@@ -504,7 +504,7 @@
504504
"execution_count": 11,
505505
"metadata": {
506506
"ExecuteTime": {
507-
"end_time": "2024-11-29T13:21:35.148681Z",
507+
"end_time": "2024-11-30T08:10:30.435948Z",
508508
"start_time": "2024-11-28T03:50:16.430971Z"
509509
}
510510
},
@@ -524,7 +524,7 @@
524524
"execution_count": 12,
525525
"metadata": {
526526
"ExecuteTime": {
527-
"end_time": "2024-11-29T13:21:35.149255Z",
527+
"end_time": "2024-11-30T08:10:30.436104Z",
528528
"start_time": "2024-11-28T03:50:16.486995Z"
529529
}
530530
},
@@ -547,7 +547,7 @@
547547
"execution_count": 13,
548548
"metadata": {
549549
"ExecuteTime": {
550-
"end_time": "2024-11-29T13:21:35.149847Z",
550+
"end_time": "2024-11-30T08:10:30.436347Z",
551551
"start_time": "2024-11-28T03:50:16.495198Z"
552552
}
553553
},
@@ -575,7 +575,7 @@
575575
"execution_count": 14,
576576
"metadata": {
577577
"ExecuteTime": {
578-
"end_time": "2024-11-29T13:21:35.150406Z",
578+
"end_time": "2024-11-30T08:10:30.436477Z",
579579
"start_time": "2024-11-28T03:50:16.523855Z"
580580
}
581581
},
@@ -603,7 +603,7 @@
603603
"execution_count": 15,
604604
"metadata": {
605605
"ExecuteTime": {
606-
"end_time": "2024-11-29T13:21:35.151218Z",
606+
"end_time": "2024-11-30T08:10:30.436595Z",
607607
"start_time": "2024-11-28T03:50:16.551074Z"
608608
}
609609
},
@@ -631,7 +631,7 @@
631631
"execution_count": 16,
632632
"metadata": {
633633
"ExecuteTime": {
634-
"end_time": "2024-11-29T13:21:35.152068Z",
634+
"end_time": "2024-11-30T08:10:30.436925Z",
635635
"start_time": "2024-11-28T03:50:16.577896Z"
636636
}
637637
},
@@ -655,10 +655,10 @@
655655
}
656656
],
657657
"source": [
658-
"print(array.vlmeta.getall())\n",
658+
"print(array.vlmeta[:])\n",
659659
"array.vlmeta[\"info1\"] = \"This is an example\"\n",
660660
"array.vlmeta[\"info2\"] = \"of user meta handling\"\n",
661-
"array.vlmeta.getall()"
661+
"array.vlmeta[:]"
662662
]
663663
},
664664
{
@@ -673,7 +673,7 @@
673673
"execution_count": 17,
674674
"metadata": {
675675
"ExecuteTime": {
676-
"end_time": "2024-11-29T13:21:35.152934Z",
676+
"end_time": "2024-11-30T08:10:30.439576Z",
677677
"start_time": "2024-11-28T03:50:16.605487Z"
678678
}
679679
},
@@ -691,7 +691,7 @@
691691
],
692692
"source": [
693693
"array.vlmeta[\"info1\"] = \"This is a larger example\"\n",
694-
"array.vlmeta.getall()"
694+
"array.vlmeta[:]"
695695
]
696696
},
697697
{
@@ -704,7 +704,7 @@
704704
"execution_count": 18,
705705
"metadata": {
706706
"ExecuteTime": {
707-
"end_time": "2024-11-29T13:21:35.153883Z",
707+
"end_time": "2024-11-30T08:10:30.441042Z",
708708
"start_time": "2024-11-28T03:50:16.631454Z"
709709
}
710710
},
@@ -724,7 +724,7 @@
724724
],
725725
"source": [
726726
"array.vlmeta[\"info3\"] = {\"a\": 1, \"b\": 2}\n",
727-
"array.vlmeta.getall()"
727+
"array.vlmeta[:]"
728728
]
729729
},
730730
{
@@ -737,7 +737,7 @@
737737
"execution_count": 19,
738738
"metadata": {
739739
"ExecuteTime": {
740-
"end_time": "2024-11-29T13:21:35.155650Z",
740+
"end_time": "2024-11-30T08:10:30.441246Z",
741741
"start_time": "2024-11-28T03:50:16.658931Z"
742742
}
743743
},
@@ -755,7 +755,7 @@
755755
],
756756
"source": [
757757
"del array.vlmeta[\"info1\"]\n",
758-
"array.vlmeta.getall()"
758+
"array.vlmeta[:]"
759759
]
760760
},
761761
{
@@ -782,7 +782,7 @@
782782
"execution_count": 20,
783783
"metadata": {
784784
"ExecuteTime": {
785-
"end_time": "2024-11-29T13:21:35.157188Z",
785+
"end_time": "2024-11-30T08:10:30.441403Z",
786786
"start_time": "2024-11-28T03:50:16.686196Z"
787787
},
788788
"collapsed": false,
@@ -849,7 +849,7 @@
849849
"execution_count": 21,
850850
"metadata": {
851851
"ExecuteTime": {
852-
"end_time": "2024-11-29T13:21:35.157941Z",
852+
"end_time": "2024-11-30T08:10:30.441531Z",
853853
"start_time": "2024-11-28T03:50:16.724718Z"
854854
},
855855
"collapsed": false,

0 commit comments

Comments
 (0)