Skip to content

Commit

Permalink
Update all the images (#64)
Browse files Browse the repository at this point in the history
* Update all the images

- bump the base image
- new jupyter-server-proxy
- simplify gpu images

* removed requirements.txts

* fixup torch

* updated qgis build

* fixup

* fixup qgis
  • Loading branch information
Tom Augspurger authored Mar 20, 2024
1 parent 7af7f59 commit 3d34e88
Show file tree
Hide file tree
Showing 21 changed files with 2,491 additions and 2,033 deletions.
20 changes: 20 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
# Default ACR
ACR_NAME?=pcccr
TAG?=latest

%/conda-linux-64.lock: %/environment.yml
cd $(dir $<); \
conda-lock --mamba --kind=explicit -p linux-64 -f environment.yml


build-python:
az acr build -r $(ACR_NAME) -t planetary-computer/python:latest -t planetary-computer/python:$(TAG) python

build-gpu-pytorch:
az acr build -r $(ACR_NAME) -t planetary-computer/gpu-pytorch:latest -t planetary-computer/gpu-pytorch:$(TAG) gpu-pytorch

build-gpu-tensorflow:
az acr build -r $(ACR_NAME) -t planetary-computer/gpu-tensorflow:latest -t planetary-computer/gpu-tensorflow:$(TAG) gpu-tensorflow

build-qgis:
az acr build -r $(ACR_NAME) -t planetary-computer/qgis:latest -t planetary-computer/qgis:$(TAG) qgis

build-r:
az acr build -r $(ACR_NAME) -t planetary-computer/r:latest -t planetary-computer/r:$(TAG) r
2 changes: 1 addition & 1 deletion gpu-pytorch/Dockerfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM pangeo/base-image:2022.09.21
FROM pangeo/base-image:2024.03.13
1,268 changes: 636 additions & 632 deletions gpu-pytorch/conda-linux-64.lock

Large diffs are not rendered by default.

118 changes: 54 additions & 64 deletions gpu-pytorch/environment.yml
Original file line number Diff line number Diff line change
@@ -1,43 +1,39 @@
name: pangeo
channels:
- conda-forge
- defaults
- nodefaults
dependencies:
- python=3.*
- pangeo-notebook
- pip>=20
- adlfs
- argopy
- awscli
- black
- boto3
- bottleneck
- cartopy
- cchardet # workaround https://github.com/Azure/azure-sdk-for-python/issues/21516
- cfgrib>=0.9.9.1
- cdsapi
- cfgrib
- cf_xarray
- ciso
- click>=8.0.4
- cmip6_preprocessing
- contextily
- dask-cloudprovider
- azure-cli-core # technically too old: https://github.com/conda-forge/azure-cli-core-feedstock/pull/15
- msrestazure
- azure-identity
- dask-geopandas
- cmocean
- dask-ml
- datacube
- datashader
- descartes
- eccodes>=2.24.2
- earthaccess
- eofs
- erddapy
- esmpy
- fastjmd95
- folium
- flox
- fsspec
- gcm_filters
- gcsfs
- gh
- gh-scoped-creds
- geocube
- geogif
- geopandas>=0.11.0
- geopandas
- geopy
- geoviews-core
- git-lfs
- gsw
- h5netcdf
- h5py
Expand All @@ -46,93 +42,87 @@ dependencies:
- intake
- intake-esm
- intake-geopandas
- intake-stac
- intake-xarray
- ipdb
- ipykernel
- ipyleaflet
- ipytree
- ipywidgets
- jupyterhub-singleuser
- jupyterlab_code_formatter
- jupyterlab-git
- jupyterlab-myst
- jupyter-panel-proxy
- jupyter-resource-usage
- jupyterlab-geojson
- leafmap>=0.7.6
- kerchunk
- line_profiler
- lxml
- lz4
- matplotlib-base
- memory_profiler
- metpy
# - nomkl # we *do* need mkl here.
- nb_conda_kernels
- nbstripout
- nc-time-axis
- netcdf4
- numbagg
- numcodecs
- numpy
- numpy_groupies
- odc-stac
- pandas
- panel
- papermill
- parcels
- planetary-computer>=0.4.6
- prefect
- param
- pop-tools
- pyarrow
- pycamhd
- pydap
- pyepsg
- pygeos
- pystac-client>=0.5.0
- pystac>=1.1.0
- pystac
- pystac-client
- python-blosc
- python-gist
- python-graphviz
- python-pdal>=3.1.2
- python-xxhash
- rasterio
- rechunker
- rich
- rio-cogeo
- rio-tiler
- rioxarray
- s3fs>0.5
- sarsen
- s3fs
- satpy
- scikit-image
- scikit-learn
- scipy
- seaborn
- sparse
- stac-vrt
- stackstac>=0.2.2
- snakeviz
- stackstac
- tiledb-py
- voila
- xarray-sentinel
- xarray-spatial>=0.2.9
- xarray>=0.18.0
- timezonefinder
- watermark
- xarray
- xarrayutils
- xarray-datatree
- xarray_leaflet
- xarray-spatial
- xbatcher
- xcape
- xclim
- xcube
- xesmf
- xgboost
- xgcm
- xhistogram
- xlayers
- xmip
- xmitgcm
- xpublish
- xrft
- xskillscore
- xxhash
- zarr
# Additional pytorch / GPU packages
- python-flatbuffers # for onxxruntime-gpu
- cupy
- efficientnet-pytorch
- hvplot==0.7.0 # https://github.com/holoviz/hvplot/issues/576
# torch dependencies
- jupyterlab-nvdashboard
- pretrainedmodels
- pytorch>=1.12.0=*cuda112*
- pytorch-lightning
- segmentation-models-pytorch
- shapely
- timm
- torchgeo
- torchvision
- azure-data-tables
- odc-algo>=0.2.0a3
- odc-stac>=0.3.2
- stac-geoparquet
# resolve dask-cuda issues
- dask==2022.3.0
- dask-cuda==22.4.0
- dask-core==2022.3.0
- distributed==2022.3.0
- gpytorch
- pytorch>=2.0.0=*cuda118*
- torchvision>=0.15.1=*cuda118*
- torchgeo
3 changes: 0 additions & 3 deletions gpu-pytorch/requirements.txt

This file was deleted.

2 changes: 1 addition & 1 deletion gpu-tensorflow/Dockerfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM pangeo/base-image:2022.09.21
FROM pangeo/base-image:2024.03.13
1,205 changes: 614 additions & 591 deletions gpu-tensorflow/conda-linux-64.lock

Large diffs are not rendered by default.

Loading

0 comments on commit 3d34e88

Please sign in to comment.