Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MVP here we come #2

Merged
merged 14 commits into from
Mar 10, 2022
Merged

MVP here we come #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
738999d
Merge from CBroz1/dev
CBroz1 Feb 3, 2022
046064d
Update element_deeplabcut/dlc.py
CBroz1 Feb 24, 2022
b498a02
Merge pull request #3 from CBroz1/dev
CBroz1 Feb 24, 2022
1d990db
Merge pull request #4 from ttngu207/main
CBroz1 Feb 28, 2022
aa4961e
PEP8
CBroz1 Mar 1, 2022
cef65ed
See details - long list
CBroz1 Mar 4, 2022
88eb82f
update diagram
CBroz1 Mar 4, 2022
540ba06
Apply suggestion from code review
CBroz1 Mar 8, 2022
84f0d84
additional code review suggestions
CBroz1 Mar 8, 2022
fbf3b7e
null analyze_video_param handling
CBroz1 Mar 8, 2022
fb72d8c
separate BodyPart functions - return list then insert
CBroz1 Mar 9, 2022
3c8ff44
Rebasing
Mar 8, 2022
2585ef3
edit README
CBroz1 Mar 9, 2022
b9fd1c9
Merge branch 'main' into dev
Mar 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ example [workflow-deeplabcut](https://github.com/datajoint/workflow-deeplabcut))

This Element currently supports single-animal, single-camera 2D models, and does not yet support multi-animal or multi-camera models.

This element assumes your labeled data is alrady generated via the DLC gui and that your training and inference data pools are separate.

## The Pipeline Architecture

![element-deeplabcut diagram](images/diagram_dlc.svg)
Expand Down Expand Up @@ -49,6 +51,8 @@ A ***Device*** table must be declared elsewhere to uniqely identify cameras.
pip install "element-data-loader @ git+https://github.com/datajoint/element-data-loader"
```

Note that deeplabcut itself requires a dependency called numba as part of `trackingutils.py`. Numba requires numpy<=1.2. This may conflict with installs of other DataJoint elements, which rely on nwb-conversion-tools, itself requiring numpy>=1.21.0.

## Usage

### Element activation
Expand Down
Loading