Skip to content

Commit be66467

Browse files
authored
change class lable string encoding as 'utf-8'. (#128)
* change class lable string encoding as 'utf-8'. * Update all converter string encoding as 'utf-8'
1 parent 51cb0de commit be66467

File tree

14 files changed

+17
-17
lines changed

14 files changed

+17
-17
lines changed

onnxmltools/convert/coreml/operator_converters/GLMClassifier.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def convert_glm_classifier(scope, operator, container):
7272
matrix_w[i, :] = w.value
7373

7474
if glm.WhichOneof('ClassLabels') == 'stringClassLabels':
75-
class_labels = list(s.encode('ascii') for s in glm.stringClassLabels.vector)
75+
class_labels = list(s.encode('utf-8') for s in glm.stringClassLabels.vector)
7676
attrs['classlabels_strings'] = class_labels
7777
zipmap_attrs['classlabels_strings'] = class_labels
7878
elif glm.WhichOneof('ClassLabels') == 'int64ClassLabels':

onnxmltools/convert/coreml/operator_converters/OneHotEncoder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def convert_one_hot_encoder(scope, operator, container):
1515
if raw_model.HasField('int64Categories'):
1616
attrs['cats_int64s'] = list(int(i) for i in raw_model.int64Categories.vector)
1717
if raw_model.HasField('stringCategories'):
18-
attrs['cats_strings'] = list(str(s).encode('ascii') for s in raw_model.stringCategories.vector)
18+
attrs['cats_strings'] = list(str(s).encode('utf-8') for s in raw_model.stringCategories.vector)
1919

2020
container.add_node(op_type, [operator.inputs[0].full_name], [operator.outputs[0].full_name],
2121
op_domain='ai.onnx.ml', **attrs)

onnxmltools/convert/coreml/operator_converters/SVC.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def convert_svm_classifier(scope, operator, container):
8383
attrs['classlabels_ints'] = class_labels
8484
zipmap_attrs['classlabels_int64s'] = class_labels
8585
elif svc_classes == 'stringClassLabels':
86-
class_labels = list(str(s).encode('ascii') for s in params.stringClassLabels.vector)
86+
class_labels = list(str(s).encode('utf-8') for s in params.stringClassLabels.vector)
8787
attrs['classlabels_strings'] = class_labels
8888
zipmap_attrs['classlabels_strings'] = class_labels
8989
else:

onnxmltools/convert/coreml/operator_converters/TensorToLabel.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def convert_tensor_to_label(scope, operator, container):
4141
if model_type == 'neuralNetworkClassifier':
4242
model = operator.raw_operator.neuralNetworkClassifier
4343
if model.WhichOneof('ClassLabels') == 'stringClassLabels':
44-
labels = list(s.encode('ascii') for s in model.stringClassLabels.vector)
44+
labels = list(s.encode('utf-8') for s in model.stringClassLabels.vector)
4545
label_type = onnx_proto.TensorProto.STRING
4646
elif model.WhichOneof('ClassLabels') == 'int64ClassLabels':
4747
labels = list(int(i) for i in model.int64ClassLabels.vector)
@@ -51,7 +51,7 @@ def convert_tensor_to_label(scope, operator, container):
5151
elif model_type == 'pipelineClassifier':
5252
model = operator.raw_operator.pipelineClassifier
5353
if model.WhichOneof('ClassLabels') == 'stringClassLabels':
54-
labels = list(s.encode('ascii') for s in model.pipelineClassifier.stringClassLabels.vector)
54+
labels = list(s.encode('utf-8') for s in model.pipelineClassifier.stringClassLabels.vector)
5555
label_type = onnx_proto.TensorProto.STRING
5656
elif model.WhichOneof('ClassLabels') == 'int64ClassLabels':
5757
labels = list(int(i) for i in model.int64ClassLabels.vector)

onnxmltools/convert/coreml/operator_converters/TensorToProbabilityMap.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ def convert_tensor_to_probability_map(scope, operator, container):
2525
if model_type == 'neuralNetworkClassifier':
2626
model = operator.raw_operator.neuralNetworkClassifier
2727
if model.WhichOneof('ClassLabels') == 'stringClassLabels':
28-
attrs['classlabels_strings'] = list(s.encode('ascii') for s in model.stringClassLabels.vector)
28+
attrs['classlabels_strings'] = list(s.encode('utf-8') for s in model.stringClassLabels.vector)
2929
elif model.WhichOneof('ClassLabels') == 'int64ClassLabels':
3030
attrs['classlabels_int64s'] = list(int(i) for i in model.int64ClassLabels.vector)
3131
else:
3232
raise ValueError('Unknown label type found')
3333
elif model_type == 'pipelineClassifier':
3434
model = operator.raw_operator.pipelineClassifier
3535
if model.WhichOneof('ClassLabels') == 'stringClassLabels':
36-
attrs['classlabels_strings'] = list(s.encode('ascii') for s in model.stringClassLabels.vector)
36+
attrs['classlabels_strings'] = list(s.encode('utf-8') for s in model.stringClassLabels.vector)
3737
elif model.WhichOneof('ClassLabels') == 'int64ClassLabels':
3838
attrs['classlabels_int64s'] = list(int(i) for i in model.int64ClassLabels.vector)
3939
else:

onnxmltools/convert/coreml/operator_converters/TreeEnsemble.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def convert_tree_ensemble_model(scope, operator, container):
5151
attrs['classlabels_int64s'] = class_labels
5252
zipmap_attrs['classlabels_int64s'] = class_labels
5353
else:
54-
class_labels = list(s.encode('ascii') for s in raw_model.treeEnsembleClassifier.stringClassLabels.vector)
54+
class_labels = list(s.encode('utf-8') for s in raw_model.treeEnsembleClassifier.stringClassLabels.vector)
5555
attrs['classlabels_strings'] = class_labels
5656
zipmap_attrs['classlabels_strings'] = class_labels
5757
elif raw_model.WhichOneof('Type') == 'treeEnsembleRegressor':

onnxmltools/convert/coreml/operator_converters/neural_network/BidirectionalLSTM.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,14 +303,14 @@ def convert_bidirectional_lstm(scope, operator, container):
303303
betas = []
304304
for activation in params.activationsForwardLSTM:
305305
activation_type, alpha, beta = extract_rnn_activation_info(activation)
306-
activation_types.append(activation_type.encode('ascii'))
306+
activation_types.append(activation_type.encode('utf-8'))
307307
if alpha is not None:
308308
alphas.append(alpha)
309309
if beta is not None:
310310
betas.append(beta)
311311
for activation in params.activationsBackwardLSTM:
312312
activation_type, alpha, beta = extract_rnn_activation_info(activation)
313-
activation_types.append(activation_type.encode('ascii'))
313+
activation_types.append(activation_type.encode('utf-8'))
314314
if alpha is not None:
315315
alphas.append(alpha)
316316
if beta is not None:

onnxmltools/convert/coreml/operator_converters/neural_network/GRU.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ def convert_gru(scope, operator, container):
143143
betas = []
144144
for activation in params.activations:
145145
activation_type, alpha, beta = extract_rnn_activation_info(activation)
146-
activation_types.append(activation_type.encode('ascii'))
146+
activation_types.append(activation_type.encode('utf-8'))
147147
if alpha is not None:
148148
alphas.append(alpha)
149149
if beta is not None:

onnxmltools/convert/coreml/operator_converters/neural_network/LSTM.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ def convert_unidirectional_lstm(scope, operator, container):
236236
betas = []
237237
for activation in params.activations:
238238
activation_type, alpha, beta = extract_rnn_activation_info(activation)
239-
activation_types.append(activation_type.encode('ascii'))
239+
activation_types.append(activation_type.encode('utf-8'))
240240
if alpha is not None:
241241
alphas.append(alpha)
242242
if beta is not None:

onnxmltools/convert/coreml/operator_converters/neural_network/SimpleRNN.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ def convert_simple_rnn(scope, operator, container):
179179

180180
# Add RNN's information of activation function
181181
activation, alpha, beta = extract_rnn_activation_info(params.activation)
182-
rnn_attrs['activations'] = [activation.encode('ascii')]
182+
rnn_attrs['activations'] = [activation.encode('utf-8')]
183183
if alpha is not None:
184184
rnn_attrs['activation_alpha'] = [alpha]
185185
if beta is not None:

0 commit comments

Comments
 (0)