From 587830cb9dc9207f12b908454677d54134d60228 Mon Sep 17 00:00:00 2001 From: Mackenzie Mathis Date: Fri, 21 Oct 2022 15:15:15 +0200 Subject: [PATCH 1/3] Update installation.md --- docs/installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation.md b/docs/installation.md index 05ee5ac224..5dc6e239ea 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -1,7 +1,7 @@ (how-to-install)= # How To Install DeepLabCut -DeepLabCut can be run on Windows, Linux, or MacOS (see also [technical considerations](tech-considerations-during-install) and if you run into issues also check out [installation ProTips](installTips)). +DeepLabCut can be run on Windows, Linux, or MacOS (see also [technical considerations](tech-considerations-during-install) and if you run into issues also check out [installation ProTips](https://deeplabcut.github.io/DeepLabCut/docs/recipes/installTips.html)). ## PIP: From 8653656e901000c65fe3abf37d486e30db1eacb6 Mon Sep 17 00:00:00 2001 From: Mackenzie Mathis Date: Fri, 21 Oct 2022 15:26:21 +0200 Subject: [PATCH 2/3] Update installTips.md --- docs/recipes/installTips.md | 49 +++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 15 deletions(-) diff --git a/docs/recipes/installTips.md b/docs/recipes/installTips.md index 37c1f830b4..ca87741d30 100644 --- a/docs/recipes/installTips.md +++ b/docs/recipes/installTips.md @@ -313,37 +313,56 @@ Activate! `conda activate DEEPLABCUT` and then run: `conda install -c conda-forg Then run `python -m deeplabcut` which launches the DLC GUI. -## DeepLabCut M1 chip installation environment instructions: +## DeepLabCut MacOS M1 and M2 chip installation environment instructions: -This only assumes you have anaconda installed! +This only assumes you have anaconda installed. -Use the `DEEPLABCUT_M1.yaml` conda file if you have an Macbok with an M1 chip, and follow these steps: +Use the `DEEPLABCUT_M1.yaml` conda file if you have an Macbok with an M1 or M2 chip, and follow these steps: (1) git clone the deeplabcut cut repo: -`git clone https://github.com/DeepLabCut/DeepLabCut.git` - -(2) in the program terminal, `cd DeepLabCut/conda-environments` +``` +git clone https://github.com/DeepLabCut/DeepLabCut.git +``` -(3) Click here to download the Rosetta wheel for TensorFlow. +(2) in the program terminal run: `cd DeepLabCut/conda-environments` -For instance, for 2.4.1: -https://drive.google.com/file/d/17pSwfoNuyf3YR8vCaVggHeI-pMQ3xL7l/view?usp=sharing -(for different versions see here: https://github.com/tensorflow/tensorflow/issues/46044) +(3) Click [here](https://drive.google.com/file/d/17pSwfoNuyf3YR8vCaVggHeI-pMQ3xL7l/view?usp=sharing) to download the Rosetta wheel for TensorFlow. We assume this goes into your Downloads folder. This downloads TF 2.4.1; https://drive.google.com/file/d/17pSwfoNuyf3YR8vCaVggHeI-pMQ3xL7l/view?usp=sharing +(for different versions see here: https://github.com/tensorflow/tensorflow/issues/46044). (4) Then, run: -`conda env create -f DEEPLABCUT_M1.yaml` +``` +conda env create -f DEEPLABCUT_M1.yaml +``` + +(5) Please activate the environment and set osx-64; i.e., then, run: + +``` +conda activate DEEPLABCUT_M1 +conda env config vars set CONDA_SUBDIR=osx-64 +``` +Now, as the print satement says, please deactivate and re-activate to set the change: + +``` +conda deactivate +conda activate DEEPLABCUT_M1 +conda env update -f DEEPLABCUT_M1.yaml +``` + +(5) Next, run: -(5) Next, **activate the environment,** and in the terminal `cd` to Downloads, and then run: + ``` + pip install ~/Downloads/tensorflow-2.4.1-py3-none-any.whl --no-dependencies --force-reinstall + ``` + (again, assumes this file in your downloads folder) -`pip install tensorflow-2.4.1-py3-none-any.whl --no-dependencies --force-reinstall` -(6) Next, launch DLC with `pythonw -m deeplabcut` +(6) Next, launch DLC with `pythonw -m deeplabcut` (or if DLC version 2.3+, please use `python -m deeplabcut`) GUI will open! -Note: Based on issue #1380 thanks! +Note: Based on issues #1380 and #2011, thanks! ## How to confirm that your GPU is being used by DeepLabCut From 11df9f2e359aed1c56ee9c91dbaac9f3cd5b44fb Mon Sep 17 00:00:00 2001 From: Mackenzie Mathis Date: Fri, 21 Oct 2022 15:35:37 +0200 Subject: [PATCH 3/3] Update installation.md --- docs/installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation.md b/docs/installation.md index 5dc6e239ea..da610a9276 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -1,7 +1,7 @@ (how-to-install)= # How To Install DeepLabCut -DeepLabCut can be run on Windows, Linux, or MacOS (see also [technical considerations](tech-considerations-during-install) and if you run into issues also check out [installation ProTips](https://deeplabcut.github.io/DeepLabCut/docs/recipes/installTips.html)). +DeepLabCut can be run on Windows, Linux, or MacOS (see also [technical considerations](tech-considerations-during-install) and if you run into issues also check out the [Installation Tips](https://deeplabcut.github.io/DeepLabCut/docs/recipes/installTips.html) page). ## PIP: