fix util plot for py3, test=develop

revert-15774-anakin_subgraph_engine
lujun 6 years ago
parent 5998d3cc5a
commit da92a2cedc

@ -13,6 +13,7 @@
# limitations under the License. # limitations under the License.
import os import os
import six
class PlotData(object): class PlotData(object):
@ -60,9 +61,9 @@ class Ploter(object):
def append(self, title, step, value): def append(self, title, step, value):
""" """
Feed data Feed data
Args: Args:
title: assign the group data to this subtitle. title: assign the group data to this subtitle.
step: the x_axis of data. step: the x_axis of data.
value: the y_axis of data. value: the y_axis of data.
@ -71,9 +72,9 @@ class Ploter(object):
.. code-block:: python .. code-block:: python
plot_curve = Ploter("Curve 1","Curve 2") plot_curve = Ploter("Curve 1","Curve 2")
plot_curve.append(title="Curve 1",step=1,value=1) plot_curve.append(title="Curve 1",step=1,value=1)
""" """
assert isinstance(title, basestring) assert isinstance(title, six.string_types)
assert self.__plot_data__.has_key(title) assert title in self.__plot_data__
data = self.__plot_data__[title] data = self.__plot_data__[title]
assert isinstance(data, PlotData) assert isinstance(data, PlotData)
data.append(step, value) data.append(step, value)
@ -89,7 +90,7 @@ class Ploter(object):
.. code-block:: python .. code-block:: python
plot_curve = Ploter() plot_curve = Ploter()
plot_cure.plot() plot_cure.plot()
""" """
if self.__plot_is_disabled__(): if self.__plot_is_disabled__():
return return

@ -122,7 +122,7 @@ class ImageClassificationDatasetCreater(preprocess_util.DatasetCreater):
def create_dataset_from_list(self, path): def create_dataset_from_list(self, path):
data = [] data = []
label_set = [] label_set = []
for line in open(file_list): for line in open(path):
items = line.rstrip.split() items = line.rstrip.split()
image_path = items[0] image_path = items[0]
label_name = items[1] label_name = items[1]
@ -141,7 +141,7 @@ class ImageClassificationDatasetCreater(preprocess_util.DatasetCreater):
path: the path of the image dataset. path: the path of the image dataset.
""" """
if self.from_list: if self.from_list:
return create_dataset_from_list(path) return self.create_dataset_from_list(path)
label_set = preprocess_util.get_label_set_from_dir(path) label_set = preprocess_util.get_label_set_from_dir(path)
data = [] data = []
for l_name in list(label_set.keys()): for l_name in list(label_set.keys()):

Loading…
Cancel
Save