Skip to content

Commit 072c040

Browse files
jeylauAlexEMGMMathisLab
authored
Add dlclibrary for model download from zoo (#2088)
* Remove tools folder * Add dlclibrary for model download from zoo * also remove old weight download function * Add dlclibrary to setup.py * Update branch name to "main" in GitHub's CI workflow (#2089) (#2092) * Update branch name * Remove GUI-related deps from requirements.txt * Update actions' versions Co-authored-by: Jessy Lauer <30733203+jeylau@users.noreply.github.com> * put tools back * updated headers. * update requirements for CLI * fix trailing """ * model zoo unit-test * DLC 2.3 Co-authored-by: Alexander Mathis <alexander@deeplabcut.org> Co-authored-by: Mackenzie Mathis <mathis@rowland.harvard.edu>
1 parent 8945e24 commit 072c040

185 files changed

Lines changed: 1854 additions & 820 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎NOTICE.yml‎

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# This notice file contains license headers for all code files
22
# in the repository (currently all *.py files).
3-
#
3+
#
44
# When updating headers, lower entries take precedence over higher
55
# entries. For each header, include/exclude statements can be used
66
# to define files to apply them to.
77
#
8-
# When adding code from an external repo, make sure to cover the
8+
# When adding code from an external repo, make sure to cover the
99
# added code files with the correct license header.
1010

1111
# Main repository license
@@ -20,7 +20,7 @@
2020
Licensed under GNU Lesser General Public License v3.0
2121
include:
2222
- 'deeplabcut/**/*.py'
23-
- 'tests/**/*.py'
23+
- 'tests/**/*.py'
2424
- 'examples/**/*.py'
2525
- 'docs/**/*.py'
2626
- 'conda-environments/**/*.yaml'
@@ -61,13 +61,13 @@
6161
# Tensorflow licenses
6262
- header: |
6363
Copyright 2019 The TensorFlow Authors. All Rights Reserved.
64-
64+
6565
Licensed under the Apache License, Version 2.0 (the "License");
6666
you may not use this file except in compliance with the License.
6767
You may obtain a copy of the License at
68-
68+
6969
http://www.apache.org/licenses/LICENSE-2.0
70-
70+
7171
Unless required by applicable law or agreed to in writing, software
7272
distributed under the License is distributed on an "AS IS" BASIS,
7373
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -85,7 +85,7 @@
8585
You may obtain a copy of the License at
8686
8787
http://www.apache.org/licenses/LICENSE-2.0
88-
88+
8989
Unless required by applicable law or agreed to in writing, software
9090
distributed under the License is distributed on an "AS IS" BASIS,
9191
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -116,3 +116,23 @@
116116
https://github.com/rwightman/pytorch-image-models/blob/main/timm/scheduler/scheduler_factory.py
117117
include:
118118
- deeplabcut/pose_tracking_pytorch/solver/scheduler_factory.py
119+
- deeplabcut/pose_tracking_pytorch/model/backones/vit_pytorch.py
120+
121+
# Reranking
122+
- header: |
123+
"""
124+
CVPR2017 paper:Zhong Z, Zheng L, Cao D, et al. Re-ranking Person Re-identification with k-reciprocal Encoding[J]. 2017.
125+
url:http://openaccess.thecvf.com/content_cvpr_2017/papers/Zhong_Re-Ranking_Person_Re-Identification_CVPR_2017_paper.pdf
126+
Matlab version: https://github.com/zhunzhong07/person-re-ranking
127+
128+
API
129+
130+
probFea: all feature vectors of the query set (torch tensor)
131+
probFea: all feature vectors of the gallery set (torch tensor)
132+
k1,k2,lambda: parameters, the original paper is (k1=20,k2=6,lambda=0.3)
133+
MemorySave: set to 'True' when using MemorySave mode
134+
Minibatch: available when 'MemorySave' is 'True'
135+
"""
136+
137+
include:
138+
- deeplabcut/pose_tracking_pytorch/trackingutils/reranking.py

‎deeplabcut/__init__.py‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
"""
2-
DeepLabCut2.0 Toolbox (deeplabcut.org)
3-
© A. & M. Mathis Labs
4-
https://github.com/DeepLabCut/DeepLabCut
1+
#
2+
# DeepLabCut Toolbox (deeplabcut.org)
3+
# © A. & M.W. Mathis Labs
4+
# https://github.com/DeepLabCut/DeepLabCut
5+
#
6+
# Please see AUTHORS for contributors.
7+
# https://github.com/DeepLabCut/DeepLabCut/blob/master/AUTHORS
8+
#
9+
# Licensed under GNU Lesser General Public License v3.0
10+
#
511

6-
Please see AUTHORS for contributors.
7-
https://github.com/DeepLabCut/DeepLabCut/blob/master/AUTHORS
8-
Licensed under GNU Lesser General Public License v3.0
9-
"""
1012

1113
import os
1214

@@ -121,4 +123,3 @@
121123
find_outliers_in_raw_data,
122124
)
123125
from deeplabcut.post_processing import filterpredictions, analyzeskeleton
124-

‎deeplabcut/__main__.py‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
"""
2-
DeepLabCut2.0 Toolbox (deeplabcut.org)
3-
© A. & M. Mathis Labs
4-
https://github.com/DeepLabCut/DeepLabCut
1+
#
2+
# DeepLabCut Toolbox (deeplabcut.org)
3+
# © A. & M.W. Mathis Labs
4+
# https://github.com/DeepLabCut/DeepLabCut
5+
#
6+
# Please see AUTHORS for contributors.
7+
# https://github.com/DeepLabCut/DeepLabCut/blob/master/AUTHORS
8+
#
9+
# Licensed under GNU Lesser General Public License v3.0
10+
#
511

6-
Please see AUTHORS for contributors.
7-
https://github.com/DeepLabCut/DeepLabCut/blob/master/AUTHORS
8-
Licensed under GNU Lesser General Public License v3.0
9-
"""
1012
try:
1113
import PySide6
1214

‎deeplabcut/benchmark/__init__.py‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
# DeepLabCut2.0 Toolbox (deeplabcut.org)
2-
# © A. & M. Mathis Labs
3-
# https://github.com/AlexEMG/DeepLabCut
1+
#
2+
# DeepLabCut Toolbox (deeplabcut.org)
3+
# © A. & M.W. Mathis Labs
4+
# https://github.com/DeepLabCut/DeepLabCut
5+
#
46
# Please see AUTHORS for contributors.
7+
# https://github.com/DeepLabCut/DeepLabCut/blob/master/AUTHORS
58
#
6-
# https://github.com/AlexEMG/DeepLabCut/blob/master/AUTHORS
79
# Licensed under GNU Lesser General Public License v3.0
10+
#
811

912

1013
import json

‎deeplabcut/benchmark/__main__.py‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
# DeepLabCut2.0 Toolbox (deeplabcut.org)
2-
# © A. & M. Mathis Labs
3-
# https://github.com/AlexEMG/DeepLabCut
1+
#
2+
# DeepLabCut Toolbox (deeplabcut.org)
3+
# © A. & M.W. Mathis Labs
4+
# https://github.com/DeepLabCut/DeepLabCut
5+
#
46
# Please see AUTHORS for contributors.
7+
# https://github.com/DeepLabCut/DeepLabCut/blob/master/AUTHORS
58
#
6-
# https://github.com/AlexEMG/DeepLabCut/blob/master/AUTHORS
79
# Licensed under GNU Lesser General Public License v3.0
10+
#
811

912
from deeplabcut.benchmark.cli import main
1013

‎deeplabcut/benchmark/base.py‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
# DeepLabCut2.0 Toolbox (deeplabcut.org)
2-
# © A. & M. Mathis Labs
3-
# https://github.com/AlexEMG/DeepLabCut
1+
#
2+
# DeepLabCut Toolbox (deeplabcut.org)
3+
# © A. & M.W. Mathis Labs
4+
# https://github.com/DeepLabCut/DeepLabCut
5+
#
46
# Please see AUTHORS for contributors.
7+
# https://github.com/DeepLabCut/DeepLabCut/blob/master/AUTHORS
58
#
6-
# https://github.com/AlexEMG/DeepLabCut/blob/master/AUTHORS
79
# Licensed under GNU Lesser General Public License v3.0
10+
#
811

912
"""Base classes for benchmark and result definition
1013

‎deeplabcut/benchmark/benchmarks.py‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
# DeepLabCut2.0 Toolbox (deeplabcut.org)
2-
# © A. & M. Mathis Labs
3-
# https://github.com/AlexEMG/DeepLabCut
1+
#
2+
# DeepLabCut Toolbox (deeplabcut.org)
3+
# © A. & M.W. Mathis Labs
4+
# https://github.com/DeepLabCut/DeepLabCut
5+
#
46
# Please see AUTHORS for contributors.
7+
# https://github.com/DeepLabCut/DeepLabCut/blob/master/AUTHORS
58
#
6-
# https://github.com/AlexEMG/DeepLabCut/blob/master/AUTHORS
79
# Licensed under GNU Lesser General Public License v3.0
10+
#
811

912
"""Definition for official DeepLabCut benchmark tasks.
1013

‎deeplabcut/benchmark/cli.py‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
# DeepLabCut2.0 Toolbox (deeplabcut.org)
2-
# © A. & M. Mathis Labs
3-
# https://github.com/AlexEMG/DeepLabCut
1+
#
2+
# DeepLabCut Toolbox (deeplabcut.org)
3+
# © A. & M.W. Mathis Labs
4+
# https://github.com/DeepLabCut/DeepLabCut
5+
#
46
# Please see AUTHORS for contributors.
7+
# https://github.com/DeepLabCut/DeepLabCut/blob/master/AUTHORS
58
#
6-
# https://github.com/AlexEMG/DeepLabCut/blob/master/AUTHORS
79
# Licensed under GNU Lesser General Public License v3.0
10+
#
811

912
"""Command line interface for DeepLabCut deeplabcut.benchmark."""
1013

‎deeplabcut/benchmark/metrics.py‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
# DeepLabCut2.0 Toolbox (deeplabcut.org)
2-
# © A. & M. Mathis Labs
3-
# https://github.com/AlexEMG/DeepLabCut
1+
#
2+
# DeepLabCut Toolbox (deeplabcut.org)
3+
# © A. & M.W. Mathis Labs
4+
# https://github.com/DeepLabCut/DeepLabCut
5+
#
46
# Please see AUTHORS for contributors.
7+
# https://github.com/DeepLabCut/DeepLabCut/blob/master/AUTHORS
58
#
6-
# https://github.com/AlexEMG/DeepLabCut/blob/master/AUTHORS
79
# Licensed under GNU Lesser General Public License v3.0
10+
#
811

912
"""Evaluation metrics for the DeepLabCut benchmark."""
1013

‎deeplabcut/benchmark/utils.py‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
# DeepLabCut2.0 Toolbox (deeplabcut.org)
2-
# © A. & M. Mathis Labs
3-
# https://github.com/AlexEMG/DeepLabCut
1+
#
2+
# DeepLabCut Toolbox (deeplabcut.org)
3+
# © A. & M.W. Mathis Labs
4+
# https://github.com/DeepLabCut/DeepLabCut
5+
#
46
# Please see AUTHORS for contributors.
7+
# https://github.com/DeepLabCut/DeepLabCut/blob/master/AUTHORS
58
#
6-
# https://github.com/AlexEMG/DeepLabCut/blob/master/AUTHORS
79
# Licensed under GNU Lesser General Public License v3.0
10+
#
811

912
"""Helper functions in this file are not affected by the main repositories
1013
license. They are independent from the remainder of the benchmarking code.

0 commit comments

Comments
 (0)