Skip to content

Gk dev (ready for review!) #1

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

Merged
MMathisLab merged 31 commits into from
Jul 13, 2020
Merged

Gk dev (ready for review!) #1

Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
9b62a9e
dlclive: add tf_config as parameter
gkane26 Jun 9, 2020
bd2d3cd
graph: add tfconfig, new full load graph function
gkane26 Jun 9, 2020
eab4370
bench + display: add display to benchmarking, fix bugs in display
gkane26 Jun 9, 2020
c8ca18d
fix bugs in display
gkane26 Jun 9, 2020
d33b5f2
add kwargs to processors
gkane26 Jun 15, 2020
a818b6d
clean up load graph, color conversions
gkane26 Jun 15, 2020
65c0cfe
dlclive: add kwargs to get_pose and init_inference
gkane26 Jun 19, 2020
f8d35a5
add kalman filter processor
gkane26 Jun 30, 2020
3647550
kalmanfilter processor: update delta time
gkane26 Jul 9, 2020
cca80d8
dlclive: destroy display on close
gkane26 Jul 9, 2020
5f4ef09
new analyze tools: speed bench, display, analyze pose and labeled video
gkane26 Jul 9, 2020
3407376
dlclive and graph: clean up/benign bug fix
gkane26 Jul 9, 2020
95cedd9
fix colormaps for display
gkane26 Jul 9, 2020
01a7bbe
update readme: add benchmark info
gkane26 Jul 9, 2020
9b0ef34
setup: add pandas and tables, needed for analyze_videos
gkane26 Jul 9, 2020
4436266
Update kalmanfilter.py
MMathisLab Jul 9, 2020
8ea6b97
change display_lik to pcutoff
gkane26 Jul 9, 2020
6a6a0d5
resolve setup and readme conflicts
gkane26 Jul 9, 2020
bbabf80
Merge branch 'master' into gk-dev
gkane26 Jul 9, 2020
de06ad2
Update README.md
MMathisLab Jul 9, 2020
2aa7dc8
fixed resize in python, check cmd
MMathisLab Jul 9, 2020
2fff10f
Update README.md
MMathisLab Jul 9, 2020
faade24
analyze: allow pixels/resize to be scalar or list
gkane26 Jul 10, 2020
54fed1d
fix TF warnings
MMathisLab Jul 10, 2020
a739cf6
changed name to benchmark_videos
MMathisLab Jul 10, 2020
a7c50e7
Update README.md
MMathisLab Jul 10, 2020
84aa1a6
dlclive: tfgpu flip x and y
gkane26 Jul 10, 2020
dd25669
Merge branch 'gk-dev' of https://github.com/AlexEMG/DeepLabCut-live i…
gkane26 Jul 10, 2020
768b8fe
name update
MMathisLab Jul 10, 2020
ab35d11
complete convert analyze to benchmarking
gkane26 Jul 13, 2020
4cb299c
merge master into gk-dev; keep most of master bench.py
gkane26 Jul 13, 2020
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
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
with open("README.md", "r") as fh:
long_description = fh.read()

install_requires = ['numpy', 'ruamel.yaml', 'colorcet', 'pillow', 'py-cpuinfo', 'tqdm']
install_requires = ['numpy', 'ruamel.yaml', 'colorcet', 'pillow', 'py-cpuinfo', 'tqdm', 'pandas', 'tables']

if find_spec('cv2') is None:
install_requires.append('opencv-python')
Expand Down