Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Numpy v2 #584

Merged
merged 8 commits into from
Oct 11, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
4 changes: 2 additions & 2 deletions ml-notebook/conda-linux-64.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: linux-64
# input_hash: a5f7a40d2f8ee04a3ba9f35a29145a8b389c209a9c1b4f05acb95abb23dbd163
# input_hash: 686fbaed770824e531c56b168c4a0c282c5f8e1d3614f18883780c4a1d9f5b8b
@EXPLICIT
https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2#d7c89558ba9fa0495403155b64376d81
https://conda.anaconda.org/conda-forge/linux-64/_py-xgboost-mutex-2.0-gpu_0.tar.bz2#7702188077361f43a4d61e64c694f850
Expand Down Expand Up @@ -626,6 +626,7 @@ https://conda.anaconda.org/conda-forge/linux-64/esmf-8.6.1-nompi_h4441c20_3.cond
https://conda.anaconda.org/conda-forge/noarch/fastjmd95-0.2.1-pyh44b312d_0.tar.bz2#1c964b3de70514bbf641464d78f4fb5a
https://conda.anaconda.org/conda-forge/linux-64/ffmpeg-7.1.0-gpl_h39e0969_101.conda#d70b9725f537b71119b41958861d61d2
https://conda.anaconda.org/conda-forge/noarch/flox-0.9.12-pyhd8ed1ab_0.conda#d1d00fd23d8f38389fce355ef049639a
https://conda.anaconda.org/conda-forge/linux-64/gdal-3.9.2-py312h1299960_7.conda#9cf27e3f9d97ea13f250db9253a25dc8
https://conda.anaconda.org/conda-forge/noarch/geopandas-base-1.0.1-pyha770c72_1.conda#cad8d8e1583463e7642adc72a76dc3c5
https://conda.anaconda.org/conda-forge/noarch/google-auth-2.35.0-pyhff2d567_0.conda#7a6b4c81d9062a9e92b9ef0548aebc06
https://conda.anaconda.org/conda-forge/linux-64/graphviz-12.0.0-hba01fac_0.conda#953e31ea00d46beb7e64a79fc291ec44
Expand Down Expand Up @@ -705,7 +706,6 @@ https://conda.anaconda.org/conda-forge/noarch/seaborn-base-0.13.2-pyhd8ed1ab_2.c
https://conda.anaconda.org/conda-forge/noarch/stackstac-0.5.1-pyhd8ed1ab_0.conda#af36ec845ee6099742f3e6c46e5c1331
https://conda.anaconda.org/conda-forge/linux-64/tensorflow-base-2.17.0-cuda120py312h8a249fc_202.conda#1defebe5f91315db8e1c8503f64fb296
https://conda.anaconda.org/conda-forge/linux-64/tiledb-2.26.0-h93dd694_1.conda#01e8e2e49932006efe6516c2fb9d675b
https://conda.anaconda.org/conda-forge/noarch/xarray-datatree-0.0.14-pyhd8ed1ab_0.conda#d7d176a24b7dee88e07ad75930306e6a
https://conda.anaconda.org/conda-forge/noarch/adlfs-2024.7.0-pyhd8ed1ab_0.conda#0d774613255df3ee00340b616d00f0d0
https://conda.anaconda.org/conda-forge/noarch/chex-0.1.87-pyhd8ed1ab_0.conda#f6b7251bf06c851fcff6ed8f05a71a57
https://conda.anaconda.org/conda-forge/noarch/geopandas-1.0.1-pyhd8ed1ab_1.conda#79a9a8d2fd39ecb4081c0df0c10135dc
Expand Down
35 changes: 21 additions & 14 deletions ml-notebook/conda-lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
version: 1
metadata:
content_hash:
linux-64: a5f7a40d2f8ee04a3ba9f35a29145a8b389c209a9c1b4f05acb95abb23dbd163
linux-64: 686fbaed770824e531c56b168c4a0c282c5f8e1d3614f18883780c4a1d9f5b8b
channels:
- url: conda-forge
used_env_vars: []
Expand Down Expand Up @@ -3320,6 +3320,26 @@ package:
sha256: 108926b074d535defd705e53760ed9254c59d4998df70d2d39c76882d6280c5e
category: main
optional: false
- name: gdal
version: 3.9.2
manager: conda
platform: linux-64
dependencies:
__glibc: '>=2.17,<3.0.a0'
libgcc: '>=13'
libgdal-core: 3.9.2.*
libkml: '>=1.3.0,<1.4.0a0'
libstdcxx: '>=13'
libxml2: '>=2.12.7,<3.0a0'
numpy: '>=1.19,<3'
python: '>=3.12,<3.13.0a0'
python_abi: 3.12.*
url: https://conda.anaconda.org/conda-forge/linux-64/gdal-3.9.2-py312h1299960_7.conda
hash:
md5: 9cf27e3f9d97ea13f250db9253a25dc8
sha256: 656eea557c38f713cb6d94efa798ecae9b70b807976d2e99fd7080462575098d
category: main
optional: false
- name: gdk-pixbuf
version: 2.42.12
manager: conda
Expand Down Expand Up @@ -11649,19 +11669,6 @@ package:
sha256: 8bb5b522cdf1905d831a9b371a3a3bd2932a9f53398332fbd38ed3442015bbaf
category: main
optional: false
- name: xarray-datatree
version: 0.0.14
manager: conda
platform: linux-64
dependencies:
python: '>=3.8'
xarray: '>=2022.6'
url: https://conda.anaconda.org/conda-forge/noarch/xarray-datatree-0.0.14-pyhd8ed1ab_0.conda
hash:
md5: d7d176a24b7dee88e07ad75930306e6a
sha256: 461e5c54721cf4ae0b785e3eb5fa76d6459998f29b871ab59e8d02e16fcd4a4f
category: main
optional: false
- name: xarray-spatial
version: 0.4.0
manager: conda
Expand Down
2 changes: 1 addition & 1 deletion ml-notebook/packages.txt
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ gcc_impl_linux-64==13.3.0
gcc_linux-64==13.3.0
gcm_filters==0.3.0
gcsfs==2024.9.0
gdal==3.9.2
gdk-pixbuf==2.42.12
geocube==0.7.0
geographiclib==2.0
Expand Down Expand Up @@ -753,7 +754,6 @@ wrapt==1.16.0
x264==1!164.3095
x265==3.5
xarray==2024.9.0
xarray-datatree==0.0.14
xarray-spatial==0.4.0
xarray_leaflet==0.2.3
xarrayutils==2.0.1
Expand Down
1 change: 1 addition & 0 deletions pangeo-notebook/apt.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ git
groff
tree
vim
nano
4 changes: 2 additions & 2 deletions pangeo-notebook/conda-linux-64.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: linux-64
# input_hash: 2e542136663904ee845b6c7c4511f0ed82d807d272aaf2dadfa60469af681f5f
# input_hash: 82b668a6f1d77a21f5b42586d9fec68a7186e3bb053589842f60db261c73b593
@EXPLICIT
https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2#d7c89558ba9fa0495403155b64376d81
https://conda.anaconda.org/conda-forge/linux-64/_py-xgboost-mutex-2.0-gpu_0.tar.bz2#7702188077361f43a4d61e64c694f850
Expand Down Expand Up @@ -571,6 +571,7 @@ https://conda.anaconda.org/conda-forge/linux-64/esmf-8.6.1-nompi_h4441c20_3.cond
https://conda.anaconda.org/conda-forge/noarch/fastjmd95-0.2.1-pyh44b312d_0.tar.bz2#1c964b3de70514bbf641464d78f4fb5a
https://conda.anaconda.org/conda-forge/linux-64/ffmpeg-7.1.0-gpl_h39e0969_101.conda#d70b9725f537b71119b41958861d61d2
https://conda.anaconda.org/conda-forge/noarch/flox-0.9.12-pyhd8ed1ab_0.conda#d1d00fd23d8f38389fce355ef049639a
https://conda.anaconda.org/conda-forge/linux-64/gdal-3.9.2-py312h1299960_7.conda#9cf27e3f9d97ea13f250db9253a25dc8
https://conda.anaconda.org/conda-forge/noarch/geopandas-base-1.0.1-pyha770c72_1.conda#cad8d8e1583463e7642adc72a76dc3c5
https://conda.anaconda.org/conda-forge/noarch/google-auth-2.35.0-pyhff2d567_0.conda#7a6b4c81d9062a9e92b9ef0548aebc06
https://conda.anaconda.org/conda-forge/linux-64/graphviz-12.0.0-hba01fac_0.conda#953e31ea00d46beb7e64a79fc291ec44
Expand Down Expand Up @@ -645,7 +646,6 @@ https://conda.anaconda.org/conda-forge/linux-64/scikit-image-0.24.0-py312h1df14c
https://conda.anaconda.org/conda-forge/noarch/seaborn-base-0.13.2-pyhd8ed1ab_2.conda#b713b116feaf98acdba93ad4d7f90ca1
https://conda.anaconda.org/conda-forge/noarch/stackstac-0.5.1-pyhd8ed1ab_0.conda#af36ec845ee6099742f3e6c46e5c1331
https://conda.anaconda.org/conda-forge/linux-64/tiledb-2.26.0-h93dd694_1.conda#01e8e2e49932006efe6516c2fb9d675b
https://conda.anaconda.org/conda-forge/noarch/xarray-datatree-0.0.14-pyhd8ed1ab_0.conda#d7d176a24b7dee88e07ad75930306e6a
https://conda.anaconda.org/conda-forge/noarch/adlfs-2024.7.0-pyhd8ed1ab_0.conda#0d774613255df3ee00340b616d00f0d0
https://conda.anaconda.org/conda-forge/noarch/geopandas-1.0.1-pyhd8ed1ab_1.conda#79a9a8d2fd39ecb4081c0df0c10135dc
https://conda.anaconda.org/conda-forge/noarch/google-cloud-core-2.4.1-pyhd8ed1ab_0.conda#1853cdebbfe25fb6ee253855a44945a6
Expand Down
137 changes: 81 additions & 56 deletions pangeo-notebook/conda-lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
version: 1
metadata:
content_hash:
linux-64: 2e542136663904ee845b6c7c4511f0ed82d807d272aaf2dadfa60469af681f5f
linux-aarch64: 8e5ad2eb38de475f706b655519a011f0345e811fdd3ecb13517ce44f0022a5d3
osx-64: cf3a44713b2bbad4a94150882757819dd63ca08bc4a526fb399dc042461d311e
osx-arm64: 9d6ec04941e3a22c86801d8658f2ed5177c329b9d153871f1140adab4f97edbf
linux-64: 82b668a6f1d77a21f5b42586d9fec68a7186e3bb053589842f60db261c73b593
linux-aarch64: 1f1abe31295f63c78fbe32fc04357210c751c27214f481ecad1596e2b66288a8
osx-64: d39015ae05e6e88f8315796f981cec21630a73647422877a46740c990c6ab96c
osx-arm64: c185b7b954970c87b9bf6912fb46e8eae5890999e6979892d84e2cbd3cdf0490
channels:
- url: conda-forge
used_env_vars: []
Expand Down Expand Up @@ -11116,6 +11116,83 @@ package:
sha256: 108926b074d535defd705e53760ed9254c59d4998df70d2d39c76882d6280c5e
category: main
optional: false
- name: gdal
version: 3.9.2
manager: conda
platform: linux-64
dependencies:
__glibc: '>=2.17,<3.0.a0'
libgcc: '>=13'
libgdal-core: 3.9.2.*
libkml: '>=1.3.0,<1.4.0a0'
libstdcxx: '>=13'
libxml2: '>=2.12.7,<3.0a0'
numpy: '>=1.19,<3'
python: '>=3.12,<3.13.0a0'
python_abi: 3.12.*
url: https://conda.anaconda.org/conda-forge/linux-64/gdal-3.9.2-py312h1299960_7.conda
hash:
md5: 9cf27e3f9d97ea13f250db9253a25dc8
sha256: 656eea557c38f713cb6d94efa798ecae9b70b807976d2e99fd7080462575098d
category: main
optional: false
- name: gdal
version: 3.9.2
manager: conda
platform: linux-aarch64
dependencies:
libgcc: '>=13'
libgdal-core: 3.9.2.*
libkml: '>=1.3.0,<1.4.0a0'
libstdcxx: '>=13'
libxml2: '>=2.12.7,<3.0a0'
numpy: '>=1.19,<3'
python: '>=3.12,<3.13.0a0'
python_abi: 3.12.*
url: https://conda.anaconda.org/conda-forge/linux-aarch64/gdal-3.9.2-py312h3008244_7.conda
hash:
md5: 3a1b826fff85048056f192d9fa528669
sha256: 44f5d8e42c29bbf8f4e906a2fd1a7ebf0852b564e8a80835eb37e6548496c3b1
category: main
optional: false
- name: gdal
version: 3.9.2
manager: conda
platform: osx-64
dependencies:
__osx: '>=10.13'
libcxx: '>=17'
libgdal-core: 3.9.2.*
libkml: '>=1.3.0,<1.4.0a0'
libxml2: '>=2.12.7,<3.0a0'
numpy: '>=1.19,<3'
python: '>=3.12,<3.13.0a0'
python_abi: 3.12.*
url: https://conda.anaconda.org/conda-forge/osx-64/gdal-3.9.2-py312h365dfcf_7.conda
hash:
md5: d9cdf305ba3e2dc9989bfa116001104b
sha256: 0df4b2136311b288f52a9532accc50e45898eb512bae70a1f3db432d1204763b
category: main
optional: false
- name: gdal
version: 3.9.2
manager: conda
platform: osx-arm64
dependencies:
__osx: '>=11.0'
libcxx: '>=17'
libgdal-core: 3.9.2.*
libkml: '>=1.3.0,<1.4.0a0'
libxml2: '>=2.12.7,<3.0a0'
numpy: '>=1.19,<3'
python: '>=3.12,<3.13.0a0'
python_abi: 3.12.*
url: https://conda.anaconda.org/conda-forge/osx-arm64/gdal-3.9.2-py312h936c49d_7.conda
hash:
md5: 305595575712364e99c69bf43d7078f0
sha256: ffd8d88c9e7d3b8617df4cbe9ad4755995ef5f180bfb6afc50e1f8a4f68446a3
category: main
optional: false
- name: gdk-pixbuf
version: 2.42.12
manager: conda
Expand Down Expand Up @@ -40386,58 +40463,6 @@ package:
sha256: 8bb5b522cdf1905d831a9b371a3a3bd2932a9f53398332fbd38ed3442015bbaf
category: main
optional: false
- name: xarray-datatree
version: 0.0.14
manager: conda
platform: linux-64
dependencies:
python: '>=3.8'
xarray: '>=2022.6'
url: https://conda.anaconda.org/conda-forge/noarch/xarray-datatree-0.0.14-pyhd8ed1ab_0.conda
hash:
md5: d7d176a24b7dee88e07ad75930306e6a
sha256: 461e5c54721cf4ae0b785e3eb5fa76d6459998f29b871ab59e8d02e16fcd4a4f
category: main
optional: false
- name: xarray-datatree
version: 0.0.14
manager: conda
platform: linux-aarch64
dependencies:
python: '>=3.8'
xarray: '>=2022.6'
url: https://conda.anaconda.org/conda-forge/noarch/xarray-datatree-0.0.14-pyhd8ed1ab_0.conda
hash:
md5: d7d176a24b7dee88e07ad75930306e6a
sha256: 461e5c54721cf4ae0b785e3eb5fa76d6459998f29b871ab59e8d02e16fcd4a4f
category: main
optional: false
- name: xarray-datatree
version: 0.0.14
manager: conda
platform: osx-64
dependencies:
python: '>=3.8'
xarray: '>=2022.6'
url: https://conda.anaconda.org/conda-forge/noarch/xarray-datatree-0.0.14-pyhd8ed1ab_0.conda
hash:
md5: d7d176a24b7dee88e07ad75930306e6a
sha256: 461e5c54721cf4ae0b785e3eb5fa76d6459998f29b871ab59e8d02e16fcd4a4f
category: main
optional: false
- name: xarray-datatree
version: 0.0.14
manager: conda
platform: osx-arm64
dependencies:
python: '>=3.8'
xarray: '>=2022.6'
url: https://conda.anaconda.org/conda-forge/noarch/xarray-datatree-0.0.14-pyhd8ed1ab_0.conda
hash:
md5: d7d176a24b7dee88e07ad75930306e6a
sha256: 461e5c54721cf4ae0b785e3eb5fa76d6459998f29b871ab59e8d02e16fcd4a4f
category: main
optional: false
- name: xarray-spatial
version: 0.4.0
manager: conda
Expand Down
2 changes: 1 addition & 1 deletion pangeo-notebook/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ dependencies:
- fsspec
- gcm_filters
- gcsfs
- gdal
- gh
- gh-scoped-creds
- geocube
Expand Down Expand Up @@ -115,7 +116,6 @@ dependencies:
- watermark
- xarray
- xarrayutils
- xarray-datatree
- xarray_leaflet
- xarray-spatial
- xbatcher
Expand Down
2 changes: 1 addition & 1 deletion pangeo-notebook/packages.txt
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ gcc_impl_linux-64==13.3.0
gcc_linux-64==13.3.0
gcm_filters==0.3.0
gcsfs==2024.9.0
gdal==3.9.2
gdk-pixbuf==2.42.12
geocube==0.7.0
geographiclib==2.0
Expand Down Expand Up @@ -683,7 +684,6 @@ wrapt==1.16.0
x264==1!164.3095
x265==3.5
xarray==2024.9.0
xarray-datatree==0.0.14
xarray-spatial==0.4.0
xarray_leaflet==0.2.3
xarrayutils==2.0.1
Expand Down
3 changes: 1 addition & 2 deletions pytorch-notebook/conda-linux-64.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: linux-64
# input_hash: 11b56b309dd6480ecb7fb636f3d94ac64c4e49e3a5feabc891abb20a6c22841c
# input_hash: 4bf46f2efe7c58a478678bb1dd52b282bd9b4103a1ebab8a395c542fbef12527
@EXPLICIT
https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2#d7c89558ba9fa0495403155b64376d81
https://conda.anaconda.org/conda-forge/linux-64/_py-xgboost-mutex-2.0-gpu_0.tar.bz2#7702188077361f43a4d61e64c694f850
Expand Down Expand Up @@ -721,7 +721,6 @@ https://conda.anaconda.org/conda-forge/linux-64/scikit-image-0.24.0-py312h1df14c
https://conda.anaconda.org/conda-forge/noarch/seaborn-base-0.13.2-pyhd8ed1ab_2.conda#b713b116feaf98acdba93ad4d7f90ca1
https://conda.anaconda.org/conda-forge/noarch/stackstac-0.5.1-pyhd8ed1ab_0.conda#af36ec845ee6099742f3e6c46e5c1331
https://conda.anaconda.org/conda-forge/linux-64/tiledb-2.26.0-h93dd694_1.conda#01e8e2e49932006efe6516c2fb9d675b
https://conda.anaconda.org/conda-forge/noarch/xarray-datatree-0.0.14-pyhd8ed1ab_0.conda#d7d176a24b7dee88e07ad75930306e6a
https://conda.anaconda.org/conda-forge/noarch/adlfs-2024.7.0-pyhd8ed1ab_0.conda#0d774613255df3ee00340b616d00f0d0
https://conda.anaconda.org/conda-forge/noarch/efficientnet-pytorch-0.7.1-pyhd8ed1ab_1.tar.bz2#f524017d5efffe1ff55a1af92ac98e2f
https://conda.anaconda.org/conda-forge/noarch/geopandas-1.0.1-pyhd8ed1ab_1.conda#79a9a8d2fd39ecb4081c0df0c10135dc
Expand Down
15 changes: 1 addition & 14 deletions pytorch-notebook/conda-lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
version: 1
metadata:
content_hash:
linux-64: 11b56b309dd6480ecb7fb636f3d94ac64c4e49e3a5feabc891abb20a6c22841c
linux-64: 4bf46f2efe7c58a478678bb1dd52b282bd9b4103a1ebab8a395c542fbef12527
channels:
- url: conda-forge
used_env_vars: []
Expand Down Expand Up @@ -12082,19 +12082,6 @@ package:
sha256: 8bb5b522cdf1905d831a9b371a3a3bd2932a9f53398332fbd38ed3442015bbaf
category: main
optional: false
- name: xarray-datatree
version: 0.0.14
manager: conda
platform: linux-64
dependencies:
python: '>=3.8'
xarray: '>=2022.6'
url: https://conda.anaconda.org/conda-forge/noarch/xarray-datatree-0.0.14-pyhd8ed1ab_0.conda
hash:
md5: d7d176a24b7dee88e07ad75930306e6a
sha256: 461e5c54721cf4ae0b785e3eb5fa76d6459998f29b871ab59e8d02e16fcd4a4f
category: main
optional: false
- name: xarray-spatial
version: 0.4.0
manager: conda
Expand Down
1 change: 0 additions & 1 deletion pytorch-notebook/packages.txt
Original file line number Diff line number Diff line change
Expand Up @@ -776,7 +776,6 @@ wrapt==1.16.0
x264==1!164.3095
x265==3.5
xarray==2024.9.0
xarray-datatree==0.0.14
xarray-spatial==0.4.0
xarray_leaflet==0.2.3
xarrayutils==2.0.1
Expand Down