From 294f9517587618d4ac779529e34fdde705062618 Mon Sep 17 00:00:00 2001 From: alex-rakowski Date: Tue, 28 Nov 2023 09:18:44 -0800 Subject: [PATCH] adding make dev-install_conda_arm (#553) Adding dev-install_conda_arm in Makefile to create environment on M-series MacOs (without icc_rt) --- Makefile | 3 +++ docs/source/installation.rst | 3 ++- environment-dev-arm.yml | 37 ++++++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100755 environment-dev-arm.yml diff --git a/Makefile b/Makefile index 2db298d1..341c53be 100755 --- a/Makefile +++ b/Makefile @@ -29,6 +29,9 @@ install_conda: dev-install_conda: conda env create -f environment-dev.yml && conda activate pylops && pip install -e . +dev-install_conda_arm: + conda env create -f environment-dev-arm.yml && conda activate pylops && pip install -e . + tests: make pythoncheck pytest diff --git a/docs/source/installation.rst b/docs/source/installation.rst index 3b237f23..55cfec7b 100755 --- a/docs/source/installation.rst +++ b/docs/source/installation.rst @@ -99,7 +99,8 @@ For a ``conda`` environment, run .. code-block:: bash - >> make dev-install_conda + >> make dev-install_conda # for x86 (Intel or AMD CPUs) + >> make dev-install_conda_arm # for arm (M-series Mac) This will create and activate an environment called ``pylops``, with all required and optional dependencies. diff --git a/environment-dev-arm.yml b/environment-dev-arm.yml new file mode 100755 index 00000000..e04c5af7 --- /dev/null +++ b/environment-dev-arm.yml @@ -0,0 +1,37 @@ +name: pylops +channels: + - defaults + - conda-forge + - numba + - pytorch +dependencies: + - python>=3.6.4 + - pip + - numpy>=1.21.0 + - scipy>=1.4.0 + - pytorch>=1.2.0 + - pyfftw + - pywavelets + - sympy + - matplotlib + - ipython + - pytest + - Sphinx + - numpydoc + - numba + - pre-commit + - autopep8 + - isort + - black + - pip: + - devito + - scikit-fmm + - spgl1 + - pytest-runner + - setuptools_scm + - pydata-sphinx-theme + - sphinx-gallery + - nbsphinx + - image + - flake8 + - mypy