Merge branch 'output_only_motion' of https://github.com/talmolab/sleap …

…into output_only_motion
talmolab · Sep 12, 2023 · 5a71262 · 5a71262
2 parents b668551 + 330018c
commit 5a71262
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 9 deletions.
diff --git a/docs/installation.md b/docs/installation.md
@@ -68,7 +68,24 @@ SLEAP can be installed on Macs by following these instructions:
 
 **Anaconda** is a Python environment manager that makes it easy to install SLEAP and its necessary dependencies without affecting other Python software on your computer.
 
-[**Mambaforge**](https://mamba.readthedocs.io/en/latest/installation.html) is a lightweight installer of Anaconda with speedy package resolution that we recommend. To install it:
+[**Mambaforge**](https://mamba.readthedocs.io/en/latest/installation.html) is a lightweight installer of Anaconda with speedy package resolution that we recommend.
+
+````{note}
+If you already have Anaconda on your computer, then you can [set the solver to `libmamba`](https://www.anaconda.com/blog/a-faster-conda-for-a-growing-community) in the `base` environment (and skip the Mambaforge installation):
+
+```bash
+conda update -n base conda
+conda install -n base conda-libmamba-solver
+conda config --set solver libmamba
+```
+
+```{warning}
+Any subsequent `mamba` commands in the docs will need to be replaced with `conda` if you choose to use your existing Anaconda installation.
+```
+
+````
+
+Otherwise, to install Mamba:
 
 **On Windows**, just click through the installation steps.
 
@@ -215,7 +232,7 @@ Although you do not need Mambaforge installed to perform a `pip install`, we rec
 3. Finally, we can perform the `pip install`:
 
    ```bash
-   pip install sleap[pypi]==1.3.1
+   pip install sleap[pypi]==1.3.2
    ```
 
    This works on **any OS except Apple silicon** and on **Google Colab**.

diff --git a/docs/notebooks/Data_structures.ipynb b/docs/notebooks/Data_structures.ipynb
@@ -56,7 +56,7 @@
       "source": [
         "# This should take care of all the dependencies on colab:\n",
         "!pip uninstall -qqq -y opencv-python opencv-contrib-python\n",
-        "!pip install -qqq sleap[pypi]\n",
+        "!pip install -qqq sleap==1.3.1111\n",
         "\n",
         "# But to do it locally, we'd recommend the conda package (available on Windows + Linux):\n",
         "# conda create -n sleap -c sleap -c conda-forge -c nvidia sleap"

diff --git a/docs/notebooks/Interactive_and_realtime_inference.ipynb b/docs/notebooks/Interactive_and_realtime_inference.ipynb
@@ -60,7 +60,7 @@
       "source": [
         "# This should take care of all the dependencies on colab:\n",
         "!pip uninstall -qqq -y opencv-python opencv-contrib-python\n",
-        "!pip install -qqq sleap[pypi]\n",
+        "!pip install -qqq sleap==1.3.1\n",
         "\n",
         "\n",
         "# But to do it locally, we'd recommend the conda package (available on Windows + Linux):\n",

diff --git a/docs/notebooks/Interactive_and_resumable_training.ipynb b/docs/notebooks/Interactive_and_resumable_training.ipynb
@@ -62,7 +62,7 @@
       "source": [
         "# This should take care of all the dependencies on colab:\n",
         "!pip uninstall -qqq -y opencv-python opencv-contrib-python\n",
-        "!pip install -qqq sleap[pypi]\n",
+        "!pip install -qqq sleap==1.3.1\n",
         "\n",
         "\n",
         "# But to do it locally, we'd recommend the conda package (available on Windows + Linux):\n",

diff --git a/docs/notebooks/Model_evaluation.ipynb b/docs/notebooks/Model_evaluation.ipynb
@@ -40,7 +40,7 @@
       ],
       "source": [
         "!pip uninstall -qqq -y opencv-python opencv-contrib-python\n",
-        "!pip install -qqq sleap[pypi]\n",
+        "!pip install -qqq sleap==1.3.1\n",
         "!apt -qq install tree\n",
         "!wget -q https://storage.googleapis.com/sleap-data/reference/flies13/td_fast.210505_012601.centered_instance.n%3D1800.zip\n",
         "!unzip -qq -o -d \"td_fast.210505_012601.centered_instance.n=1800\" \"td_fast.210505_012601.centered_instance.n=1800.zip\""

diff --git a/docs/notebooks/Post_inference_tracking.ipynb b/docs/notebooks/Post_inference_tracking.ipynb
@@ -61,7 +61,7 @@
       "source": [
         "# This should take care of all the dependencies on colab:\n",
         "!pip uninstall -qqq -y opencv-python opencv-contrib-python\n",
-        "!pip install -qqq sleap[pypi]\n",
+        "!pip install -qqq sleap==1.3.1\n",
         "\n",
         "# But to do it locally, we'd recommend the conda package (available on Windows + Linux):\n",
         "# conda create -n sleap -c sleap -c conda-forge -c nvidia sleap"

diff --git a/docs/notebooks/Training_and_inference_on_an_example_dataset.ipynb b/docs/notebooks/Training_and_inference_on_an_example_dataset.ipynb
@@ -62,7 +62,7 @@
    ],
    "source": [
     "!pip uninstall -qqq -y opencv-python opencv-contrib-python\n",
-    "!pip install -qqq sleap[pypi]"
+    "!pip install -qqq sleap==1.3.1"
    ]
   },
   {

diff --git a/docs/notebooks/Training_and_inference_using_Google_Drive.ipynb b/docs/notebooks/Training_and_inference_using_Google_Drive.ipynb
@@ -59,7 +59,7 @@
    ],
    "source": [
     "!pip uninstall -qqq -y opencv-python opencv-contrib-python\n",
-    "!pip install -qqq sleap[pypi]"
+    "!pip install -qqq sleap==1.3.1"
    ]
   },
   {