Skip to content

[BACKPORT-0.6] Some Windows and MSVC fixes #5870

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yzhliu merged 1 commit into from
Jun 21, 2020
Merged

[BACKPORT-0.6] Some Windows and MSVC fixes #5870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions python/tvm/_ffi/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,13 @@
# this function is needed for python3
# to convert ctypes.char_p .value back to python str
if sys.platform == "win32":
encoding = 'cp' + str(ctypes.cdll.kernel32.GetACP())
py_str = lambda x: x.decode(encoding)
def _py_str(x):
try:
return x.decode('utf-8')
except UnicodeDecodeError:
encoding = 'cp' + str(ctypes.cdll.kernel32.GetACP())
return x.decode(encoding)
py_str = _py_str
else:
py_str = lambda x: x.decode('utf-8')
else:
Expand Down
7 changes: 7 additions & 0 deletions src/runtime/c_runtime_api.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,14 @@ std::string NormalizeError(std::string err_msg) {
if (!(is >> line)) return false;
// get filename
while (is.peek() == ' ') is.get();
#ifdef _MSC_VER // handle volume separator ":" in Windows path
std::string drive;
if (!getline(is, drive, ':')) return false;
if (!getline(is, file_name, ':')) return false;
file_name = drive + ":" + file_name;
#else
if (!getline(is, file_name, ':')) return false;
#endif
// get line number
if (!(is >> line_number)) return false;
// get rest of the message.
Expand Down