Visitar URL original
2.2rc2 · github2016-yuan/DeepLabCut@5318f79 · GitHub
Skip to content

Commit 5318f79

Browse files
AlexEMGAlexEMG
committed
2.2rc2
1 parent b07e67b commit 5318f79

8 files changed

Lines changed: 16 additions & 17 deletions

File tree

‎deeplabcut/generate_training_dataset/multiple_individuals_trainingsetmanipulation.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,9 @@ def create_multianimaltraining_dataset(
125125
but train & evaluate on a unix system (e.g. ubunt, colab, Mac) set this variable to True to convert the paths.
126126
127127
net_type: string
128-
Type of networks. Currently resnet_50, resnet_101, and resnet_152 are supported (not the MobileNets!)
128+
Type of networks. Currently resnet_50, resnet_101, and resnet_152, efficientnet-b0, efficientnet-b1, efficientnet-b2, efficientnet-b3,
129+
efficientnet-b4, efficientnet-b5, and efficientnet-b6 as well as dlcrnet_ms5 are supported (not the MobileNets!).
130+
See Lauer et al. 2021 https://www.biorxiv.org/content/10.1101/2021.04.30.442096v1
129131
130132
numdigits: int, optional
131133

‎deeplabcut/pose_estimation_tensorflow/train_multianimal.py‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -197,13 +197,7 @@ def train(
197197
sess.run(TF.global_variables_initializer())
198198
sess.run(TF.local_variables_initializer())
199199

200-
# Restore variables from disk.
201-
if "efficientnet" in net_type:
202-
init_weights = os.path.join(cfg["init_weights"], "model.ckpt")
203-
else:
204-
init_weights = cfg["init_weights"]
205-
206-
restorer.restore(sess, init_weights)
200+
restorer.restore(sess, cfg["init_weights"])
207201
if maxiters == None:
208202
max_iter = int(cfg["multi_step"][-1][1])
209203
else:

‎deeplabcut/version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
Licensed under GNU Lesser General Public License v3.0
99
"""
1010

11-
__version__ = "2.2rc1"
11+
__version__ = "2.2rc2"
1212
VERSION = __version__

‎examples/test.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ rm -r OUT
66
cd ..
77
pip uninstall deeplabcut
88
python3 setup.py sdist bdist_wheel
9-
pip install dist/deeplabcut-2.2rc1-py3-none-any.whl
9+
pip install dist/deeplabcut-2.2rc2-py3-none-any.whl
1010

1111
cd examples
1212

‎examples/testscript.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
dfolder = basepath
4343

4444
dfolder = None
45-
net_type = "resnet_50" #'mobilenet_v2_0.35' #'resnet_50'
46-
# net_type = "mobilenet_v2_0.35"
47-
# net_type = "efficientnet-b0" # to -b6
45+
net_type = "resnet_50"
46+
#net_type = "mobilenet_v2_0.35"
47+
#net_type = "efficientnet-b0" # to -b6
4848

4949
augmenter_type = "default" # = imgaug!!
5050
augmenter_type2 = "scalecrop"

‎examples/testscript_multianimal.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@
1111
NUM_FRAMES = 5
1212
TRAIN_SIZE = 0.8
1313
NET = "dlcrnet_ms5"
14-
# NET = "efficientnet-b0"
14+
#NET = "resnet_152"
15+
#NET = "efficientnet-b0"
16+
#NET = "mobilenet_v2_0.35" # should be fixed
17+
1518
N_ITER = 5
1619

1720
basepath = os.path.dirname(os.path.realpath(__file__))
@@ -123,7 +126,7 @@
123126

124127
print("Analyzing video...")
125128
deeplabcut.analyze_videos(config_path, [new_video_path], "mp4", robust_nframes=True,allow_growth=True)
126-
129+
127130
print("Video analyzed.")
128131

129132
print("Create video with all detections...")

‎reinstall.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
pip uninstall deeplabcut
22
python3 setup.py sdist bdist_wheel
3-
pip install dist/deeplabcut-2.2rc1-py3-none-any.whl
3+
pip install dist/deeplabcut-2.2rc2-py3-none-any.whl

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
setuptools.setup(
1919
name="deeplabcut",
20-
version="2.2rc1",
20+
version="2.2rc2",
2121
author="A. & M. Mathis Labs",
2222
author_email="alexander@deeplabcut.org",
2323
description="Markerless pose-estimation of user-defined features with deep learning",

0 commit comments

Comments
 (0)