faster-coco-eval 1.3.3__tar.gz → 1.4.1__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (38) hide show
  1. {faster-coco-eval-1.3.3/faster_coco_eval.egg-info → faster-coco-eval-1.4.1}/PKG-INFO +28 -12
  2. {faster-coco-eval-1.3.3 → faster-coco-eval-1.4.1}/README.md +24 -10
  3. {faster-coco-eval-1.3.3 → faster-coco-eval-1.4.1}/csrc/faster_eval_api/coco_eval/cocoeval.cpp +1 -4
  4. {faster-coco-eval-1.3.3 → faster-coco-eval-1.4.1}/csrc/faster_eval_api/faster_eval_api.cpp +5 -5
  5. {faster-coco-eval-1.3.3 → faster-coco-eval-1.4.1}/csrc/mask/pycocotools/_mask.c +14617 -9207
  6. {faster-coco-eval-1.3.3 → faster-coco-eval-1.4.1}/csrc/mask/pycocotools/_mask.pyx +1 -0
  7. faster-coco-eval-1.4.1/faster_coco_eval/__init__.py +2 -0
  8. faster-coco-eval-1.4.1/faster_coco_eval/core/__init__.py +2 -0
  9. {faster-coco-eval-1.3.3 → faster-coco-eval-1.4.1}/faster_coco_eval/core/coco.py +139 -109
  10. {faster-coco-eval-1.3.3 → faster-coco-eval-1.4.1}/faster_coco_eval/core/cocoeval.py +262 -195
  11. faster-coco-eval-1.4.1/faster_coco_eval/core/faster_eval_api.py +355 -0
  12. {faster-coco-eval-1.3.3 → faster-coco-eval-1.4.1}/faster_coco_eval/core/mask.py +2 -2
  13. faster-coco-eval-1.4.1/faster_coco_eval/extra/__init__.py +2 -0
  14. faster-coco-eval-1.4.1/faster_coco_eval/extra/curves.py +96 -0
  15. faster-coco-eval-1.4.1/faster_coco_eval/extra/display.py +322 -0
  16. faster-coco-eval-1.4.1/faster_coco_eval/extra/extra.py +55 -0
  17. faster-coco-eval-1.4.1/faster_coco_eval/version.py +2 -0
  18. {faster-coco-eval-1.3.3 → faster-coco-eval-1.4.1/faster_coco_eval.egg-info}/PKG-INFO +28 -12
  19. {faster-coco-eval-1.3.3 → faster-coco-eval-1.4.1}/faster_coco_eval.egg-info/requires.txt +1 -4
  20. {faster-coco-eval-1.3.3 → faster-coco-eval-1.4.1}/pyproject.toml +2 -2
  21. {faster-coco-eval-1.3.3 → faster-coco-eval-1.4.1}/setup.py +52 -56
  22. faster-coco-eval-1.3.3/faster_coco_eval/__init__.py +0 -3
  23. faster-coco-eval-1.3.3/faster_coco_eval/core/__init__.py +0 -0
  24. faster-coco-eval-1.3.3/faster_coco_eval/core/faster_eval_api.py +0 -316
  25. faster-coco-eval-1.3.3/faster_coco_eval/extra/__init__.py +0 -2
  26. faster-coco-eval-1.3.3/faster_coco_eval/extra/curves.py +0 -107
  27. faster-coco-eval-1.3.3/faster_coco_eval/extra/display.py +0 -256
  28. faster-coco-eval-1.3.3/faster_coco_eval/extra/extra.py +0 -45
  29. faster-coco-eval-1.3.3/faster_coco_eval/version.py +0 -2
  30. {faster-coco-eval-1.3.3 → faster-coco-eval-1.4.1}/LICENSE +0 -0
  31. {faster-coco-eval-1.3.3 → faster-coco-eval-1.4.1}/MANIFEST.in +0 -0
  32. {faster-coco-eval-1.3.3 → faster-coco-eval-1.4.1}/csrc/faster_eval_api/coco_eval/cocoeval.h +0 -0
  33. {faster-coco-eval-1.3.3 → faster-coco-eval-1.4.1}/csrc/mask/common/maskApi.c +0 -0
  34. {faster-coco-eval-1.3.3 → faster-coco-eval-1.4.1}/csrc/mask/common/maskApi.h +0 -0
  35. {faster-coco-eval-1.3.3 → faster-coco-eval-1.4.1}/faster_coco_eval.egg-info/SOURCES.txt +0 -0
  36. {faster-coco-eval-1.3.3 → faster-coco-eval-1.4.1}/faster_coco_eval.egg-info/dependency_links.txt +0 -0
  37. {faster-coco-eval-1.3.3 → faster-coco-eval-1.4.1}/faster_coco_eval.egg-info/top_level.txt +0 -0
  38. {faster-coco-eval-1.3.3 → faster-coco-eval-1.4.1}/setup.cfg +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: faster-coco-eval
3
- Version: 1.3.3
3
+ Version: 1.4.1
4
4
  Summary: Faster interpretation of the original COCOEval
5
5
  Home-page: https://github.com/MiXaiLL76/faster_coco_eval
6
6
  Author: MiXaiLL76
@@ -16,8 +16,10 @@ Classifier: Programming Language :: Python :: 3.10
16
16
  Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
17
17
  Requires-Python: >=3.7
18
18
  Description-Content-Type: text/markdown
19
- Provides-Extra: all
20
19
  License-File: LICENSE
20
+ Requires-Dist: numpy
21
+ Requires-Dist: plotly
22
+ Requires-Dist: Pillow
21
23
 
22
24
  # Faster-COCO-Eval
23
25
 
@@ -41,10 +43,10 @@ Testing was carried out using the mmdetection framework and the eval_metric.py s
41
43
  Visualization of testing **comparison.ipynb** available in directory [examples/comparison](./examples/comparison/comparison.ipynb)
42
44
  Tested with yolo3 model (bbox eval) and yoloact model (segm eval)
43
45
 
44
- | Type | COCOeval | COCOeval_faster | Profit |
45
- | ---- | ----------- | --------------- | ------------ |
46
- | bbox | 18.477 sec. | 7.345 sec. | 2.5x faster |
47
- | segm | 29.819 sec. | 15.840 sec. | 2x faster |
46
+ | Type | COCOeval | COCOeval_faster | Profit |
47
+ | ---- | ----------- | --------------- | ----------- |
48
+ | bbox | 18.477 sec. | 7.345 sec. | 2.5x faster |
49
+ | segm | 29.819 sec. | 15.840 sec. | 2x faster |
48
50
 
49
51
  ## Usage
50
52
 
@@ -69,7 +71,7 @@ cocoGt = COCO(....)
69
71
  cocoDt = cocoGt.loadRes(....)
70
72
 
71
73
  cur = Curves(cocoGt, cocoDt, iou_tresh=0.5, iouType='segm')
72
- cur.plot_pre_rec(plotly_backend=False)
74
+ cur.plot_pre_rec()
73
75
  ````
74
76
 
75
77
  ## Setup dependencies
@@ -79,6 +81,25 @@ cur.plot_pre_rec(plotly_backend=False)
79
81
 
80
82
  ## history
81
83
 
84
+ ### v1.4.1
85
+
86
+ - [x] append Plotly fig return
87
+ - [x] append preview GT only func. Without eval.
88
+
89
+ ```py
90
+ cocoGt = COCO(...)
91
+ preview = PreviewResults(cocoGt, iouType='segm')
92
+ preview.display_tp_fp_fn(data_folder=..., image_ids=..., display_gt=True)
93
+ ```
94
+
95
+ ### v1.4.0
96
+
97
+ - [x] fix issue <https://github.com/MiXaiLL76/faster_coco_eval/issues/12>
98
+ - [x] Updated pre-rec calculation method
99
+ - [x] Updated required libraries
100
+ - [x] Moved all matplotlib dependencies to plotly
101
+ - [x] Append new examples & mmeval test file
102
+
82
103
  ### v1.3.3
83
104
 
84
105
  - [x] fix by ViTrox <https://github.com/vitrox-technologies/faster_coco_eval>
@@ -156,11 +177,6 @@ cur.plot_pre_rec(plotly_backend=False)
156
177
  - [x] Append ROC / AUC curves
157
178
  - [x] Check if it works on windows
158
179
 
159
- ### TODOs
160
-
161
- - [X] Remove pycocotools dependencies
162
- - [ ] Remove matplotlib dependencies
163
-
164
180
  ## License
165
181
 
166
182
  The original module was licensed with apache 2, I will continue with the same license.
@@ -20,10 +20,10 @@ Testing was carried out using the mmdetection framework and the eval_metric.py s
20
20
  Visualization of testing **comparison.ipynb** available in directory [examples/comparison](./examples/comparison/comparison.ipynb)
21
21
  Tested with yolo3 model (bbox eval) and yoloact model (segm eval)
22
22
 
23
- | Type | COCOeval | COCOeval_faster | Profit |
24
- | ---- | ----------- | --------------- | ------------ |
25
- | bbox | 18.477 sec. | 7.345 sec. | 2.5x faster |
26
- | segm | 29.819 sec. | 15.840 sec. | 2x faster |
23
+ | Type | COCOeval | COCOeval_faster | Profit |
24
+ | ---- | ----------- | --------------- | ----------- |
25
+ | bbox | 18.477 sec. | 7.345 sec. | 2.5x faster |
26
+ | segm | 29.819 sec. | 15.840 sec. | 2x faster |
27
27
 
28
28
  ## Usage
29
29
 
@@ -48,7 +48,7 @@ cocoGt = COCO(....)
48
48
  cocoDt = cocoGt.loadRes(....)
49
49
 
50
50
  cur = Curves(cocoGt, cocoDt, iou_tresh=0.5, iouType='segm')
51
- cur.plot_pre_rec(plotly_backend=False)
51
+ cur.plot_pre_rec()
52
52
  ````
53
53
 
54
54
  ## Setup dependencies
@@ -58,6 +58,25 @@ cur.plot_pre_rec(plotly_backend=False)
58
58
 
59
59
  ## history
60
60
 
61
+ ### v1.4.1
62
+
63
+ - [x] append Plotly fig return
64
+ - [x] append preview GT only func. Without eval.
65
+
66
+ ```py
67
+ cocoGt = COCO(...)
68
+ preview = PreviewResults(cocoGt, iouType='segm')
69
+ preview.display_tp_fp_fn(data_folder=..., image_ids=..., display_gt=True)
70
+ ```
71
+
72
+ ### v1.4.0
73
+
74
+ - [x] fix issue <https://github.com/MiXaiLL76/faster_coco_eval/issues/12>
75
+ - [x] Updated pre-rec calculation method
76
+ - [x] Updated required libraries
77
+ - [x] Moved all matplotlib dependencies to plotly
78
+ - [x] Append new examples & mmeval test file
79
+
61
80
  ### v1.3.3
62
81
 
63
82
  - [x] fix by ViTrox <https://github.com/vitrox-technologies/faster_coco_eval>
@@ -135,11 +154,6 @@ cur.plot_pre_rec(plotly_backend=False)
135
154
  - [x] Append ROC / AUC curves
136
155
  - [x] Check if it works on windows
137
156
 
138
- ### TODOs
139
-
140
- - [X] Remove pycocotools dependencies
141
- - [ ] Remove matplotlib dependencies
142
-
143
157
  ## License
144
158
 
145
159
  The original module was licensed with apache 2, I will continue with the same license.
@@ -548,14 +548,11 @@ namespace coco_eval
548
548
 
549
549
  std::vector<uint64_t> out_detection_matches = {};
550
550
  std::vector<uint64_t> out_ground_truth_matches = {};
551
- std::vector<uint64_t> out_detection_ignores = {};
552
551
  std::vector<int> out_ground_truth_orig_id = {};
553
- // auto eval = evaluations[0];
554
552
  for (auto eval : evaluations)
555
553
  {
556
554
  out_detection_matches.insert(out_detection_matches.end(), eval.detection_matches.begin(), eval.detection_matches.end());
557
555
  out_ground_truth_matches.insert(out_ground_truth_matches.end(), eval.ground_truth_matches.begin(), eval.ground_truth_matches.end());
558
- out_detection_ignores.insert(out_detection_ignores.end(), eval.detection_ignores.begin(), eval.detection_ignores.end());
559
556
  out_ground_truth_orig_id.insert(out_ground_truth_orig_id.end(), eval.ground_truth_orig_id.begin(), eval.ground_truth_orig_id.end());
560
557
  }
561
558
 
@@ -571,7 +568,7 @@ namespace coco_eval
571
568
  "recall"_a = recalls_out,
572
569
  "scores"_a = scores_out,
573
570
  "detection_matches"_a = out_detection_matches,
574
- "detection_ignores"_a = out_detection_ignores,
571
+ // "detection_ignores"_a = out_detection_ignores,
575
572
  "ground_truth_matches"_a = out_ground_truth_matches,
576
573
  "ground_truth_orig_id"_a = out_ground_truth_orig_id,
577
574
  "evaluations_size"_a = evaluations_size);
@@ -51,11 +51,11 @@ namespace coco_eval
51
51
  pybind11::class_<COCOeval::InstanceAnnotation>(m, "InstanceAnnotation").def(pybind11::init<uint64_t, double, double, bool, bool>());
52
52
  pybind11::class_<COCOeval::ImageEvaluation>(m, "ImageEvaluation").def(pybind11::init<>());
53
53
 
54
- #ifdef VERSION_INFO
55
- m.attr("__version__") = MACRO_STRINGIFY(VERSION_INFO);
56
- #else
57
- m.attr("__version__") = "dev";
58
- #endif
54
+ #ifdef VERSION_INFO
55
+ m.attr("__version__") = MACRO_STRINGIFY(VERSION_INFO);
56
+ #else
57
+ m.attr("__version__") = "dev";
58
+ #endif
59
59
  }
60
60
 
61
61
  } // namespace coco_eval