Sync to master.

pkulzc · pkulzc · commit 13b89b936b87 · 2018-04-16T17:03:26.000-07:00
diff --git a/research/slim/train_image_classifier.py b/research/slim/train_image_classifier.py
@@ -552,6 +552,8 @@ def clone_fn(batch_queue):
     # Merge all summaries together.
     summary_op = tf.summary.merge(list(summaries), name='summary_op')
 
+    # Add config to avoid 'could not satisfy explicit device' problem 
+    sess_config = tf.ConfigProto(allow_soft_placement=True)
 
     ###########################
     # Kicks off the training. #
@@ -567,7 +569,8 @@ def clone_fn(batch_queue):
         log_every_n_steps=FLAGS.log_every_n_steps,
         save_summaries_secs=FLAGS.save_summaries_secs,
         save_interval_secs=FLAGS.save_interval_secs,
-        sync_optimizer=optimizer if FLAGS.sync_replicas else None)
+        sync_optimizer=optimizer if FLAGS.sync_replicas else None,
+        session_config=sess_config)
 
 
 if __name__ == '__main__':
diff --git a/samples/core/get_started/eager.ipynb b/samples/core/get_started/eager.ipynb
@@ -538,7 +538,7 @@
         "\n",
         "<table>\n",
         "  <tr><td>\n",
-        "    <img src=\"http://cs231n.github.io/assets/nn3/opt1.gif\" width=\"70%\"\n",
+        "    <img src=\"https://cs231n.github.io/assets/nn3/opt1.gif\" width=\"70%\"\n",
         "         alt=\"Optimization algorthims visualized over time in 3D space.\">\n",
         "  </td></tr>\n",
         "  <tr><td align=\"center\">\n",
