Skip to content

Commit ba710b0

Browse files
tenzen-ytenzen-y
committed
bump Python to 3.9
1 parent 16e0574 commit ba710b0

File tree

26 files changed

+129
-180
lines changed

26 files changed

+129
-180
lines changed

‎.github/workflows/test-python.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup Python
1717
uses: actions/setup-python@v2
1818
with:
19-
python-version: 3.7
19+
python-version: 3.9
2020

2121
- name: Install Packages
2222
run: |

‎cmd/earlystopping/medianstop/v1beta1/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.6
1+
FROM python:3.9
22

33
ENV TARGET_DIR /opt/katib
44
ENV EARLY_STOPPING_DIR cmd/earlystopping/medianstop/v1beta1

‎cmd/earlystopping/medianstop/v1beta1/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
grpcio==1.23.0
2-
protobuf==3.9.1
1+
grpcio==1.41.1
2+
protobuf==3.19.1
33
googleapis-common-protos==1.6.0
44
kubernetes==11.0.0

‎cmd/metricscollector/v1beta1/tfevent-metricscollector/Dockerfile

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,25 @@
1-
FROM tensorflow/tensorflow:1.11.0
2-
RUN pip install rfc3339 grpcio googleapis-common-protos
3-
ADD . /usr/src/app/github.com/kubeflow/katib
4-
WORKDIR /usr/src/app/github.com/kubeflow/katib/cmd/metricscollector/v1beta1/tfevent-metricscollector/
1+
FROM python:3.9
2+
3+
ENV TARGET_DIR /opt/katib
4+
ENV METRICS_COLLECTOR_DIR cmd/metricscollector/v1beta1/tfevent-metricscollector
5+
# tensorflow community build for aarch64
6+
# https://github.com/tensorflow/build#tensorflow-builds
7+
ENV PIP_EXTRA_INDEX_URL https://snapshots.linaro.org/ldcg/python-cache/
8+
9+
ADD ./pkg/ ${TARGET_DIR}/pkg/
10+
ADD ./${METRICS_COLLECTOR_DIR}/ ${TARGET_DIR}/${METRICS_COLLECTOR_DIR}/
11+
WORKDIR ${TARGET_DIR}/${METRICS_COLLECTOR_DIR}
12+
13+
RUN if [ "$(uname -m)" = "aarch64" ]; then \
14+
pip install tensorflow-aarch64==2.7.0; \
15+
else \
16+
pip install tensorflow==2.7.0; \
17+
fi;
518
RUN pip install --no-cache-dir -r requirements.txt
6-
ENV PYTHONPATH /usr/src/app/github.com/kubeflow/katib:/usr/src/app/github.com/kubeflow/katib/pkg/apis/manager/v1beta1/python:/usr/src/app/github.com/kubeflow/katib/pkg/metricscollector/v1beta1/tfevent-metricscollector/:/usr/src/app/github.com/kubeflow/katib/pkg/metricscollector/v1beta1/common/
19+
20+
RUN chgrp -R 0 ${TARGET_DIR} \
21+
&& chmod -R g+rwX ${TARGET_DIR}
22+
23+
ENV PYTHONPATH ${TARGET_DIR}:${TARGET_DIR}/pkg/apis/manager/v1beta1/python:${TARGET_DIR}/pkg/metricscollector/v1beta1/tfevent-metricscollector/::${TARGET_DIR}/pkg/metricscollector/v1beta1/common/
24+
725
ENTRYPOINT ["python", "main.py"]

‎cmd/metricscollector/v1beta1/tfevent-metricscollector/Dockerfile.aarch64

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎cmd/metricscollector/v1beta1/tfevent-metricscollector/Dockerfile.ppc64le

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ibmcom/tensorflow-ppc64le:1.14.0-py3
1+
FROM ibmcom/tensorflow-ppc64le:2.2.0-py3
22
RUN pip install rfc3339 grpcio googleapis-common-protos
33
ADD . /usr/src/app/github.com/kubeflow/katib
44
WORKDIR /usr/src/app/github.com/kubeflow/katib/cmd/metricscollector/v1beta1/tfevent-metricscollector/

‎cmd/metricscollector/v1beta1/tfevent-metricscollector/requirements.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
psutil==5.6.6
2+
rfc3339
3+
grpcio
4+
googleapis-common-protos

‎cmd/suggestion/chocolate/v1beta1/Dockerfile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
1-
FROM python:3.6
1+
FROM python:3.9
22

33
ENV TARGET_DIR /opt/katib
44
ENV SUGGESTION_DIR cmd/suggestion/chocolate/v1beta1
5+
ENV GRPC_HEALTH_PROBE_VERSION v0.3.1
56

67
RUN if [ "$(uname -m)" = "ppc64le" ] || [ "$(uname -m)" = "aarch64" ]; then \
78
apt-get -y update && \
89
apt-get -y install gfortran libopenblas-dev liblapack-dev && \
9-
pip install cython 'numpy>=1.13.3'; \
10+
apt-get clean && \
11+
rm -rf /var/lib/apt/lists/* && \
12+
pip install cython; \
1013
fi
11-
RUN GRPC_HEALTH_PROBE_VERSION=v0.3.1 && \
12-
if [ "$(uname -m)" = "ppc64le" ]; then \
14+
RUN if [ "$(uname -m)" = "ppc64le" ]; then \
1315
wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-ppc64le; \
1416
elif [ "$(uname -m)" = "aarch64" ]; then \
1517
wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-arm64; \

‎cmd/suggestion/chocolate/v1beta1/requirements.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
grpcio==1.23.0
1+
grpcio==1.41.1
22
cloudpickle==0.5.6
3-
numpy>=1.13.3
4-
scikit-learn>=0.19.0
5-
scipy>=0.19.1
3+
numpy>=1.20.0
4+
scikit-learn>=0.24.0
5+
scipy>=1.5.4
66
forestci==0.3
7-
protobuf==3.9.1
7+
protobuf==3.19.1
88
googleapis-common-protos==1.6.0
9-
SQLAlchemy==1.3.8
9+
SQLAlchemy==1.4.26
1010
git+https://github.com/AIworx-Labs/chocolate@master
11-
ghalton>=0.6
11+
ghalton>=0.6.2

‎cmd/suggestion/goptuna/v1beta1/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Build the Goptuna Suggestion.
22
FROM golang:alpine AS build-env
33

4+
ENV GRPC_HEALTH_PROBE_VERSION v0.3.1
5+
46
WORKDIR /go/src/github.com/kubeflow/katib
57

68
# Download packages.
@@ -22,8 +24,7 @@ RUN if [ "$(uname -m)" = "ppc64le" ]; then \
2224
fi
2325

2426
# Add GRPC health probe.
25-
RUN GRPC_HEALTH_PROBE_VERSION=v0.3.1 && \
26-
if [ "$(uname -m)" = "ppc64le" ]; then \
27+
RUN if [ "$(uname -m)" = "ppc64le" ]; then \
2728
wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-ppc64le; \
2829
elif [ "$(uname -m)" = "aarch64" ]; then \
2930
wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-arm64; \

0 commit comments

Comments
 (0)