2.2rc2

KwanHoo · May 27, 2021 · 5318f79 · 5318f79
1 parent b07e67b
commit 5318f79
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 17 deletions.
diff --git a/deeplabcut/generate_training_dataset/multiple_individuals_trainingsetmanipulation.py b/deeplabcut/generate_training_dataset/multiple_individuals_trainingsetmanipulation.py
@@ -125,7 +125,9 @@ def create_multianimaltraining_dataset(
         but train & evaluate on a unix system (e.g. ubunt, colab, Mac) set this variable to True to convert the paths.
 
     net_type: string
-        Type of networks. Currently resnet_50, resnet_101, and resnet_152 are supported (not the MobileNets!)
+        Type of networks. Currently resnet_50, resnet_101, and resnet_152, efficientnet-b0, efficientnet-b1, efficientnet-b2, efficientnet-b3,
+        efficientnet-b4, efficientnet-b5, and efficientnet-b6 as well as dlcrnet_ms5 are supported (not the MobileNets!).
+        See Lauer et al. 2021 https://www.biorxiv.org/content/10.1101/2021.04.30.442096v1
 
     numdigits: int, optional
 

diff --git a/deeplabcut/pose_estimation_tensorflow/train_multianimal.py b/deeplabcut/pose_estimation_tensorflow/train_multianimal.py
@@ -197,13 +197,7 @@ def train(
     sess.run(TF.global_variables_initializer())
     sess.run(TF.local_variables_initializer())
 
-    # Restore variables from disk.
-    if "efficientnet" in net_type:
-        init_weights = os.path.join(cfg["init_weights"], "model.ckpt")
-    else:
-        init_weights = cfg["init_weights"]
-
-    restorer.restore(sess, init_weights)
+    restorer.restore(sess, cfg["init_weights"])
     if maxiters == None:
         max_iter = int(cfg["multi_step"][-1][1])
     else:

diff --git a/deeplabcut/version.py b/deeplabcut/version.py
@@ -8,5 +8,5 @@
 Licensed under GNU Lesser General Public License v3.0
 """
 
-__version__ = "2.2rc1"
+__version__ = "2.2rc2"
 VERSION = __version__
diff --git a/examples/test.sh b/examples/test.sh
@@ -6,7 +6,7 @@ rm -r OUT
 cd ..
 pip uninstall deeplabcut
 python3 setup.py sdist bdist_wheel
-pip install dist/deeplabcut-2.2rc1-py3-none-any.whl
+pip install dist/deeplabcut-2.2rc2-py3-none-any.whl
 
 cd examples
 

diff --git a/examples/testscript.py b/examples/testscript.py
@@ -42,9 +42,9 @@
     dfolder = basepath
 
     dfolder = None
-    net_type = "resnet_50"  #'mobilenet_v2_0.35' #'resnet_50'
-    # net_type = "mobilenet_v2_0.35"
-    # net_type = "efficientnet-b0"  # to -b6
+    net_type = "resnet_50"  
+    #net_type = "mobilenet_v2_0.35"
+    #net_type = "efficientnet-b0"  # to -b6
 
     augmenter_type = "default"  # = imgaug!!
     augmenter_type2 = "scalecrop"

diff --git a/examples/testscript_multianimal.py b/examples/testscript_multianimal.py
@@ -11,7 +11,10 @@
     NUM_FRAMES = 5
     TRAIN_SIZE = 0.8
     NET = "dlcrnet_ms5"
-    # NET = "efficientnet-b0"
+    #NET = "resnet_152"
+    #NET = "efficientnet-b0"
+    #NET = "mobilenet_v2_0.35" # should be fixed
+
     N_ITER = 5
 
     basepath = os.path.dirname(os.path.realpath(__file__))
@@ -123,7 +126,7 @@
 
     print("Analyzing video...")
     deeplabcut.analyze_videos(config_path, [new_video_path], "mp4", robust_nframes=True,allow_growth=True)
-    
+
     print("Video analyzed.")
 
     print("Create video with all detections...")

diff --git a/reinstall.sh b/reinstall.sh
@@ -1,3 +1,3 @@
 pip uninstall deeplabcut
 python3 setup.py sdist bdist_wheel
-pip install dist/deeplabcut-2.2rc1-py3-none-any.whl
+pip install dist/deeplabcut-2.2rc2-py3-none-any.whl
diff --git a/setup.py b/setup.py
@@ -17,7 +17,7 @@
 
 setuptools.setup(
     name="deeplabcut",
-    version="2.2rc1",
+    version="2.2rc2",
     author="A. & M. Mathis Labs",
     author_email="[email protected]",
     description="Markerless pose-estimation of user-defined features with deep learning",