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.

Sign up for GitHub

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

Update kubeflow notebooks for 1.6 release #363

Merged
merged 6 commits into from
Sep 16, 2022
Merged

Update kubeflow notebooks for 1.6 release #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
80fc33b
Update TF and other versions
mbaijal Aug 3, 2022
f8f8006
Update Notebook Images for 1.6
mbaijal Sep 14, 2022
a8c65e4
Fix protobuf dependency conflict
mbaijal Sep 14, 2022
a41c7e9
Update the scipy image and default TF version
mbaijal Sep 14, 2022
cd4cc15
Update Pytorch to 1.12
mbaijal Sep 15, 2022
e52a889
fix for pytorch 1.12 and scipy
mbaijal Sep 16, 2022
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
10 changes: 5 additions & 5 deletions awsconfigs/apps/jupyter-web-app/configs/spawner_ui_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
spawnerFormDefaults:
image:
# The container Image for the user's Jupyter Notebook
value: public.ecr.aws/c9e4w0g3/notebook-servers/jupyter-tensorflow:2.6.3-cpu-py38-ubuntu20.04-v1.8
value: public.ecr.aws/c9e4w0g3/notebook-servers/jupyter-tensorflow:2.9.1-cpu-py39-ubuntu20.04-e3-v1.2
# The list of available standard container Images
options:
- kubeflownotebookswg/jupyter-scipy:v1.6.0
- public.ecr.aws/c9e4w0g3/notebook-servers/jupyter-tensorflow:2.6.3-gpu-py38-cu112-ubuntu20.04-v1.8
- public.ecr.aws/c9e4w0g3/notebook-servers/jupyter-tensorflow:2.6.3-cpu-py38-ubuntu20.04-v1.8
- public.ecr.aws/c9e4w0g3/notebook-servers/jupyter-pytorch:1.11.0-gpu-py38-cu115-ubuntu20.04-e3-v1.1
- public.ecr.aws/c9e4w0g3/notebook-servers/jupyter-pytorch:1.11.0-cpu-py38-ubuntu20.04-e3-v1.1
- public.ecr.aws/c9e4w0g3/notebook-servers/jupyter-tensorflow:2.9.1-gpu-py39-cu112-ubuntu20.04-e3-v1.2
- public.ecr.aws/c9e4w0g3/notebook-servers/jupyter-tensorflow:2.9.1-cpu-py39-ubuntu20.04-e3-v1.2
- public.ecr.aws/c9e4w0g3/notebook-servers/jupyter-pytorch:1.12.0-gpu-py38-cu116-ubuntu20.04-ec2
- public.ecr.aws/c9e4w0g3/notebook-servers/jupyter-pytorch:1.12.0-cpu-py38-ubuntu20.04-ec2
imageGroupOne:
# The container Image for the user's Group One Server
# The annotation `notebooks.kubeflow.org/http-rewrite-uri: /`
Expand Down
2 changes: 1 addition & 1 deletion components/notebook-dockerfiles/pytorch/cpu.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_IMAGE=763104351884.dkr.ecr.us-west-2.amazonaws.com/pytorch-training:1.11.0-cpu-py38-ubuntu20.04-e3-v1.1
ARG BASE_IMAGE=763104351884.dkr.ecr.us-west-2.amazonaws.com/pytorch-training:1.12.0-cpu-py38-ubuntu20.04-ec2
FROM $BASE_IMAGE

ARG NB_USER=jovyan
Expand Down
2 changes: 1 addition & 1 deletion components/notebook-dockerfiles/pytorch/cuda.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_IMAGE=763104351884.dkr.ecr.us-west-2.amazonaws.com/pytorch-training:1.11.0-gpu-py38-cu115-ubuntu20.04-e3-v1.1
ARG BASE_IMAGE=763104351884.dkr.ecr.us-west-2.amazonaws.com/pytorch-training:1.12.0-gpu-py38-cu116-ubuntu20.04-ec2

FROM $BASE_IMAGE

Expand Down
22 changes: 12 additions & 10 deletions components/notebook-dockerfiles/pytorch/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,33 @@

# Jupyter related packages
jupyter-console==6.4.4
jupyterlab==3.4.3
jupyterlab-git==0.37.1
jupyterlab==3.4.4
jupyterlab-git==0.38.0
notebook==6.4.12
ipykernel==6.15.0
ipykernel==6.15.1

# Extensions for jupyter notebook
widgetsnbextension==3.6.1
ipywidgets==7.7.1

# Kubeflow Related Packages
kfp==1.8.12
kfp-server-api==1.8.2
kfp==1.8.13
kfp-server-api==1.8.3
kfserving==0.6.1
kubeflow-training==1.4.0
kubeflow-katib==0.14.0

# Common data science packages
h5py==3.7.0
pandas==1.4.2
pandas==1.4.3
matplotlib==3.5.2
xgboost==1.6.1
ipympl==0.9.1

# AWS related packages
awscli==1.25.15
boto3==1.24.15
awscli==1.25.44
boto3==1.24.44

# pytorch packages
fastai==2.7.3
# Pytorch packages
# a version mismatch for fastai can cause a different version of torch to get installed, be careful.
fastai==2.7.9
2 changes: 1 addition & 1 deletion components/notebook-dockerfiles/tensorflow/cpu.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_IMAGE=763104351884.dkr.ecr.us-west-2.amazonaws.com/tensorflow-training:2.6.3-cpu-py38-ubuntu20.04-v1.8-2022-06-23-16-58-08
ARG BASE_IMAGE=763104351884.dkr.ecr.us-west-2.amazonaws.com/tensorflow-training:2.9.1-cpu-py39-ubuntu20.04-e3-v1.2

FROM $BASE_IMAGE

Expand Down
2 changes: 1 addition & 1 deletion components/notebook-dockerfiles/tensorflow/cuda.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_IMAGE=763104351884.dkr.ecr.us-west-2.amazonaws.com/tensorflow-training:2.6.3-gpu-py38-cu112-ubuntu20.04-v1.8-2022-06-23-16-57-41
ARG BASE_IMAGE=763104351884.dkr.ecr.us-west-2.amazonaws.com/tensorflow-training:2.9.1-gpu-py39-cu112-ubuntu20.04-e3-v1.2

FROM $BASE_IMAGE

Expand Down
20 changes: 11 additions & 9 deletions components/notebook-dockerfiles/tensorflow/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,33 @@

# Jupyter related packages
jupyter-console==6.4.4
jupyterlab==3.4.3
jupyterlab-git==0.37.1
jupyterlab==3.4.4
jupyterlab-git==0.38.0
notebook==6.4.12
ipykernel==6.15.0
ipykernel==6.15.1

# Extensions for jupyter notebook
widgetsnbextension==3.6.1
ipywidgets==7.7.1

# Kubeflow Related Packages
kfp==1.8.12
kfp-server-api==1.8.2
kfp==1.8.13
kfp-server-api==1.8.3
kfserving==0.6.1
kubeflow-training==1.4.0
kubeflow-katib==0.14.0

# Common data science packages
h5py==3.7.0
pandas==1.4.2
pandas==1.4.3
matplotlib==3.5.2
xgboost==1.6.1
ipympl==0.9.1

# AWS related packages
awscli==1.25.15
boto3==1.24.15
awscli==1.25.44
boto3==1.24.44

# TF Packages
keras==2.6.0
keras==2.9.0
protobuf==3.19.5
16 changes: 8 additions & 8 deletions tests/e2e/tests/test_notebook_images.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,27 +24,27 @@

NOTEBOOK_IMAGES = [
"public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-scipy:v1.5.0",
"public.ecr.aws/c9e4w0g3/notebook-servers/jupyter-tensorflow:2.6.3-gpu-py38-cu112-ubuntu20.04-v1.8",
"public.ecr.aws/c9e4w0g3/notebook-servers/jupyter-tensorflow:2.6.3-cpu-py38-ubuntu20.04-v1.8",
"public.ecr.aws/c9e4w0g3/notebook-servers/jupyter-pytorch:1.11.0-gpu-py38-cu115-ubuntu20.04-e3-v1.1",
"public.ecr.aws/c9e4w0g3/notebook-servers/jupyter-pytorch:1.11.0-cpu-py38-ubuntu20.04-e3-v1.1",
"public.ecr.aws/c9e4w0g3/notebook-servers/jupyter-tensorflow:2.9.1-gpu-py39-cu112-ubuntu20.04-e3-v1.2",
"public.ecr.aws/c9e4w0g3/notebook-servers/jupyter-tensorflow:2.9.1-cpu-py39-ubuntu20.04-e3-v1.2",
"public.ecr.aws/c9e4w0g3/notebook-servers/jupyter-pytorch:1.12.0-gpu-py38-cu116-ubuntu20.04-ec2",
"public.ecr.aws/c9e4w0g3/notebook-servers/jupyter-pytorch:1.12.0-cpu-py38-ubuntu20.04-ec2",
]

testdata = [
("scipy", NOTEBOOK_IMAGES[0], "sanity_check.ipynb", "Hello World!"),
("tf-gpu", NOTEBOOK_IMAGES[1], "verify_tensorflow_installation.ipynb", "2.6.3"),
("tf-cpu", NOTEBOOK_IMAGES[2], "verify_tensorflow_installation.ipynb", "2.6.3"),
("tf-gpu", NOTEBOOK_IMAGES[1], "verify_tensorflow_installation.ipynb", "2.9.1"),
("tf-cpu", NOTEBOOK_IMAGES[2], "verify_tensorflow_installation.ipynb", "2.9.1"),
(
"pytorch-gpu",
NOTEBOOK_IMAGES[3],
"verify_pytorch_installation.ipynb",
"1.11.0+cu115",
"1.12.0+cu116",
),
(
"pytorch-cpu",
NOTEBOOK_IMAGES[4],
"verify_pytorch_installation.ipynb",
"1.11.0+cpu",
"1.12.0+cpu",
),
]

Expand Down