Skip to content

Commit

Permalink
Bump TFX to 0.21.1 (#3220)
Browse files Browse the repository at this point in the history
* bump

* pin two requirements.txt

* update sample

* try a newer k8s version
  • Loading branch information
Jiaxiao Zheng authored Mar 6, 2020
1 parent 13b2c18 commit ee525b9
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 25 deletions.
2 changes: 1 addition & 1 deletion backend/requirements.in
Original file line number Diff line number Diff line change
@@ -1 +1 @@
tfx==0.21.0
tfx==0.21.1
18 changes: 9 additions & 9 deletions backend/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ google-pasta==0.1.8 # via tensorflow
google-resumable-media==0.4.1 # via google-cloud-bigquery
googleapis-common-protos[grpc]==1.51.0 # via google-api-core, grpc-google-iam-v1, tensorflow-metadata
grpc-google-iam-v1==0.12.3 # via google-cloud-bigtable, google-cloud-pubsub
grpcio==1.27.2 # via apache-beam, google-api-core, googleapis-common-protos, grpc-google-iam-v1, tensorboard, tensorflow, tensorflow-serving-api, tfx
grpcio==1.27.1 # via apache-beam, google-api-core, googleapis-common-protos, grpc-google-iam-v1, tensorboard, tensorflow, tensorflow-serving-api, tfx
h5py==2.10.0 # via keras-applications
hdfs==2.5.8 # via apache-beam
httplib2==0.12.0 # via apache-beam, google-api-python-client, google-apitools, google-auth-httplib2, oauth2client
Expand All @@ -64,7 +64,7 @@ keras-preprocessing==1.1.0 # via tensorflow
markdown==3.2.1 # via tensorboard
markupsafe==1.1.1 # via jinja2
mistune==0.8.4 # via nbconvert
ml-metadata==0.21.1 # via tfx
ml-metadata==0.21.2 # via tfx
mock==2.0.0 # via apache-beam
monotonic==1.5 # via fasteners
nbconvert==5.6.1 # via jupyter, notebook
Expand All @@ -74,7 +74,7 @@ numpy==1.18.1 # via h5py, keras-applications, keras-preprocessing, o
oauth2client==3.0.0 # via apache-beam, google-apitools
oauthlib==3.1.0 # via requests-oauthlib
opt-einsum==3.1.0 # via tensorflow
pandas==0.25.3 # via tensorflow-data-validation
pandas==0.25.3 # via tensorflow-data-validation, tensorflow-model-analysis
pandocfilters==1.4.2 # via nbconvert
parso==0.6.1 # via jedi
pbr==5.4.4 # via mock
Expand All @@ -84,7 +84,7 @@ prometheus-client==0.7.1 # via notebook
prompt-toolkit==2.0.10 # via ipython, jupyter-console
protobuf==3.11.3 # via apache-beam, google-api-core, google-cloud-bigquery, googleapis-common-protos, ml-metadata, tensorboard, tensorflow, tensorflow-data-validation, tensorflow-metadata, tensorflow-model-analysis, tensorflow-serving-api, tensorflow-transform, tfx, tfx-bsl
ptyprocess==0.6.0 # via pexpect, terminado
pyarrow==0.15.1 # via apache-beam, tensorflow-data-validation, tfx, tfx-bsl
pyarrow==0.15.1 # via apache-beam, tensorflow-data-validation, tensorflow-model-analysis, tfx, tfx-bsl
pyasn1-modules==0.2.8 # via google-auth, oauth2client
pyasn1==0.4.8 # via oauth2client, pyasn1-modules, rsa
pydot==1.4.1 # via apache-beam, tensorflow-transform
Expand All @@ -105,18 +105,18 @@ scipy==1.4.1 # via scikit-learn, tensorflow, tensorflow-model-analy
send2trash==1.5.0 # via notebook
six==1.14.0 # via absl-py, bleach, docker, fasteners, google-api-core, google-api-python-client, google-apitools, google-auth, google-pasta, google-resumable-media, grpcio, h5py, hdfs, jsonschema, keras-preprocessing, ml-metadata, mock, oauth2client, prompt-toolkit, protobuf, pyarrow, pyrsistent, python-dateutil, tensorboard, tensorflow, tensorflow-data-validation, tensorflow-model-analysis, tensorflow-transform, tfx, tfx-bsl, traitlets, websocket-client
tensorboard==2.1.0 # via tensorflow
tensorflow-data-validation==0.21.2 # via tfx
tensorflow-data-validation==0.21.4 # via tfx
tensorflow-estimator==2.1.0 # via tensorflow
tensorflow-metadata==0.21.1 # via tensorflow-data-validation, tensorflow-model-analysis, tensorflow-transform, tfx-bsl
tensorflow-model-analysis==0.21.3 # via tfx
tensorflow-model-analysis==0.21.4 # via tfx
tensorflow-serving-api==2.1.0 # via tfx, tfx-bsl
tensorflow-transform==0.21.0 # via tensorflow-data-validation, tfx
tensorflow-transform==0.21.2 # via tensorflow-data-validation, tfx
tensorflow==2.1.0 # via ml-metadata, tensorflow-data-validation, tensorflow-model-analysis, tensorflow-serving-api, tensorflow-transform, tfx, tfx-bsl
termcolor==1.1.0 # via tensorflow
terminado==0.8.3 # via notebook
testpath==0.4.4 # via nbconvert
tfx-bsl==0.21.2 # via tensorflow-data-validation, tensorflow-model-analysis, tensorflow-transform, tfx
tfx==0.21.0 # via -r requirements.in (line 1)
tfx-bsl==0.21.3 # via tensorflow-data-validation, tensorflow-model-analysis, tensorflow-transform, tfx
tfx==0.21.1 # via -r requirements.in (line 1)
tornado==6.0.3 # via ipykernel, jupyter-client, notebook, terminado
traitlets==4.3.3 # via ipykernel, ipython, ipywidgets, jupyter-client, jupyter-core, nbconvert, nbformat, notebook, qtconsole
uritemplate==3.0.1 # via google-api-python-client
Expand Down
2 changes: 1 addition & 1 deletion backend/update_requirements.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
set -euo pipefail
IMAGE=${1:-"python:3.5"}
exec docker run -v "$PWD:/src" -w /src --rm "$IMAGE" bash \
-c 'pip3 install pip-tools==4.5.0 > /dev/null 2>&1 && pip-compile -v requirements.in'
-c 'pip3 install pip setuptools --upgrade && pip3 install pip-tools==4.5.0 > /dev/null 2>&1 && pip-compile -v requirements.in'
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ def _create_pipeline(
config = kubeflow_dag_runner.KubeflowDagRunnerConfig(
kubeflow_metadata_config=kubeflow_dag_runner.
get_default_kubeflow_metadata_config(),
tfx_image='tensorflow/tfx:0.21.0',
tfx_image='tensorflow/tfx:0.21.1',
)
kfp_runner = kubeflow_dag_runner.KubeflowDagRunner(
output_filename=__file__ + '.yaml', config=config
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@
"source": [
"# Specify a TFX docker image. For the full list of tags please see:\n",
"# https://hub.docker.com/r/tensorflow/tfx/tags\n",
"tfx_image = 'tensorflow/tfx:0.21.0'\n",
"tfx_image = 'tensorflow/tfx:0.21.1'\n",
"config = kubeflow_dag_runner.KubeflowDagRunnerConfig(\n",
" kubeflow_metadata_config=kubeflow_dag_runner\n",
" .get_default_kubeflow_metadata_config(),\n",
Expand Down
2 changes: 1 addition & 1 deletion test/deploy-cluster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ else
NODE_POOL_CONFIG_ARG="--num-nodes=2 --machine-type=n1-standard-8 \
--enable-autoscaling --max-nodes=8 --min-nodes=2"
# Use new kubernetes master to improve workload identity stability.
KUBERNETES_VERSION_ARG="--cluster-version=1.14.8-gke.33"
KUBERNETES_VERSION_ARG="--cluster-version=1.14.10-gke.17"
if [ "$ENABLE_WORKLOAD_IDENTITY" = true ]; then
WI_ARG="--identity-namespace=$PROJECT.svc.id.goog"
SCOPE_ARG=
Expand Down
3 changes: 1 addition & 2 deletions test/sample-test/requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,4 @@ google-api-python-client==1.7.8
google-cloud-storage==1.17.0
fire==0.2.1
yamale==2.0
tfx==0.21.0
tensorflow_transform==0.21.0
tfx==0.21.1
18 changes: 9 additions & 9 deletions test/sample-test/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ google-pasta==0.1.8 # via tensorflow
google-resumable-media==0.4.1 # via google-cloud-bigquery, google-cloud-storage
googleapis-common-protos[grpc]==1.51.0 # via google-api-core, grpc-google-iam-v1, tensorflow-metadata
grpc-google-iam-v1==0.12.3 # via google-cloud-bigtable, google-cloud-pubsub
grpcio==1.27.2 # via apache-beam, google-api-core, googleapis-common-protos, grpc-google-iam-v1, tensorboard, tensorflow, tensorflow-serving-api, tfx
grpcio==1.27.1 # via apache-beam, google-api-core, googleapis-common-protos, grpc-google-iam-v1, tensorboard, tensorflow, tensorflow-serving-api, tfx
h5py==2.10.0 # via keras-applications
hdfs==2.5.8 # via apache-beam
httplib2==0.12.0 # via apache-beam, google-api-python-client, google-apitools, google-auth-httplib2, oauth2client
Expand All @@ -71,7 +71,7 @@ markdown==3.2.1 # via tensorboard
markupsafe==1.1.1 # via jinja2
minio==5.0.7 # via -r requirements.in (line 4)
mistune==0.8.4 # via nbconvert
ml-metadata==0.21.1 # via tfx
ml-metadata==0.21.2 # via tfx
mock==2.0.0 # via apache-beam
monotonic==1.5 # via fasteners
nbconvert==5.6.1 # via jupyter, notebook, papermill
Expand All @@ -81,7 +81,7 @@ numpy==1.18.1 # via h5py, keras-applications, keras-preprocessing, o
oauth2client==3.0.0 # via apache-beam, google-apitools
oauthlib==3.1.0 # via requests-oauthlib
opt-einsum==3.1.0 # via tensorflow
pandas==0.25.3 # via tensorflow-data-validation
pandas==0.25.3 # via tensorflow-data-validation, tensorflow-model-analysis
pandocfilters==1.4.2 # via nbconvert
papermill==1.0.1 # via -r requirements.in (line 6)
parso==0.6.1 # via jedi
Expand All @@ -92,7 +92,7 @@ prometheus-client==0.7.1 # via notebook
prompt-toolkit==2.0.10 # via ipython, jupyter-console
protobuf==3.11.3 # via apache-beam, google-api-core, google-cloud-bigquery, googleapis-common-protos, ml-metadata, tensorboard, tensorflow, tensorflow-data-validation, tensorflow-metadata, tensorflow-model-analysis, tensorflow-serving-api, tensorflow-transform, tfx, tfx-bsl
ptyprocess==0.6.0 # via pexpect, terminado
pyarrow==0.15.1 # via apache-beam, tensorflow-data-validation, tfx, tfx-bsl
pyarrow==0.15.1 # via apache-beam, tensorflow-data-validation, tensorflow-model-analysis, tfx, tfx-bsl
pyasn1-modules==0.2.8 # via google-auth, oauth2client
pyasn1==0.4.8 # via oauth2client, pyasn1-modules, rsa
pydot==1.4.1 # via apache-beam, tensorflow-transform
Expand All @@ -114,19 +114,19 @@ send2trash==1.5.0 # via notebook
six==1.14.0 # via absl-py, bleach, docker, fasteners, fire, google-api-core, google-api-python-client, google-apitools, google-auth, google-pasta, google-resumable-media, grpcio, h5py, hdfs, jsonschema, junit-xml, keras-preprocessing, kubernetes, ml-metadata, mock, oauth2client, papermill, prompt-toolkit, protobuf, pyarrow, pyrsistent, python-dateutil, tenacity, tensorboard, tensorflow, tensorflow-data-validation, tensorflow-model-analysis, tensorflow-transform, tfx, tfx-bsl, traitlets, websocket-client
tenacity==6.1.0 # via papermill
tensorboard==2.1.0 # via tensorflow
tensorflow-data-validation==0.21.2 # via tfx
tensorflow-data-validation==0.21.4 # via tfx
tensorflow-estimator==2.1.0 # via tensorflow
tensorflow-metadata==0.21.1 # via tensorflow-data-validation, tensorflow-model-analysis, tensorflow-transform, tfx-bsl
tensorflow-model-analysis==0.21.3 # via tfx
tensorflow-model-analysis==0.21.4 # via tfx
tensorflow-serving-api==2.1.0 # via tfx, tfx-bsl
tensorflow-transform==0.21.0 # via -r requirements.in (line 13), tensorflow-data-validation, tfx
tensorflow-transform==0.21.2 # via tensorflow-data-validation, tfx
tensorflow==2.1.0 # via ml-metadata, tensorflow-data-validation, tensorflow-model-analysis, tensorflow-serving-api, tensorflow-transform, tfx, tfx-bsl
termcolor==1.1.0 # via fire, tensorflow
terminado==0.8.3 # via notebook
testpath==0.4.4 # via nbconvert
textwrap3==0.9.2 # via ansiwrap
tfx-bsl==0.21.2 # via tensorflow-data-validation, tensorflow-model-analysis, tensorflow-transform, tfx
tfx==0.21.0 # via -r requirements.in (line 12)
tfx-bsl==0.21.3 # via tensorflow-data-validation, tensorflow-model-analysis, tensorflow-transform, tfx
tfx==0.21.1 # via -r requirements.in (line 12)
tornado==6.0.3 # via ipykernel, jupyter-client, notebook, terminado
tqdm==4.43.0 # via papermill
traitlets==4.3.3 # via ipykernel, ipython, ipywidgets, jupyter-client, jupyter-core, nbconvert, nbformat, notebook, qtconsole
Expand Down

0 comments on commit ee525b9

Please sign in to comment.