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

Upgrade Python version to 3.11 #2278

Merged
merged 5 commits into from
Mar 12, 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
22 changes: 21 additions & 1 deletion .github/workflows/test-python.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,27 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: 3.9
python-version: 3.11

- name: Run Python test
run: make pytest

# The skopt service doesn't work appropriately with Python 3.11.
# So, we need to run the test with Python 3.9.
# TODO (tenzen-y): Once we stop to support skopt, we can remove this test.
# REF: https://github.com/kubeflow/katib/issues/2280
test-skopt:
name: Test Skopt
runs-on: ubuntu-22.04

steps:
- name: Check out code
uses: actions/checkout@v3

- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: 3.9

- name: Run Python test
run: make pytest-skopt
13 changes: 11 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@ update-boilerplate:
prepare-pytest:
pip install --prefer-binary -r test/unit/v1beta1/requirements.txt
pip install --prefer-binary -r cmd/suggestion/hyperopt/v1beta1/requirements.txt
pip install --prefer-binary -r cmd/suggestion/skopt/v1beta1/requirements.txt
pip install --prefer-binary -r cmd/suggestion/optuna/v1beta1/requirements.txt
pip install --prefer-binary -r cmd/suggestion/hyperband/v1beta1/requirements.txt
pip install --prefer-binary -r cmd/suggestion/nas/enas/v1beta1/requirements.txt
Expand All @@ -176,6 +175,16 @@ ifeq ("$(wildcard $(TEST_TENSORFLOW_EVENT_FILE_PATH))", "")
endif

pytest: prepare-pytest prepare-pytest-testdata
PYTHONPATH=$(PYTHONPATH) pytest ./test/unit/v1beta1/suggestion
PYTHONPATH=$(PYTHONPATH) pytest ./test/unit/v1beta1/suggestion --ignore=./test/unit/v1beta1/suggestion/test_skopt_service.py
PYTHONPATH=$(PYTHONPATH) pytest ./test/unit/v1beta1/earlystopping
PYTHONPATH=$(PYTHONPATH) pytest ./test/unit/v1beta1/metricscollector

# The skopt service doesn't work appropriately with Python 3.11.
# So, we need to run the test with Python 3.9.
# TODO (tenzen-y): Once we stop to support skopt, we can remove this test.
# REF: https://github.com/kubeflow/katib/issues/2280
pytest-skopt:
pip install six
pip install --prefer-binary -r test/unit/v1beta1/requirements.txt
pip install --prefer-binary -r cmd/suggestion/skopt/v1beta1/requirements.txt
PYTHONPATH=$(PYTHONPATH) pytest ./test/unit/v1beta1/suggestion/test_skopt_service.py
2 changes: 1 addition & 1 deletion cmd/earlystopping/medianstop/v1beta1/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.10-slim
FROM python:3.11-slim

ARG TARGETARCH
ENV TARGET_DIR /opt/katib
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.10-slim
FROM python:3.11-slim

ARG TARGETARCH
ENV TARGET_DIR /opt/katib
Expand Down
2 changes: 1 addition & 1 deletion cmd/suggestion/hyperband/v1beta1/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.10-slim
FROM python:3.11-slim

ARG TARGETARCH
ENV TARGET_DIR /opt/katib
Expand Down
2 changes: 1 addition & 1 deletion cmd/suggestion/hyperband/v1beta1/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
grpcio>=1.41.1
cloudpickle==0.5.6
numpy>=1.20.0
numpy>=1.25.2
scikit-learn>=0.24.0
scipy>=1.5.4
forestci==0.3
Expand Down
2 changes: 1 addition & 1 deletion cmd/suggestion/hyperopt/v1beta1/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.10-slim
FROM python:3.11-slim

ARG TARGETARCH
ENV TARGET_DIR /opt/katib
Expand Down
2 changes: 1 addition & 1 deletion cmd/suggestion/hyperopt/v1beta1/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
grpcio>=1.41.1
cloudpickle==0.5.6
numpy>=1.20.0
numpy>=1.25.2
scikit-learn>=0.24.0
scipy>=1.5.4
forestci==0.3
Expand Down
2 changes: 1 addition & 1 deletion cmd/suggestion/nas/darts/v1beta1/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.10-slim
FROM python:3.11-slim

ARG TARGETARCH
ENV TARGET_DIR /opt/katib
Expand Down
2 changes: 1 addition & 1 deletion cmd/suggestion/nas/enas/v1beta1/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.10-slim
FROM python:3.11-slim

ARG TARGETARCH
ENV TARGET_DIR /opt/katib
Expand Down
2 changes: 1 addition & 1 deletion cmd/suggestion/optuna/v1beta1/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.10-slim
FROM python:3.11-slim

ARG TARGETARCH
ENV TARGET_DIR /opt/katib
Expand Down
2 changes: 1 addition & 1 deletion cmd/suggestion/pbt/v1beta1/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.10-slim
FROM python:3.11-slim

ARG TARGETARCH
ENV TARGET_DIR /opt/katib
Expand Down
2 changes: 1 addition & 1 deletion cmd/suggestion/pbt/v1beta1/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
grpcio>=1.41.1
protobuf>=3.19.5, <=3.20.3
googleapis-common-protos==1.53.0
numpy==1.22.2
numpy==1.25.2
2 changes: 1 addition & 1 deletion docs/developer-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ see the following user guides:
- [Docker](https://docs.docker.com/) (20.10 or later)
- [Docker Buildx](https://docs.docker.com/build/buildx/) (0.8.0 or later)
- [Java](https://docs.oracle.com/javase/8/docs/technotes/guides/install/install_overview.html) (8 or later)
- [Python](https://www.python.org/) (3.10 or later)
- [Python](https://www.python.org/) (3.11 or later)
- [kustomize](https://kustomize.io/) (4.0.5 or later)

## Build from source code
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.10-slim
FROM python:3.11-slim

ENV TARGET_DIR /opt/darts-cnn-cifar10

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.10-slim
FROM python:3.11-slim

ARG TARGETARCH
ENV TARGET_DIR /opt/enas-cnn-cifar10
Expand Down
2 changes: 1 addition & 1 deletion examples/v1beta1/trial-images/pytorch-mnist/Dockerfile.cpu
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.10-slim
FROM python:3.11-slim

ADD examples/v1beta1/trial-images/pytorch-mnist /opt/pytorch-mnist

Expand Down
2 changes: 1 addition & 1 deletion examples/v1beta1/trial-images/simple-pbt/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.10-slim
FROM python:3.11-slim

ADD examples/v1beta1/trial-images/simple-pbt /opt/pbt

Expand Down
2 changes: 1 addition & 1 deletion examples/v1beta1/trial-images/simple-pbt/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
numpy==1.22.2
numpy==1.25.2
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.10-slim
FROM python:3.11-slim

ARG TARGETARCH

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ runtime:
image: docker.io/kubeflowkatib/suggestion-enas:latest
resources:
limits:
memory: 200Mi
memory: 400Mi
- algorithmName: darts
image: docker.io/kubeflowkatib/suggestion-darts:latest
- algorithmName: pbt
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ runtime:
image: docker.io/kubeflowkatib/suggestion-enas:latest
resources:
limits:
memory: 200Mi
memory: 400Mi
- algorithmName: darts
image: docker.io/kubeflowkatib/suggestion-darts:latest
- algorithmName: pbt
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ runtime:
image: docker.io/kubeflowkatib/suggestion-enas:latest
resources:
limits:
memory: 200Mi
memory: 400Mi
- algorithmName: darts
image: docker.io/kubeflowkatib/suggestion-darts:latest
- algorithmName: pbt
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ runtime:
image: docker.io/kubeflowkatib/suggestion-enas:latest
resources:
limits:
memory: 200Mi
memory: 400Mi
- algorithmName: darts
image: docker.io/kubeflowkatib/suggestion-darts:latest
- algorithmName: pbt
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ runtime:
image: docker.io/kubeflowkatib/suggestion-enas:latest
resources:
limits:
memory: 200Mi
memory: 400Mi
- algorithmName: darts
image: docker.io/kubeflowkatib/suggestion-darts:latest
- algorithmName: pbt
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ runtime:
image: docker.io/kubeflowkatib/suggestion-enas:latest
resources:
limits:
memory: 200Mi
memory: 400Mi
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After I upgraded the Python version, I faced OOM killed in the ENAS suggestion service.

- algorithmName: darts
image: docker.io/kubeflowkatib/suggestion-darts:latest
- algorithmName: pbt
Expand Down
Loading