From 2db17218702c7810b471f74265610b0ff29deb0f Mon Sep 17 00:00:00 2001
From: dheckl <9950090+dheckl@users.noreply.github.com>
Date: Mon, 3 Feb 2020 16:46:21 +0100
Subject: [PATCH 1/2] Optimize torch.load for CPU and GPU usage

---
 examples/tutorials/dermoscopy.ipynb | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/examples/tutorials/dermoscopy.ipynb b/examples/tutorials/dermoscopy.ipynb
index e1d6b66..618c2c6 100644
--- a/examples/tutorials/dermoscopy.ipynb
+++ b/examples/tutorials/dermoscopy.ipynb
@@ -235,10 +235,12 @@
     "        ]\n",
     "    save_dir = os.path.join(model_args.root_save_dir, \"results\"+'_'.join([t.format(v) for (t, v) in setup]))\n",
     "    \n",
-    "    # Change map_location if training on GPU.\n",
-    "    net = torch.load(os.path.join(save_dir, 'net.p'),  map_location='cpu')\n",
-    "    # Change to True if training on GPU.\n",
-    "    net.cuda_available=False\n",
+    "    if cuda_available:\n",
+    "        net = torch.load(os.path.join(save_dir, 'net.p'),  map_location='cpu')\n",
+    "        net.cuda_available=False\n",
+    "    else:\n",
+    "        net = torch.load(os.path.join(save_dir, 'net.p'),  map_location='cuda:0': 'cpu'})\n",
+    "        net.cuda_available=True\n",
     "    \n",
     "    return net"
    ]
@@ -825,8 +827,17 @@
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
    "version": "3.6.9"
+  },
+  "pycharm": {
+   "stem_cell": {
+    "cell_type": "raw",
+    "source": [],
+    "metadata": {
+     "collapsed": false
+    }
+   }
   }
  },
  "nbformat": 4,
  "nbformat_minor": 2
-}
+}
\ No newline at end of file

From 97e088922a234ba32c4ab5c81faf8fa81c48878d Mon Sep 17 00:00:00 2001
From: dheckl <9950090+dheckl@users.noreply.github.com>
Date: Mon, 3 Feb 2020 16:50:32 +0100
Subject: [PATCH 2/2] Removed auto-added pycharm metadata

---
 examples/tutorials/dermoscopy.ipynb | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/examples/tutorials/dermoscopy.ipynb b/examples/tutorials/dermoscopy.ipynb
index 618c2c6..df222f5 100644
--- a/examples/tutorials/dermoscopy.ipynb
+++ b/examples/tutorials/dermoscopy.ipynb
@@ -827,17 +827,8 @@
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
    "version": "3.6.9"
-  },
-  "pycharm": {
-   "stem_cell": {
-    "cell_type": "raw",
-    "source": [],
-    "metadata": {
-     "collapsed": false
-    }
-   }
   }
  },
  "nbformat": 4,
  "nbformat_minor": 2
-}
\ No newline at end of file
+}