Skip to content

Commit d28b117

Browse files
141 - added offset filter and level (#142)
* added offset filter and level * Set ZSTD Filter levels to 7 * added PositiveDeltaFilter for var len attributes in offsets_filters of ArraySchema * Updated python build versions * remove matrix python ver 3.11, added 3.14 * updated python dependencies * python version >= 3.12 and inclusive of 3.14 required --------- Co-authored-by: GannonGuess <131088734+GannonGuess@users.noreply.github.com> Co-authored-by: kylemann16 <kyle@hobu.co>
1 parent 3ebd1bd commit d28b117

5 files changed

Lines changed: 15 additions & 17 deletions

File tree

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
fail-fast: false
2727
matrix:
2828
os: [ubuntu-latest, windows-latest, macos-latest]
29-
python-version: ['3.11', '3.12', '3.13']
29+
python-version: ['3.12', '3.13', '3.14']
3030
steps:
3131
- name: Checkout
3232
uses: actions/checkout@v4

environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: pdal-sm
22
channels:
33
- conda-forge
44
dependencies:
5-
- python>=3.11, <3.14
5+
- python>=3.12, <=3.14
66
- pip
77
- cloudpickle>=3.1.2
88
- boto3

src/silvimetric/resources/attribute.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def schema(self) -> Attr:
4242
name=self.name,
4343
dtype=self.dtype.subtype,
4444
var=True,
45-
filters=FilterList([ZstdFilter()])
45+
filters=FilterList([ZstdFilter(level = 7)])
4646
)
4747

4848
def __eq__(self, other):

src/silvimetric/resources/metric.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ def schema(self, attr: Attribute) -> Any:
144144
return Attr(
145145
name=entry_name,
146146
dtype=self.dtype,
147-
filters=FilterList([ZstdFilter()]),
147+
filters=FilterList([ZstdFilter(level = 7)]),
148148
nullable=True
149149
)
150150

src/silvimetric/resources/storage.py

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -102,39 +102,39 @@ def create(config: StorageConfig, ctx: tiledb.Ctx = None):
102102
domain=(0, xi),
103103
dtype=np.uint64,
104104
tile=xsize,
105-
filters=tiledb.FilterList([tiledb.ZstdFilter()]),
105+
filters=tiledb.FilterList([tiledb.ZstdFilter(level = 7)]),
106106
)
107107
dim_col = tiledb.Dim(
108108
name='Y',
109109
domain=(0, yi),
110110
dtype=np.uint64,
111111
tile=ysize,
112-
filters=tiledb.FilterList([tiledb.ZstdFilter()]),
112+
filters=tiledb.FilterList([tiledb.ZstdFilter(level = 7)]),
113113
)
114114
domain = tiledb.Domain(dim_row, dim_col)
115115

116116
count_att = tiledb.Attr(
117117
name='count',
118118
dtype=np.uint32,
119-
filters=tiledb.FilterList([tiledb.ZstdFilter()]),
119+
filters=tiledb.FilterList([tiledb.ZstdFilter(level = 7)]),
120120
fill=0,
121121
)
122122
proc_att = tiledb.Attr(
123123
name='shatter_process_num',
124124
dtype=np.uint16,
125-
filters=tiledb.FilterList([tiledb.ZstdFilter()]),
125+
filters=tiledb.FilterList([tiledb.ZstdFilter(level = 7)]),
126126
fill=0,
127127
)
128128
start_time_att = tiledb.Attr(
129129
name='start_time',
130130
dtype=np.datetime64('', 'D').dtype,
131-
filters=tiledb.FilterList([tiledb.ZstdFilter()]),
131+
filters=tiledb.FilterList([tiledb.ZstdFilter(level = 7)]),
132132
fill=np.datetime64(0, 'D'),
133133
)
134134
end_time_att = tiledb.Attr(
135135
name='end_time',
136136
dtype=np.datetime64('', 'D').dtype,
137-
filters=tiledb.FilterList([tiledb.ZstdFilter()]),
137+
filters=tiledb.FilterList([tiledb.ZstdFilter(level = 7)]),
138138
fill=np.datetime64(0, 'D'),
139139
)
140140
dim_atts = [attr.schema() for attr in config.attrs]
@@ -171,13 +171,11 @@ def create(config: StorageConfig, ctx: tiledb.Ctx = None):
171171
*dim_atts,
172172
*metric_atts,
173173
],
174-
# offsets_filters=tiledb.FilterList(
175-
# [
176-
# tiledb.PositiveDeltaFilter(),
177-
# tiledb.BitWidthReductionFilter(),
178-
# tiledb.ZstdFilter(),
179-
# ]
180-
# ),
174+
offsets_filters=tiledb.FilterList(
175+
[
176+
tiledb.PositiveDeltaFilter(),
177+
]
178+
),
181179
)
182180
schema.check()
183181

0 commit comments

Comments
 (0)