commit 1e7bd7586d0d7770a462be421f31c4536f382d47
author Benny Chen <bennychen1993@fb.com> Thu Jun 13 23:38:12 2019 -0700
committer Facebook Github Bot <facebook-github-bot@users.noreply.github.com> Thu Jun 13 23:41:04 2019 -0700
tree 42e5d5c2780fc392e73c0c9dbc27a3e67b3f9a35
parent d9eec4ef0d7fcd7840e53f44c226dae902fd9e0d

Query caffe2 operator stats for detailed execution info (#20924)

Summary:
Pull Request resolved: https://github.com/pytorch/pytorch/pull/20924

I found a python3 bug for deserializing caffe2 code. The exception thrown is Unicode related error instead of just decode error, and we need to catch that as well

Reviewed By: ipiszy

Differential Revision: D15293221

fbshipit-source-id: 29820800d1b4cbe5bf3f5a189fe2023e655d0508

caffe2/python/utils.py

diff --git a/caffe2/python/utils.py b/caffe2/python/utils.py
index d5c6355..c1dcb88 100644
--- a/caffe2/python/utils.py
+++ b/caffe2/python/utils.py
@@ -205,7 +205,7 @@
     try:
         text_format.Parse(s, obj)
         return obj
-    except text_format.ParseError:
+    except (text_format.ParseError, UnicodeDecodeError):
         obj.ParseFromString(s)
         return obj