Merge branch 'master' of https://github.com/pkmital/CADL

kv91 · Nov 2, 2016 · 22fc6dd · 22fc6dd
2 parents b20977d + 394e8d9
commit 22fc6dd
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -284,7 +284,7 @@ $ pip3 install --upgrade https://storage.googleapis.com/tensorflow/linux/cpu/ten
 ### OSX for Python 3.4 or Python 3.5
 
 ```shell
-$ pip3 install --upgrade https://storage.googleapis.com/tensorflow/mac/tensorflow-0.11.0rc1-py3-none-any.whl
+$ pip3 install --upgrade https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-0.11.0rc1-py3-none-any.whl
 ```
 
 ### Other Linux/OSX varieties

diff --git a/session-0/session-0.ipynb b/session-0/session-0.ipynb
@@ -446,8 +446,8 @@
    },
    "outputs": [],
    "source": [
-    "print(os.path.join('img_align_celeba/', files[0]))\n",
-    "plt.imread(os.path.join('img_align_celeba/', files[0]))"
+    "print(os.path.join('img_align_celeba', files[0]))\n",
+    "plt.imread(os.path.join('img_align_celeba', files[0]))"
    ]
   },
   {

diff --git a/session-3/libs/dataset_utils.py b/session-3/libs/dataset_utils.py
@@ -74,7 +74,7 @@ def create_input_pipeline(files, batch_size, n_epochs, shape, crop_shape=None,
     else:
         rsz_shape = [int(crop_shape[0] / crop_factor),
                      int(shape[1] / shape[0] * crop_shape[1] / crop_factor)]
-    rszs = tf.image.resize_images(imgs, rsz_shape[0], rsz_shape[1])
+    rszs = tf.image.resize_images(imgs, rsz_shape)
     crops = (tf.image.resize_image_with_crop_or_pad(
         rszs, crop_shape[0], crop_shape[1])
         if crop_shape is not None

diff --git a/session-3/session-3.ipynb b/session-3/session-3.ipynb
@@ -242,7 +242,7 @@
    },
    "outputs": [],
    "source": [
-    "std_img = ds.std()\n",
+    "std_img = ds.std().astype(np.uint8)\n",
     "plt.imshow(std_img)\n",
     "print(std_img.shape)"
    ]

diff --git a/session-4/libs/dataset_utils.py b/session-4/libs/dataset_utils.py
@@ -74,7 +74,7 @@ def create_input_pipeline(files, batch_size, n_epochs, shape, crop_shape=None,
     else:
         rsz_shape = [int(crop_shape[0] / crop_factor),
                      int(shape[1] / shape[0] * crop_shape[1] / crop_factor)]
-    rszs = tf.image.resize_images(imgs, rsz_shape[0], rsz_shape[1])
+    rszs = tf.image.resize_images(imgs, rsz_shape)
     crops = (tf.image.resize_image_with_crop_or_pad(
         rszs, crop_shape[0], crop_shape[1])
         if crop_shape is not None

diff --git a/session-5/libs/dataset_utils.py b/session-5/libs/dataset_utils.py
@@ -74,7 +74,7 @@ def create_input_pipeline(files, batch_size, n_epochs, shape, crop_shape=None,
     else:
         rsz_shape = [int(crop_shape[0] / crop_factor),
                      int(shape[1] / shape[0] * crop_shape[1] / crop_factor)]
-    rszs = tf.image.resize_images(imgs, rsz_shape[0], rsz_shape[1])
+    rszs = tf.image.resize_images(imgs, rsz_shape)
     crops = (tf.image.resize_image_with_crop_or_pad(
         rszs, crop_shape[0], crop_shape[1])
         if crop_shape is not None