Skip to content

Commit cf5e474

Browse files
committed
Merge main branch into dlclive3
Resolved merge conflicts by keeping PyTorch integration changes from dlclive3 branch: - Kept PyTorch-specific workflow configuration in testing.yml - Kept PyTorch model references in README - Kept PyTorch implementation in benchmark.py - Kept PyTorch support in check_install.py and test_benchmark_script.py - Removed poetry.lock as it was deleted in our branch
2 parents d52f33b + 13f5ef6 commit cf5e474

3 files changed

Lines changed: 465 additions & 0 deletions

File tree

README.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ then use TF1.13 with DlC-Live; export with TF2.3, then use TF2.3 with DLC-live).
7777

7878
Note, you can then test your installation by installing poetry (`pip install poetry`), then running:
7979

80+
<<<<<<< HEAD
8081
```python
8182
poetry run dlc-live-test
8283
```
@@ -85,6 +86,15 @@ If installed properly, this script will i) create a temporary folder ii) downloa
8586
full_dog model from the [DeepLabCut Model Zoo](
8687
http://www.mousemotorlab.org/dlc-modelzoo), iii) download a short video clip of
8788
a dog, and iv) run inference while displaying keypoints. v) remove the temporary folder.
89+
=======
90+
91+
92+
```python
93+
poetry run dlc-live-test
94+
```
95+
96+
If installed properly, this script will i) create a temporary folder ii) download the SuperAnimal-Quadruped model from the [DeepLabCut Model Zoo](http://www.mousemotorlab.org/dlc-modelzoo), iii) download a short video clip of a dog, and iv) run inference while displaying keypoints. v) remove the temporary folder.
97+
>>>>>>> 13f5ef6f9fd7937d7170b32ae7d1fa9f15a5e10b
8898
8999
<img src="https://images.squarespace-cdn.com/content/v1/57f6d51c9f74566f55ecf271/1606081086014-TG9GWH63ZGGOO7K779G3/ke17ZwdGBToddI8pDm48kHiSoSToKfKUI9t99vKErWoUqsxRUqqbr1mOJYKfIPR7LoDQ9mXPOjoJoqy81S2I8N_N4V1vUb5AoIIIbLZhVYxCRW4BPu10St3TBAUQYVKcOoIGycwr1shdgJWzLuxyzjLbSRGBFFxjYMBr42yCvRK5HHsLZWtMlAHzDU294nCd/dlclivetest.png?format=1000w" width="650" title="DLC-live-test" alt="DLC LIVE TEST" align="center" vspace = "50">
90100

0 commit comments

Comments
 (0)