Commit a037b33
authored
Remove the FeatureVector annotation type, various fixes, and cleanup (#1839)
This pull request removes support for the deprecated `FeatureVector`
annotation type and related functionality, add missing plugin
definitions to spec.json. It also updates documentation and test
configurations to reflect these changes.
### Removal of FeatureVector annotation type and related functionality
* Removed the `FeatureVector` annotation class, its matcher and merger
classes, and the corresponding `feature_vector` entry from the
`AnnotationType` enum in `src/datumaro/components/annotation.py`,
`src/datumaro/components/annotations/matcher.py`, and
`src/datumaro/components/annotations/merger.py`.
[[1]](diffhunk://#diff-7f2b49c4e168c9b76b6096e142d40788cdb5641cb210cc6351d7072d88313a58L53)
[[2]](diffhunk://#diff-7f2b49c4e168c9b76b6096e142d40788cdb5641cb210cc6351d7072d88313a58L260-L271)
[[3]](diffhunk://#diff-946419970a02797027e73d686303272fae7144813b7169985218935c52089f9fL36)
[[4]](diffhunk://#diff-946419970a02797027e73d686303272fae7144813b7169985218935c52089f9fL354-L360)
[[5]](diffhunk://#diff-e7d4644319a6bb820e963fff1e4a74d2a36ef659534b7f3199e456877ce4cd29L17)
[[6]](diffhunk://#diff-e7d4644319a6bb820e963fff1e4a74d2a36ef659534b7f3199e456877ce4cd29L42)
[[7]](diffhunk://#diff-e7d4644319a6bb820e963fff1e4a74d2a36ef659534b7f3199e456877ce4cd29L194-L198)
[[8]](diffhunk://#diff-45c0fe95cb538e7a0d37c2c8a6ef2f9204b02f1fd598c3eb7bf2fe259623f8d7L25)
[[9]](diffhunk://#diff-45c0fe95cb538e7a0d37c2c8a6ef2f9204b02f1fd598c3eb7bf2fe259623f8d7L450-L451)
* Removed references to `FeatureVectorMerger` from the merge logic in
`src/datumaro/components/merge/intersect_merge.py`.
[[1]](diffhunk://#diff-45c0fe95cb538e7a0d37c2c8a6ef2f9204b02f1fd598c3eb7bf2fe259623f8d7L25)
[[2]](diffhunk://#diff-45c0fe95cb538e7a0d37c2c8a6ef2f9204b02f1fd598c3eb7bf2fe259623f8d7L450-L451)
* Updated tests to remove checks for `feature_vector` statistics in
`tests/unit/operations/test_statistics.py`.
[[1]](diffhunk://#diff-c9014cbc94767631e72b9105fb3339a75fd98d9aa1aea809c4fc28dccdc24ea1L305)
[[2]](diffhunk://#diff-c9014cbc94767631e72b9105fb3339a75fd98d9aa1aea809c4fc28dccdc24ea1L430)
### Plugin additions for new formats
* Added plugin definitions for Roboflow TFRecord and TensorFlow
Detection API formats (DatasetBase, Importer, and Exporter) to
`src/datumaro/plugins/specs.json`, including TensorFlow as an extra
dependency.
[[1]](diffhunk://#diff-49a19686affac07069c2b4dfe733cf196aae57dbd46c683ca74afcdb4acba950R1175-R1195)
[[2]](diffhunk://#diff-49a19686affac07069c2b4dfe733cf196aae57dbd46c683ca74afcdb4acba950R1361-R1389)
### Documentation and compatibility updates
* Removed deprecated usage examples for project-based workflows from
`docs/source/docs/data-formats/media_formats.md` and deleted the
deprecated `src/datumaro/project.py` module.
[[1]](diffhunk://#diff-a35988ee55f8d9dfc6bd3222fba44d35635ceb3b224810db393bd7d97f59c3f0L20-L31)
[[2]](diffhunk://#diff-2816b82cd5bcd290f30697a92d9eab8fc69661f926a2e32366b145874ec0bcd3L1-L9)
* Cleaned up deprecated variable declarations from CLI and annotation
modules.
[[1]](diffhunk://#diff-6f1f61fbe373037fdf31139d07acfd57161d3557eaf7369807fea9f6ec65293fL64-L66)
[[2]](diffhunk://#diff-77d278999778b6ae6f7aeb8a0ea8d5abbaf3e79a4ff53526648d343874eaf098L25-L26)
[[3]](diffhunk://#diff-7f2b49c4e168c9b76b6096e142d40788cdb5641cb210cc6351d7072d88313a58L36)
[[4]](diffhunk://#diff-fe06b77e577603a2f17b21c10f504a4da2dd597eb82acb465864c7a6de9ca89bL28)
### Test configuration updates
* Updated `tox.ini` to include TensorFlow and TFDS for Python 3.12
environments.<!-- Contributing guide:
https://github.com/open-edge-platform/datumaro/blob/develop/CONTRIBUTING.md
-->
<!--
Resolves #111 and #222.
Depends on #1000 (for series of dependent commits).
This PR introduces this capability to make the project better in this
and that.
- Added this feature
- Removed that feature
- Fixed the problem #1234
-->
### How to test
<!-- Describe the testing procedure for reviewers, if changes are
not fully covered by unit tests or manual testing can be complicated.
-->
### Checklist
<!-- Put an 'x' in all the boxes that apply -->
- [ ] I have added unit tests to cover my changes.
- [ ] I have added integration tests to cover my changes.
- [ ] I have added the description of my changes into
[CHANGELOG](https://github.com/open-edge-platform/datumaro/blob/develop/CHANGELOG.md).
- [ ] I have updated the
[documentation](https://github.com/open-edge-platform/datumaro/tree/develop/docs)
accordingly
### License
- [ ] I submit _my code changes_ under the same [MIT
License](https://github.com/open-edge-platform/datumaro/blob/develop/LICENSE)
that covers the project.
Feel free to contact the maintainers if that's a concern.
- [ ] I have updated the license header for each file (see an example
below).
```python
# Copyright (C) 2025 Intel Corporation
#
# SPDX-License-Identifier: MIT
```File tree
13 files changed
+58
-71
lines changed- docs/source/docs/data-formats
- src/datumaro
- cli
- commands
- components
- annotations
- hl_ops
- merge
- plugins
- tests/unit/operations
13 files changed
+58
-71
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | | - | |
| 20 | + | |
| 21 | + | |
34 | 22 | | |
35 | | - | |
36 | | - | |
| 23 | + | |
| 24 | + | |
37 | 25 | | |
38 | 26 | | |
39 | 27 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
92 | 92 | | |
93 | 93 | | |
94 | 94 | | |
95 | | - | |
96 | | - | |
97 | | - | |
98 | | - | |
99 | 95 | | |
100 | 96 | | |
101 | 97 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
61 | 61 | | |
62 | 62 | | |
63 | 63 | | |
64 | | - | |
65 | | - | |
66 | | - | |
67 | 64 | | |
68 | 65 | | |
69 | 66 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
25 | | - | |
26 | | - | |
27 | 25 | | |
28 | 26 | | |
29 | 27 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
36 | | - | |
37 | 36 | | |
38 | 37 | | |
39 | 38 | | |
| |||
50 | 49 | | |
51 | 50 | | |
52 | 51 | | |
53 | | - | |
54 | 52 | | |
55 | 53 | | |
56 | 54 | | |
| |||
257 | 255 | | |
258 | 256 | | |
259 | 257 | | |
260 | | - | |
261 | | - | |
262 | | - | |
263 | | - | |
264 | | - | |
265 | | - | |
266 | | - | |
267 | | - | |
268 | | - | |
269 | | - | |
270 | | - | |
271 | | - | |
272 | 258 | | |
273 | 259 | | |
274 | 260 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
36 | | - | |
37 | 36 | | |
38 | 37 | | |
39 | 38 | | |
| |||
351 | 350 | | |
352 | 351 | | |
353 | 352 | | |
354 | | - | |
355 | | - | |
356 | | - | |
357 | | - | |
358 | | - | |
359 | | - | |
360 | | - | |
361 | 353 | | |
362 | 354 | | |
363 | 355 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
17 | | - | |
18 | 17 | | |
19 | 18 | | |
20 | 19 | | |
| |||
39 | 38 | | |
40 | 39 | | |
41 | 40 | | |
42 | | - | |
43 | 41 | | |
44 | 42 | | |
45 | 43 | | |
| |||
191 | 189 | | |
192 | 190 | | |
193 | 191 | | |
194 | | - | |
195 | | - | |
196 | | - | |
197 | | - | |
198 | | - | |
199 | 192 | | |
200 | 193 | | |
201 | 194 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
28 | | - | |
29 | 28 | | |
30 | 29 | | |
31 | 30 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
25 | | - | |
26 | 25 | | |
27 | 26 | | |
28 | 27 | | |
| |||
447 | 446 | | |
448 | 447 | | |
449 | 448 | | |
450 | | - | |
451 | | - | |
452 | 449 | | |
453 | 450 | | |
454 | 451 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1172 | 1172 | | |
1173 | 1173 | | |
1174 | 1174 | | |
| 1175 | + | |
| 1176 | + | |
| 1177 | + | |
| 1178 | + | |
| 1179 | + | |
| 1180 | + | |
| 1181 | + | |
| 1182 | + | |
| 1183 | + | |
| 1184 | + | |
| 1185 | + | |
| 1186 | + | |
| 1187 | + | |
| 1188 | + | |
| 1189 | + | |
| 1190 | + | |
| 1191 | + | |
| 1192 | + | |
| 1193 | + | |
| 1194 | + | |
| 1195 | + | |
1175 | 1196 | | |
1176 | 1197 | | |
1177 | 1198 | | |
| |||
1337 | 1358 | | |
1338 | 1359 | | |
1339 | 1360 | | |
| 1361 | + | |
| 1362 | + | |
| 1363 | + | |
| 1364 | + | |
| 1365 | + | |
| 1366 | + | |
| 1367 | + | |
| 1368 | + | |
| 1369 | + | |
| 1370 | + | |
| 1371 | + | |
| 1372 | + | |
| 1373 | + | |
| 1374 | + | |
| 1375 | + | |
| 1376 | + | |
| 1377 | + | |
| 1378 | + | |
| 1379 | + | |
| 1380 | + | |
| 1381 | + | |
| 1382 | + | |
| 1383 | + | |
| 1384 | + | |
| 1385 | + | |
| 1386 | + | |
| 1387 | + | |
| 1388 | + | |
| 1389 | + | |
1340 | 1390 | | |
1341 | 1391 | | |
1342 | 1392 | | |
| |||
0 commit comments