Merge 77606fb

Author: tfx-team

tfx/examples/chicago_taxi/setup.py

@@ -15,28 +15,29 @@
 import setuptools
 
 # LINT.IfChange
-TF_VERSION = '1.12.0'
+TF_VERSION = '1.13.1'
 # LINT.ThenChange(train_mlengine.sh, start_model_server_mlengine.sh)
 
 # LINT.IfChange
-BEAM_VERSION = '2.11.0'
+BEAM_VERSION = '2.12.0'
 # LINT.ThenChange(setup_beam_on_flink.sh)
 
 if __name__ == '__main__':
   setuptools.setup(
       name='tfx_chicago_taxi',
-      version='0.12.0',
+      version='0.13.0',
       packages=setuptools.find_packages(),
       install_requires=[
-          'apache-beam[gcp]==' + BEAM_VERSION,
-          'jupyter==1.0',
-          'numpy==1.14.5',
-          'protobuf==3.6.1',
-          'tensorflow==' + TF_VERSION,
-          'tensorflow-data-validation==0.12.0',
-          'tensorflow-metadata==0.12.1',
-          'tensorflow-model-analysis==0.12.1',
-          'tensorflow-serving-api==1.12.0',
-          'tensorflow-transform==0.12.0',
+          'apache-beam[gcp]>=' + BEAM_VERSION,
+          'jupyter>=1.0,<2',
+          'notebook>=5.7.8,<5.8',
+          'numpy>=1.14.5,<2',
+          'protobuf>=3.7.0,<3.8.0',
+          'tensorflow>=' + TF_VERSION,
+          'tensorflow-data-validation>=0.13.1,<0.14',
+          'tensorflow-metadata>=0.13.1,<0.14',
+          'tensorflow-model-analysis>=0.13.2,<0.14',
+          'tensorflow-serving-api>=1.13.0,<1.14',
+          'tensorflow-transform>=0.13.0,<0.14',
       ],
-      python_requires='>=2.7,<3')
+      python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,<4',)

tfx/examples/chicago_taxi/setup_beam_on_flink.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2018 Google LLC
+# Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ WORK_DIR="/tmp/beam"
 BEAM_DIR="$WORK_DIR/beam"
 GIT_COMMAND=`which git`
 BEAM_REPO="https://github.com/apache/beam"
-BEAM_BRANCH="release-2.11.0"
+BEAM_BRANCH="release-2.12.0"
 
 SETUP_FLINK=1
 FLINK_VERSION="1.5.6"

tfx/examples/chicago_taxi/start_model_server_mlengine.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2018 Google LLC
+# Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -31,9 +31,11 @@ gsutil ls $WORKING_DIR/serving_model_dir/export/chicago-taxi/
 MODEL_BINARIES=$(gsutil ls $WORKING_DIR/serving_model_dir/export/chicago-taxi/ \
   | sort | grep '\/[0-9]*\/$' | tail -n1)
 
-TF_VERSION=1.12
+# Please refer to https://cloud.google.com/ml-engine/docs/tensorflow/runtime-version-list
+# for version list.
+CAI_RUNTIME_VERSION=1.13
 
 gcloud ml-engine versions create v1 \
   --model chicago_taxi \
   --origin $MODEL_BINARIES \
-  --runtime-version $TF_VERSION
+  --runtime-version $CAI_RUNTIME_VERSION

tfx/examples/chicago_taxi/train_mlengine.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2018 Google LLC
+# Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -61,12 +61,14 @@ EVAL_FILE=$TFT_OUTPUT_PATH/train_transformed-*
 TRAIN_STEPS=100000
 EVAL_STEPS=1000
 
-TF_VERSION=1.12
+# Please refer to https://cloud.google.com/ml-engine/docs/tensorflow/runtime-version-list
+# for version info.
+CAI_RUNTIME_VERSION=1.13
 
 gcloud ml-engine jobs submit training $JOB_ID \
                                     --stream-logs \
                                     --job-dir $MODEL_DIR \
-                                    --runtime-version $TF_VERSION \
+                                    --runtime-version $CAI_RUNTIME_VERSION \
                                     --module-name trainer.task \
                                     --package-path trainer/ \
                                     --region us-central1 \