Skip to content

Straightforward, functional installation on Apple Silicon // moving to PySide6 // rc2 #2022

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
AlexEMG merged 28 commits into from
Nov 4, 2022
Merged

Straightforward, functional installation on Apple Silicon // moving to PySide6 // rc2 #2022

Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
43fa94a
Drop pyside2 for pyside6
jeylau Oct 21, 2022
56e59b1
Functional Apple Silicon conda environment file
jeylau Oct 22, 2022
749a96a
Fix pyside6 bugs
jeylau Oct 22, 2022
84dbab1
Update setup.py
MMathisLab Oct 29, 2022
a769a4d
typo fix
MMathisLab Oct 29, 2022
3c94de5
No feedback when extracting frames
jeylau Oct 31, 2022
01ff18f
Update setup.py
jeylau Oct 31, 2022
83bf78c
Exit pyside qthread gracefully
jeylau Oct 31, 2022
f8de24e
Revert git install in setup.py
jeylau Oct 31, 2022
cd9ed6a
Fix setFileMode
jeylau Oct 31, 2022
bea96c0
Fix file dialog crash
jeylau Oct 31, 2022
5f04465
Fix qtpy RuntimeWarning upon GUI launch
jeylau Oct 31, 2022
6898b99
Use Adam rather than SGD on Apple Silicon
jeylau Nov 1, 2022
d3309ec
Delete testM1.sh
MMathisLab Nov 2, 2022
c6e7843
Update installation.md
MMathisLab Nov 4, 2022
6ce6c2b
keep tf_slim
MMathisLab Nov 4, 2022
380395d
Update setup.py
MMathisLab Nov 4, 2022
2aa83f7
rename to tf as added install...
MMathisLab Nov 4, 2022
ce76446
Update installation.md
MMathisLab Nov 4, 2022
777dae4
Update installation.md
MMathisLab Nov 4, 2022
9ec6c75
Update DEEPLABCUT.yaml
MMathisLab Nov 4, 2022
0587d0c
rc2
MMathisLab Nov 4, 2022
44b6b86
Update version.py
MMathisLab Nov 4, 2022
805a264
Update setup.py
MMathisLab Nov 4, 2022
c1997a9
merge master into m1m2 (#2033)
MMathisLab Nov 4, 2022
63a915e
Fix project loading dialog
jeylau Nov 4, 2022
3aca7c9
Fix config IO in ConfigEditor
jeylau Nov 4, 2022
0212f6a
minor versioning
AlexEMG Nov 4, 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
Prev Previous commit
Next Next commit
Update installation.md
  • Loading branch information
@MMathisLab
MMathisLab authored Nov 4, 2022
commit ce7644614f497da4b244d4302759aa4239ed1555
2 changes: 1 addition & 1 deletion docs/installation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ DeepLabCut can be run on Windows, Linux, or MacOS (see also [technical considera

## PIP:

- Everything you need to run DeepLabCut (i.e., our source code and our dependencies) can be installed with `pip install 'deeplabcut[gui]'` (for GUI support) or without: `pip install deeplabcut`.
- Everything you need to run DeepLabCut (i.e., our source code and our dependencies) can be installed with `pip install 'deeplabcut[gui,tf]'` (for GUI support w/tensorflow) or without the gui: `pip install 'deeplabcut[tf]'`.

- Please note, there are several modes of installation, and the user should decide to either use a **system-wide** (see [note below](system-wide-considerations-during-install)), **conda environment** based installation (**recommended**), or the supplied [**Docker container**](docker-containers) (recommended for Ubuntu advanced users). One can of course also use other Python distributions than Anaconda, but **Anaconda is the easiest route.**

Expand Down