Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,15 @@ Previous additions :



### Install note for M1/M2 Mac users
### Install note for ARM64 (Silicon) Mac users

To avoid issues when installing on the ARM64 architecture, please follow these steps.

1) Create a new conda env using the provided conda/napari_cellseg3d_m1.yml file :
1) Create a new conda env using the provided conda/napari_cellseg3d_ARM64.yml file :

git clone https://github.com/AdaptiveMotorControlLab/CellSeg3d.git
cd CellSeg3d
conda env create -f conda/napari_cellseg3d_m1.yml
conda env create -f conda/napari_cellseg3d_ARM64.yml
conda activate napari_cellseg3d_m1

2) Install the plugin.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: napari_cellseg3d_m1
name: napari_cellseg3d_ARM64
channels:
- anaconda
- conda-forge
Expand All @@ -11,18 +11,14 @@ dependencies:
- pip:
- numpy
- napari>=0.4.14
# - opencv-python>=4.5.5
- scikit-image>=0.19.2
- matplotlib>=3.4.1
- tifffile>=2022.2.9
# - imageio-ffmpeg>=0.4.5
- torch>=1.11
- monai[nibabel, einops]>=0.9.0
- tqdm
# - nibabel
- scikit-image
# - pillow
- pyclesperanto-prototype
- tqdm
- matplotlib
# - vispy>=0.9.6
- napari_cellseg3d
12 changes: 6 additions & 6 deletions docs/source/guides/installation_guide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ Installation guide ⚙
======================
This guide outlines the steps for installing CellSeg3D and its dependencies. The plugin is compatible with Windows, Linux, and MacOS.

**Note for M1/M2 (ARM64) Mac Users:**
Please refer to the :ref:`section below <source/guides/installation_guide:M1/M2 (ARM64) Mac installation>` for specific instructions.
**Note for ARM64 Mac Users:**
Please refer to the :ref:`section below <source/guides/installation_guide:ARM64 Mac installation>` for specific instructions.

.. warning::
If you encounter any issues during installation, feel free to open an issue on our `GitHub repository`_.
Expand Down Expand Up @@ -46,7 +46,7 @@ Installing CellSeg3D
--------------------------------------------

.. warning::
For M1 Mac users, please see the :ref:`section below <source/guides/installation_guide:M1/M2 (ARM64) Mac installation>`
For ARM64 Mac users, please see the :ref:`section below <source/guides/installation_guide:ARM64 Mac installation>`

**Via pip**:

Expand All @@ -69,11 +69,11 @@ Navigate to the cloned CellSeg3D folder and run:
Successful installation will add the napari-cellseg3D plugin to napari’s Plugins section.


M1/M2 (ARM64) Mac installation
ARM64 Mac installation
--------------------------------------------
.. _ARM64_Mac_installation:

For ARM64 Macs, we recommend using our custom CONDA environment. This is particularly important for M1 or M2 MacBooks.
For ARM64 Macs, we recommend using our custom CONDA environment. This is particularly important for ARM64 (Silicon chips) MacBooks.

Start by installing `miniconda3`_.

Expand All @@ -91,7 +91,7 @@ In the terminal, navigate to the CellSeg3D folder:
.. code-block::

cd CellSeg3D
conda env create -f conda/napari_cellseg3d_m1.yml
conda env create -f conda/napari_cellseg3d_ARM64.yml

3. **Activate the environment** :

Expand Down
2 changes: 1 addition & 1 deletion docs/welcome.rst
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ For detailed installation instructions, including installing pre-requisites,
please see :ref:`source/guides/installation_guide:Installation guide ⚙`

.. warning::
**M1/M2 MacOS users**, please refer to the :ref:`dedicated section <source/guides/installation_guide:M1/M2 (ARM64) Mac installation>`
**ARM64 MacOS users**, please refer to the :ref:`dedicated section <source/guides/installation_guide:ARM64 Mac installation>`

You can install ``napari-cellseg3d`` via pip:

Expand Down