megadetector 10.0.0__py3-none-any.whl → 10.0.2__py3-none-any.whl

megadetector/detection/run_detector.py

@@ -97,6 +97,8 @@ model_string_to_model_version = {
     'v4.1':'v4.1.0',
     'v5a.0.0':'v5a.0.1',
     'v5b.0.0':'v5b.0.1',
+    'v5a.0.1':'v5a.0.1',
+    'v5b.0.1':'v5b.0.1',
 
     'md1000-redwood':'v1000.0.0-redwood',
     'md1000-cedar':'v1000.0.0-cedar',
@@ -405,12 +407,17 @@ def get_detector_version_from_model_file(detector_filename,verbose=False):
        (version_string_based_on_model_file is not None):
 
         if version_string_based_on_filename != version_string_based_on_model_file:
-            print(
-                'Warning: model version string in file:' + \
-                 '\n\n{}\n\n...is:\n\n{}\n\n...but the filename implies:\n\n{}'.format(
-                os.path.basename(detector_filename),
-                version_string_based_on_model_file,
-                version_string_based_on_filename))
+            # This is a one-off special case where models were re-released with different filenames
+            if (version_string_based_on_filename in ('v5a.0.1','v5b.0.1')) and \
+                (version_string_based_on_model_file in ('v5a.0.0','v5b.0.0')):
+                pass
+            else:
+                print(
+                    'Warning: model version string in file:' + \
+                    '\n\n{}\n\n...is:\n\n{}\n\n...but the filename implies:\n\n{}'.format(
+                    os.path.basename(detector_filename),
+                    version_string_based_on_model_file,
+                    version_string_based_on_filename))
 
         return version_string_based_on_model_file
 

{megadetector-10.0.0.dist-info → megadetector-10.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: megadetector
-Version: 10.0.0
+Version: 10.0.2
 Summary: MegaDetector is an AI model that helps conservation folks spend less time doing boring things with camera trap images.
 Author-email: Your friendly neighborhood MegaDetector team <cameratraps@lila.science>
 Maintainer-email: Your friendly neighborhood MegaDetector team <cameratraps@lila.science>

{megadetector-10.0.0.dist-info → megadetector-10.0.2.dist-info}/RECORD

@@ -72,7 +72,7 @@ megadetector/detection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 megadetector/detection/change_detection.py,sha256=Ne3GajbH_0KPBU8ruHp4Rkr0uKd5oKAMQ3CQTRKRHgQ,28659
 megadetector/detection/process_video.py,sha256=yc5TdaCxUX1dBzckXwp0b7ehXjfNqAIAjQIFG5qDEy4,52388
 megadetector/detection/pytorch_detector.py,sha256=-0b016Oyv0IlQcRvvKnK7m0ab0aTnPBn30KLTDc230k,46861
-megadetector/detection/run_detector.py,sha256=mFnGU3D6jZuLTatuszftWpwf8qC_nA5rJv1HRjhL9F4,46479
+megadetector/detection/run_detector.py,sha256=TTX29zxDN_O7ja61sOmMIVewUz3yRvKg1D1AAYhVEkc,46851
 megadetector/detection/run_detector_batch.py,sha256=RCpGHW-WSCr87JNcG6Iuumtx30auXnSWWl4CbueCUSs,72863
 megadetector/detection/run_inference_with_yolov5_val.py,sha256=A-AQuARVVy7oR9WtenCZwzvd5U3HQwihMr4Jkiv9U0g,53515
 megadetector/detection/run_tiled_inference.py,sha256=wrQkKIloHBO9v2i0nZ1_Tt75iFtVrnco3Y4FafoVxdw,39382
@@ -132,8 +132,8 @@ megadetector/visualization/render_images_with_thumbnails.py,sha256=-XX4PG4wnrFjF
 megadetector/visualization/visualization_utils.py,sha256=_f8x6Tx5mWeGYpvTbkBDOGGaxenK-qPi2ba3ndOLQDk,75865
 megadetector/visualization/visualize_db.py,sha256=DTqeLPqtSdY-DVAUJpGxkcHPnXHI5WJifsTuWoDKaRY,25951
 megadetector/visualization/visualize_detector_output.py,sha256=BBX93VFHJubMJVH0h-QNncS_VypOitPFHV_mv4NPqy0,20217
-megadetector-10.0.0.dist-info/licenses/LICENSE,sha256=RMa3qq-7Cyk7DdtqRj_bP1oInGFgjyHn9-PZ3PcrqIs,1100
-megadetector-10.0.0.dist-info/METADATA,sha256=nRDKdsXF-B_Zfio310mRuoxfsy1usVmYtTlvyTJW5X4,6519
-megadetector-10.0.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-megadetector-10.0.0.dist-info/top_level.txt,sha256=wf9DXa8EwiOSZ4G5IPjakSxBPxTDjhYYnqWRfR-zS4M,13
-megadetector-10.0.0.dist-info/RECORD,,
+megadetector-10.0.2.dist-info/licenses/LICENSE,sha256=RMa3qq-7Cyk7DdtqRj_bP1oInGFgjyHn9-PZ3PcrqIs,1100
+megadetector-10.0.2.dist-info/METADATA,sha256=Z41AqH5aDP2TSSyvCd3lWdhFq4XjfJgM6Ts4l0wzJeo,6519
+megadetector-10.0.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+megadetector-10.0.2.dist-info/top_level.txt,sha256=wf9DXa8EwiOSZ4G5IPjakSxBPxTDjhYYnqWRfR-zS4M,13
+megadetector-10.0.2.dist-info/RECORD,,