From 12877122a19c736dc5ab4036cf3348ee3ac45d61 Mon Sep 17 00:00:00 2001 From: LucasAdams Date: Mon, 14 Sep 2015 16:17:04 +0800 Subject: [PATCH 1/3] Fix unpickling UnicodeDecodeError would be thrown if the file is open()ed without byte mode or if no coding is passed to pickle.load. --- examples/ImageNet Pretrained Network (VGG_S).ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/ImageNet Pretrained Network (VGG_S).ipynb b/examples/ImageNet Pretrained Network (VGG_S).ipynb index 38b8489..8292279 100644 --- a/examples/ImageNet Pretrained Network (VGG_S).ipynb +++ b/examples/ImageNet Pretrained Network (VGG_S).ipynb @@ -127,7 +127,7 @@ "source": [ "import pickle\n", "\n", - "model = pickle.load(open('vgg_cnn_s.pkl'))\n", + "model = pickle.load(open('vgg_cnn_s.pkl','rb'),encoding='latin-1')\n", "CLASSES = model['synset words']\n", "MEAN_IMAGE = model['mean image']\n", "\n", From 656b0aad607990dab11c4e2ab8e4f15a25ee6a30 Mon Sep 17 00:00:00 2001 From: LucasAdams Date: Tue, 15 Sep 2015 22:09:25 +0800 Subject: [PATCH 2/3] Update ImageNet Pretrained Network (VGG_S).ipynb --- examples/ImageNet Pretrained Network (VGG_S).ipynb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/examples/ImageNet Pretrained Network (VGG_S).ipynb b/examples/ImageNet Pretrained Network (VGG_S).ipynb index 8292279..1fe54ba 100644 --- a/examples/ImageNet Pretrained Network (VGG_S).ipynb +++ b/examples/ImageNet Pretrained Network (VGG_S).ipynb @@ -127,7 +127,10 @@ "source": [ "import pickle\n", "\n", - "model = pickle.load(open('vgg_cnn_s.pkl','rb'),encoding='latin-1')\n", + "try:\n", + "values = pickle.load(open('vgg19_normalized.pkl','rb'))['param values']\n", + "except UnicodeDecodeError:\n", + "values = pickle.load(open('vgg19_normalized.pkl','rb'),encoding='Latin-1')['param values'] # python3\n", "CLASSES = model['synset words']\n", "MEAN_IMAGE = model['mean image']\n", "\n", From 939d679c1b5e11335430fbf91fb59eccaaefcef4 Mon Sep 17 00:00:00 2001 From: LucasAdams Date: Tue, 15 Sep 2015 22:14:10 +0800 Subject: [PATCH 3/3] Update ImageNet Pretrained Network (VGG_S).ipynb --- examples/ImageNet Pretrained Network (VGG_S).ipynb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/ImageNet Pretrained Network (VGG_S).ipynb b/examples/ImageNet Pretrained Network (VGG_S).ipynb index 1fe54ba..87b383d 100644 --- a/examples/ImageNet Pretrained Network (VGG_S).ipynb +++ b/examples/ImageNet Pretrained Network (VGG_S).ipynb @@ -128,9 +128,9 @@ "import pickle\n", "\n", "try:\n", - "values = pickle.load(open('vgg19_normalized.pkl','rb'))['param values']\n", + " values = pickle.load(open('vgg19_normalized.pkl','rb'))['param values']\n", "except UnicodeDecodeError:\n", - "values = pickle.load(open('vgg19_normalized.pkl','rb'),encoding='Latin-1')['param values'] # python3\n", + " values = pickle.load(open('vgg19_normalized.pkl','rb'),encoding='Latin-1')['param values'] # python3\n", "CLASSES = model['synset words']\n", "MEAN_IMAGE = model['mean image']\n", "\n",