Skip to content

Commit

Permalink
Pull request #18: Release/0.2.1
Browse files Browse the repository at this point in the history 
Update detection demo
  • Loading branch information
Gedicke, Thorsten (EFS-GKE02) authored and Gedicke, Thorsten (EFS-GKE02) committed Jun 11, 2024
1 parent 45f6e3f commit 21c2f79
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
1 change: 1 addition & 0 deletions examples/demo_config_detection.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ task_settings:
detection_bbox_ious: [0.5, 0.75]
detection_bbox_matching: "exclusive"
detection_bbox_probabilistic: false
detection_bbox_clipping: 40%
distinct_classes: ["person", "car"]

# in detection mode, it is possible to set a confidence threshold
Expand Down
8 changes: 4 additions & 4 deletions examples/demo_license_detection.dat
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<LicenseKey>
<Info>
<Id>baca5f5e-65cb-494c-a775-bdcb25a92c71</Id>
<Features>Thetis:detection Thetis:data_evaluation Thetis:performance Thetis:fairness Thetis:uncertainty Thetis:annotations:91af544a73a0c303a624b94b6ede0fe1</Features>
<Id>61369fab-d9f9-4cc6-8b59-64a014d7bcd2</Id>
<Features>Thetis:detection Thetis:data_evaluation Thetis:performance Thetis:fairness Thetis:uncertainty Thetis:annotations:99f9f701bad4e5f9d6b9754fcf738e1b</Features>
<Licensee>
<CompanyName>Jon Doe Company</CompanyName>
<ContactName>Jon Doe</ContactName>
Expand All @@ -28,6 +28,6 @@
<LicenseBinding />
<Seats>1</Seats>
</Info>
<Key>PExpY2Vuc2VJbmZvPg0KICA8SWQ+YmFjYTVmNWUtNjVjYi00OTRjLWE3NzUtYmRjYjI1YTkyYzcxPC9JZD4NCiAgPEZlYXR1cmVzPlRoZXRpczpkZXRlY3Rpb24gVGhldGlzOmRhdGFfZXZhbHVhdGlvbiBUaGV0aXM6cGVyZm9ybWFuY2UgVGhldGlzOmZhaXJuZXNzIFRoZXRpczp1bmNlcnRhaW50eSBUaGV0aXM6YW5ub3RhdGlvbnM6OTFhZjU0NGE3M2EwYzMwM2E2MjRiOTRiNmVkZTBmZTE8L0ZlYXR1cmVzPg0KICA8TGljZW5zZWU+DQogICAgPENvbXBhbnlOYW1lPkpvbiBEb2UgQ29tcGFueTwvQ29tcGFueU5hbWU+DQogICAgPENvbnRhY3ROYW1lPkpvbiBEb2U8L0NvbnRhY3ROYW1lPg0KICAgIDxBZGRyZXNzTGluZXM+DQogICAgICA8c3RyaW5nPkV4YW1wbGUgU3RyZWV0IDQyPC9zdHJpbmc+DQogICAgPC9BZGRyZXNzTGluZXM+DQogICAgPFBvc3RhbENvZGU+MTIzNDU8L1Bvc3RhbENvZGU+DQogICAgPENpdHk+RXhhbXBsZSBDaXR5PC9DaXR5Pg0KICAgIDxDb3VudHJ5Pkdlcm1hbnk8L0NvdW50cnk+DQogIDwvTGljZW5zZWU+DQogIDxMaWNlbnNlcj4NCiAgICA8Q29tcGFueU5hbWU+ZTpmcyBUZWNoSHViIEdtYkg8L0NvbXBhbnlOYW1lPg0KICAgIDxBZGRyZXNzTGluZXM+DQogICAgICA8c3RyaW5nPkRyLi1MdWR3aWctS3JhdXMtU3RyLiA2PC9zdHJpbmc+DQogICAgPC9BZGRyZXNzTGluZXM+DQogICAgPFBvc3RhbENvZGU+ODUwODA8L1Bvc3RhbENvZGU+DQogICAgPENpdHk+R2FpbWVyc2hlaW08L0NpdHk+DQogICAgPENvdW50cnk+R2VybWFueTwvQ291bnRyeT4NCiAgPC9MaWNlbnNlcj4NCiAgPEV4cGlyeURhdGU+MjAyNC0xMi0zMVQwMDowMDowMDwvRXhwaXJ5RGF0ZT4NCiAgPE5vdGVzPg0KICAgIDxzdHJpbmc+RXZhbHVhdGlvbiBsaWNlbnNlLiBUaGUgdGVybXMgb2YgdGhlIGV2YWx1YXRpb24gdmVyc2lvbiBsaWNlbnNlIGFncmVlbWVudCBhcHBseS48L3N0cmluZz4NCiAgPC9Ob3Rlcz4NCiAgPExpY2Vuc2VCaW5kaW5nIC8+DQogIDxTZWF0cz4xPC9TZWF0cz4NCjwvTGljZW5zZUluZm8+</Key>
<Signature>OOOIhhIDosi8emYJuzHEopAf5KHrjjNlgiqQQyk9uCMCWAks4IiyOgpkuVjfNQ7CA0TsYsRJhmyv60D6KkN/QlHseMiBnVUweSPpPrIDBp8l/PwLGlxkuYiCoLHdTDfI22F0d5W+IuoluCNJtXteYF+7YXfJYhQFHpFRpXtWocDwhHyPE8I33jrEyZ6jgXRcEXOMoG8EJjlEJLxuJ5Kl5rU/2q7MrnDs731p7gaGIJj4Rixs1L+B9Jk+10kCiCjuNtc7b5elVeoOuumzC2UNzLAVZIcXnsnwM+q1uIq6HR4BP10f3G89+GJ/3+58bzgg+oNvvK9ILF1D8arqhmP23NG9dolKSHdfh7rSIVTVLySAlNGKGqr1xb74YTZyiX2JBRU9ATTlCinvh6Q03dXdyOBg2FDMLUcZhdbBik+ihkQDM0q+Vk9QuV/BhUoTz+wcDM0WzHaU4ZvlpiWQeMUBQLwgGkdQWOqxPPOeyHTWcl6pBqUBETvJkAqXcK0s/K+dADgl7nPQHFPw4xQaz9kfNn9HiFjr7VbYNRDXeVvOvDB0CsCSDUMdl9R/Jal3frpfaRDs3MkAfQHS0MJxjgKsl8ErfoZahJYZ21IxKsGU4vyP4FNdYzmwJjPg9CwDydL4iPhUGDhauhFMC1ZplQzyPLg4kX5YgeXfIF1rxn8zLjE=</Signature>
<Key>PExpY2Vuc2VJbmZvPg0KICA8SWQ+NjEzNjlmYWItZDlmOS00Y2M2LThiNTktNjRhMDE0ZDdiY2QyPC9JZD4NCiAgPEZlYXR1cmVzPlRoZXRpczpkZXRlY3Rpb24gVGhldGlzOmRhdGFfZXZhbHVhdGlvbiBUaGV0aXM6cGVyZm9ybWFuY2UgVGhldGlzOmZhaXJuZXNzIFRoZXRpczp1bmNlcnRhaW50eSBUaGV0aXM6YW5ub3RhdGlvbnM6OTlmOWY3MDFiYWQ0ZTVmOWQ2Yjk3NTRmY2Y3MzhlMWI8L0ZlYXR1cmVzPg0KICA8TGljZW5zZWU+DQogICAgPENvbXBhbnlOYW1lPkpvbiBEb2UgQ29tcGFueTwvQ29tcGFueU5hbWU+DQogICAgPENvbnRhY3ROYW1lPkpvbiBEb2U8L0NvbnRhY3ROYW1lPg0KICAgIDxBZGRyZXNzTGluZXM+DQogICAgICA8c3RyaW5nPkV4YW1wbGUgU3RyZWV0IDQyPC9zdHJpbmc+DQogICAgPC9BZGRyZXNzTGluZXM+DQogICAgPFBvc3RhbENvZGU+MTIzNDU8L1Bvc3RhbENvZGU+DQogICAgPENpdHk+RXhhbXBsZSBDaXR5PC9DaXR5Pg0KICAgIDxDb3VudHJ5Pkdlcm1hbnk8L0NvdW50cnk+DQogIDwvTGljZW5zZWU+DQogIDxMaWNlbnNlcj4NCiAgICA8Q29tcGFueU5hbWU+ZTpmcyBUZWNoSHViIEdtYkg8L0NvbXBhbnlOYW1lPg0KICAgIDxBZGRyZXNzTGluZXM+DQogICAgICA8c3RyaW5nPkRyLi1MdWR3aWctS3JhdXMtU3RyLiA2PC9zdHJpbmc+DQogICAgPC9BZGRyZXNzTGluZXM+DQogICAgPFBvc3RhbENvZGU+ODUwODA8L1Bvc3RhbENvZGU+DQogICAgPENpdHk+R2FpbWVyc2hlaW08L0NpdHk+DQogICAgPENvdW50cnk+R2VybWFueTwvQ291bnRyeT4NCiAgPC9MaWNlbnNlcj4NCiAgPEV4cGlyeURhdGU+MjAyNC0xMi0zMVQwMDowMDowMDwvRXhwaXJ5RGF0ZT4NCiAgPE5vdGVzPg0KICAgIDxzdHJpbmc+RXZhbHVhdGlvbiBsaWNlbnNlLiBUaGUgdGVybXMgb2YgdGhlIGV2YWx1YXRpb24gdmVyc2lvbiBsaWNlbnNlIGFncmVlbWVudCBhcHBseS48L3N0cmluZz4NCiAgPC9Ob3Rlcz4NCiAgPExpY2Vuc2VCaW5kaW5nIC8+DQogIDxTZWF0cz4xPC9TZWF0cz4NCjwvTGljZW5zZUluZm8+</Key>
<Signature>T55GCXI7xrqVidqmIzM8Yv8I0QtOWVauIMdn4soP/+BqsFyz+51NsJJKBEQqot4eUO171S5+lfPwQAX87ED2AJbElMspRvPkLU/DKkRa9Z8F4j9fmTbGns0rcYyiYkCsIztiixTeNfgUyXz1IkMui0TZ4Eiig4Ds0yRRck0dNzFKgKPNwKu25TRGEyImYAgOXiYR0b20NQRVfIvrkheUAel8m1JoMARfXF0xjHQSMIsXAN7Zp0fhuYFo6YoG+TNwomsaVijKzwibYYyhJ8JVcUuq4abUy3JsL/U4cMX5e6vfwkIEgz7+rcvh9Y5fO+HfvWJy2IKlrPq/JiftnPz1/iLC1pOl5NcLBLLyvhAiC1jFp560DsMxR3+M9Dr2KmyJKLIlbaGCno7/fzyJ7VnDA6hzQn7HY1FP63kjRgZhsJGROvKH/SDla+bSfWS3w7atGRylK3rp1bql9IDei/jL3VXJ7OtURjJFUA7GdEEmqD8t5WOkXjzcHAkf84zpHJY4DB230ujGYxvXpt7f1376+xSGZYs/RCF8hW5Jq3AvEJzay+bdTjuxIfEFavokOsLgOtr6K279kUUHUz94SVrh1NIQpx9MbQ84S894dM6ABHgf2cJmrI1KHKu3BunNSLzSeLGmTbKmYjzn+cwQ7EonsOQ9k7tFVIoDRTcIubASsa0=</Signature>
</LicenseKey>
4 changes: 2 additions & 2 deletions examples/detection.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@
" predicted_labels = categories[pred[\"labels\"].numpy()]\n",
" predicted_boxes = pred[\"boxes\"].numpy().reshape((-1, 4))\n",
" target_boxes = np.array(anns[\"boxes\"]).reshape((-1, 4))\n",
" filter = np.isin(predicted_labels, [\"person\", \"bicycle\", \"car\"])\n",
" filter = np.isin(predicted_labels, [\"person\", \"car\"])\n",
" filename = anns[\"image_file\"]\n",
"\n",
" # add predicted information as pd.DataFrame\n",
Expand Down Expand Up @@ -258,7 +258,7 @@
"metadata": {},
"outputs": [],
"source": [
"from thetiscore.io import write_json_with_pandas, read_json_with_pandas\n",
"from thetis.io import write_json_with_pandas, read_json_with_pandas\n",
"\n",
"# write the JSON-like Python dictionary to disk\n",
"write_json_with_pandas(\n",
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
thetiscore==0.2.0
thetiscore==0.2.1
2 changes: 1 addition & 1 deletion thetis/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@
from .mlflow import thetis_mlflow

name = "thetis"
__version__ = "0.2.0"
__version__ = "0.2.1"

0 comments on commit 21c2f79

Please sign in to comment.