Merge pull request #168 from vijaykyr/master

Lab Maintenance

Author: vijaykyr

courses/machine_learning/deepdive/03_tensorflow/a_tfstart.ipynb

@@ -14,7 +14,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": 3,
    "metadata": {
     "collapsed": false,
     "deletable": true,
@@ -25,15 +25,15 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "1.4.1\n"
+      "1.7.0\n"
      ]
     }
    ],
    "source": [
     "import tensorflow as tf\n",
     "import numpy as np\n",
     "\n",
-    "print tf.__version__"
+    "print(tf.__version__)"
    ]
   },
   {
@@ -50,7 +50,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 4,
    "metadata": {
     "collapsed": false,
     "deletable": true,
@@ -86,7 +86,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 5,
    "metadata": {
     "collapsed": false,
     "deletable": true,
@@ -130,7 +130,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 6,
    "metadata": {
     "collapsed": false,
     "deletable": true,
@@ -165,7 +165,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 9,
    "metadata": {
     "collapsed": false,
     "deletable": true,
@@ -208,7 +208,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 10,
    "metadata": {
     "collapsed": false,
     "deletable": true,
@@ -259,7 +259,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 11,
    "metadata": {
     "collapsed": false,
     "deletable": true,
@@ -312,19 +312,30 @@
     "editable": true
    },
    "outputs": [
+    {
+     "name": "stderr",
+     "output_type": "stream",
+     "text": [
+      "/usr/local/envs/py2env/lib/python2.7/site-packages/h5py/__init__.py:36: FutureWarning: Conversion of the second argument of issubdtype from `float` to `np.floating` is deprecated. In future, it will be treated as `np.float64 == np.dtype(float).type`.\n",
+      "  from ._conv import register_converters as _register_converters\n"
+     ]
+    },
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
+      "WARNING:tensorflow:From /usr/local/envs/py2env/lib/python2.7/site-packages/tensorflow/contrib/learn/python/learn/datasets/base.py:198: retry (from tensorflow.contrib.learn.python.learn.datasets.base) is deprecated and will be removed in a future version.\n",
+      "Instructions for updating:\n",
+      "Use the retry module or similar alternatives.\n",
       "tf.Tensor([6.278497 4.709139], shape=(2,), dtype=float32)\n"
      ]
     }
    ],
    "source": [
     "import tensorflow as tf\n",
-    "from tensorflow.contrib.eager.python import tfe\n",
+    "import tensorflow.contrib.eager as tfe\n",
     "\n",
-    "tfe.enable_eager_execution()\n",
+    "tf.enable_eager_execution()\n",
     "\n",
     "def compute_area(sides):\n",
     "  # slice the input to get the sides\n",
@@ -348,7 +359,10 @@
   },
   {
    "cell_type": "markdown",
-   "metadata": {},
+   "metadata": {
+    "deletable": true,
+    "editable": true
+   },
    "source": [
     "## Challenge Exercise\n",
     "\n",

courses/machine_learning/deepdive/03_tensorflow/b_estimator.ipynb

@@ -67,7 +67,7 @@
     "editable": true
    },
    "source": [
-    "<h2> Input function to read from Pandas Dataframe </h2>"
+    "<h2> Input functions to read from Pandas Dataframe </h2>"
    ]
   },
   {
@@ -92,6 +92,38 @@
     "  )"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "deletable": true,
+    "editable": true
+   },
+   "source": [
+    "Our input function for predictions is the same except we don't provide a label"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "collapsed": true,
+    "deletable": true,
+    "editable": true
+   },
+   "outputs": [],
+   "source": [
+    "def make_prediction_input_fn(df, num_epochs):\n",
+    "  return tf.estimator.inputs.pandas_input_fn(\n",
+    "    x = df,\n",
+    "    y = None,\n",
+    "    batch_size = 128,\n",
+    "    num_epochs = num_epochs,\n",
+    "    shuffle = True,\n",
+    "    queue_capacity = 1000,\n",
+    "    num_threads = 1\n",
+    "  )"
+   ]
+  },
   {
    "cell_type": "markdown",
    "metadata": {
@@ -194,12 +226,9 @@
    },
    "outputs": [],
    "source": [
-    "import itertools\n",
-    "# Read saved model and use it for prediction\n",
-    "model = tf.estimator.LinearRegressor(\n",
-    "      feature_columns = make_feature_cols(), model_dir = OUTDIR)\n",
-    "preds_iter = model.predict(input_fn = make_input_fn(df_valid, 1))\n",
-    "print([pred['predictions'][0] for pred in list(itertools.islice(preds_iter, 5))])"
+    "predictions = model.predict(input_fn = make_prediction_input_fn(df_valid, 1))\n",
+    "for i in xrange(5):\n",
+    "  print(predictions.next())"
    ]
   },
   {
@@ -357,7 +386,10 @@
   },
   {
    "cell_type": "markdown",
-   "metadata": {},
+   "metadata": {
+    "deletable": true,
+    "editable": true
+   },
    "source": [
     "## Challenge Exercise\n",
     "\n",
@@ -386,21 +418,21 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 2",
    "language": "python",
-   "name": "python3"
+   "name": "python2"
   },
   "language_info": {
    "codemirror_mode": {
     "name": "ipython",
-    "version": 3
+    "version": 2
    },
    "file_extension": ".py",
    "mimetype": "text/x-python",
    "name": "python",
    "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.5.5"
+   "pygments_lexer": "ipython2",
+   "version": "2.7.14"
   }
  },
  "nbformat": 4,

courses/machine_learning/deepdive/03_tensorflow/c_dataset.ipynb

@@ -200,7 +200,10 @@
   },
   {
    "cell_type": "markdown",
-   "metadata": {},
+   "metadata": {
+    "deletable": true,
+    "editable": true
+   },
    "source": [
     "## Challenge Exercise\n",
     "\n",

courses/machine_learning/deepdive/03_tensorflow/d_traineval.ipynb

@@ -300,7 +300,10 @@
   },
   {
    "cell_type": "markdown",
-   "metadata": {},
+   "metadata": {
+    "deletable": true,
+    "editable": true
+   },
    "source": [
     "## Challenge Exercise\n",
     "\n",