Skip to content

Commit

Permalink
Remove comment-outed line and format with autopep8.
Browse files Browse the repository at this point in the history
  • Loading branch information
YukioOobuchi committed May 16, 2018
1 parent 13c20b5 commit 1263aa9
Showing 1 changed file with 9 additions and 14 deletions.
23 changes: 9 additions & 14 deletions python/src/nnabla/utils/converter/nnablart/nnb.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,13 @@

from .utils import create_nnabart_info


class Nnb:
'''
Nnb is only used as namespace
'''
NN_DATA_TYPE_FLOAT, NN_DATA_TYPE_INT16, NN_DATA_TYPE_INT8, NN_DATA_TYPE_SIGN = range(4)
NN_DATA_TYPE_FLOAT, NN_DATA_TYPE_INT16, NN_DATA_TYPE_INT8, NN_DATA_TYPE_SIGN = range(
4)


class NnbExporter:
Expand Down Expand Up @@ -143,16 +145,19 @@ def export(self, nnb_output_filename, settings_template_filename, settings_filen
if (len(fixed16_desc) == 2) and int(fixed16_desc[1]) <= 15:
var.fp_pos = int(fixed16_desc[1])
scale = 1 << var.fp_pos
fixed16_n_data = [int(round(x * scale)) for x in param_data]
data = struct.pack('{}h'.format(len(fixed16_n_data)), *fixed16_n_data)
fixed16_n_data = [int(round(x * scale))
for x in param_data]
data = struct.pack('{}h'.format(
len(fixed16_n_data)), *fixed16_n_data)
var.type = Nnb.NN_DATA_TYPE_INT16
elif v_name.startswith('FIXED8'):
fixed8_desc = v_name.split('_')
if (len(fixed8_desc) == 2) and int(fixed8_desc[1]) <= 7:
var.fp_pos = int(fixed8_desc[1])
scale = 1 << var.fp_pos
fixed8_n_data = [int(round(x * scale)) for x in param_data]
data = struct.pack('{}b'.format(len(fixed8_n_data)), *fixed8_n_data)
data = struct.pack('{}b'.format(
len(fixed8_n_data)), *fixed8_n_data)
var.type = Nnb.NN_DATA_TYPE_INT8

index, pointer = self._alloc(data=data)
Expand All @@ -168,16 +173,6 @@ def export(self, nnb_output_filename, settings_template_filename, settings_filen
# so that nn_network_t::variables::size is conserved
var.data_index = -1

# if v.name in settings['variables']:
# if settings['variables'][v.name] != default_type[0]:
# if v.type == 'Parameter':
# # TODO convert parameter here.
# print('Convert {} to {}.'.format(
# v.name, settings['variables'][v.name]))
# pass
# # TODO set var.type here
# else:
# settings['variables'][v.name] = default_type[0]
variable = struct.pack('IiIBi',
var.id,
var.shape.size, var.shape.list_index,
Expand Down

0 comments on commit 1263aa9

Please sign in to comment.