Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

[MXNET-360]auto convert str to bytes in img.imdecode when py3 #10697

Merged
merged 5 commits into from
Sep 21, 2018
Merged

[MXNET-360]auto convert str to bytes in img.imdecode when py3 #10697

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
50e6b02
change to friendly error message
yajiedesign Jul 1, 2018
8ba6fb5
fix lint
yajiedesign Jul 2, 2018
a419ecd
fix lint
yajiedesign Jul 2, 2018
96a6974
fix lint
yajiedesign Jul 2, 2018
8bd8a5f
update raise message
yajiedesign Sep 14, 2018
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
5 changes: 5 additions & 0 deletions python/mxnet/image/image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,15 @@

from __future__ import absolute_import, print_function

import sys
import os
import random
import logging
import json
import warnings
import numpy as np


try:
import cv2
except ImportError:
Expand Down Expand Up @@ -133,6 +135,9 @@ def imdecode(buf, *args, **kwargs):
<NDArray 224x224x3 @cpu(0)>
"""
if not isinstance(buf, nd.NDArray):
if sys.version_info[0] == 3 and not isinstance(buf, (bytes, np.ndarray)):
raise ValueError('buf must bytes or numpy.ndarray,'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: suggest rephrasing a bit to "buf must be of type bytes or numpy.ndarray"

'if you input str,please convert it to bytes')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: suggest rephrase: "if you would like to input type str, please convert to bytes"

buf = nd.array(np.frombuffer(buf, dtype=np.uint8), dtype=np.uint8)
return _internal._cvimdecode(buf, *args, **kwargs)

Expand Down