diff --git a/env.yaml b/env.yaml deleted file mode 100644 index 22e2c9933..000000000 --- a/env.yaml +++ /dev/null @@ -1,22 +0,0 @@ -dependencies: - - conda-build - - python=3 - - numpy - - scipy - - obspy - - instaseis - - pandas - - xarray - - netCDF4 - - h5py - - mpi4py - - retry - - flake8 - - nose - - pytest - - pip - - pip: - - tables - - seisgen - - seishmc - - -e . diff --git a/env.yaml b/env.yaml new file mode 120000 index 000000000..1186a330b --- /dev/null +++ b/env.yaml @@ -0,0 +1 @@ +env_default.yaml \ No newline at end of file diff --git a/env_arm64.yaml b/env_arm64.yaml index 4abf532ff..24b11f2b3 100644 --- a/env_arm64.yaml +++ b/env_arm64.yaml @@ -1,10 +1,15 @@ +# for installation on ARM64 systems, including Apple M1 and Apple M2 + +channels: + - defaults + - conda-forge + dependencies: - conda-build - python=3 - numpy - scipy - obspy - #- instaseis - pandas - xarray - netCDF4 @@ -16,7 +21,9 @@ dependencies: - pytest - pip - pip: + - git+https://github.com/sstaehler/instaseis.git - tables - seisgen - seishmc - -e . + diff --git a/env_default.yaml b/env_default.yaml new file mode 100644 index 000000000..b6f4a7a7b --- /dev/null +++ b/env_default.yaml @@ -0,0 +1,27 @@ + +channels: + - defaults + - conda-forge + +dependencies: + - conda-build + - python=3 + - numpy + - scipy + - obspy + - instaseis + - pandas + - xarray + - netCDF4 + - h5py + - mpi4py + - retry + - flake8 + - nose + - pytest + - pip + - pip: + - tables + - seisgen + - seishmc + - -e . diff --git a/setup.py b/setup.py index fe1f6c8a2..d00b32be3 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,6 @@ def get_compile_args(): else: compile_args += ['-Ofast'] - compile_args += ['-march=native'] return compile_args