Merge pull request #6 from dotmesh-io/update-to-tensorflow-2

Update to Tensorflow 2.1 APIs.

Author: Itamar Turner-Trauring

roadsigns.ipynb

@@ -309,12 +309,12 @@
     "    #print(\"[preprocess_and_decode] got %s\" % (img_str,))\n",
     "    img = tf.io.decode_base64(img_str)\n",
     "    img = tf.image.decode_jpeg(img, channels=1)\n",
-    "    img = tf.image.resize_images(img, (32, 32))\n",
+    "    img = tf.image.resize(img, (32, 32))\n",
     "    img = tf.cast(img, tf.float32)\n",
     "    #img = preprocess(tf.Tensor([img]))\n",
     "    return img\n",
     "  \n",
-    "InputLayer = tf.keras.Input(shape = (1,),dtype=\"string\")\n",
+    "InputLayer = tf.keras.Input(shape = (1,),dtype=\"string\",name=\"input_image_bytes\")\n",
     "OutputLayer = tf.keras.layers.Lambda(lambda img : tf.map_fn(lambda im : preprocess_and_decode(im[0]), img, dtype=\"float32\"))(InputLayer)\n",
     "base64_model = tf.keras.Model(InputLayer, OutputLayer)\n"
    ]
@@ -443,11 +443,7 @@
     "  print('\\nAlready saved a model, cleaning up\\n')\n",
     "  !rm -r {export_path}\n",
     "\n",
-    "tf.saved_model.simple_save(\n",
-    "    tf.keras.backend.get_session(),\n",
-    "    export_path,\n",
-    "    inputs={'input_image_bytes': model.input}, \n",
-    "    outputs={t.name:t for t in model.outputs})\n",
+    "tf.saved_model.save(model, export_path)\n",
     "\n",
     "print('\\nSaved model:')\n",
     "!ls -l {export_path}"
@@ -533,4 +529,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 4
-}
+}