@@ -24,7 +24,11 @@ def get_quantizer_from_config(keras_layer, quantizer_var):
24
24
def parse_qdense_layer (keras_layer , input_names , input_shapes , data_reader ):
25
25
layer , output_shape = parse_dense_layer (keras_layer , input_names , input_shapes , data_reader )
26
26
27
- layer ['weight_quantizer' ] = get_quantizer_from_config (keras_layer , 'kernel' )
27
+ if keras_layer ['config' ]['kernel_quantizer' ] is not None :
28
+ layer ['weight_quantizer' ] = get_quantizer_from_config (keras_layer , 'kernel' )
29
+ else :
30
+ layer ['weight_quantizer' ] = None
31
+
28
32
if keras_layer ['config' ]['bias_quantizer' ] is not None :
29
33
layer ['bias_quantizer' ] = get_quantizer_from_config (keras_layer , 'bias' )
30
34
else :
@@ -42,7 +46,11 @@ def parse_qconv_layer(keras_layer, input_names, input_shapes, data_reader):
42
46
elif '2D' in keras_layer ['class_name' ]:
43
47
layer , output_shape = parse_conv2d_layer (keras_layer , input_names , input_shapes , data_reader )
44
48
45
- layer ['weight_quantizer' ] = get_quantizer_from_config (keras_layer , 'kernel' )
49
+ if keras_layer ['config' ]['kernel_quantizer' ] is not None :
50
+ layer ['weight_quantizer' ] = get_quantizer_from_config (keras_layer , 'kernel' )
51
+ else :
52
+ layer ['weight_quantizer' ] = None
53
+
46
54
if keras_layer ['config' ]['bias_quantizer' ] is not None :
47
55
layer ['bias_quantizer' ] = get_quantizer_from_config (keras_layer , 'bias' )
48
56
else :
@@ -55,8 +63,10 @@ def parse_qconv_layer(keras_layer, input_names, input_shapes, data_reader):
55
63
def parse_qdepthwiseqconv_layer (keras_layer , input_names , input_shapes , data_reader ):
56
64
layer , output_shape = parse_conv2d_layer (keras_layer , input_names , input_shapes , data_reader )
57
65
58
- layer ['depthwise_quantizer' ] = get_quantizer_from_config (keras_layer , 'depthwise' )
59
-
66
+ if keras_layer ['config' ]['depthwise_quantizer' ] is not None :
67
+ layer ['depthwise_quantizer' ] = get_quantizer_from_config (keras_layer , 'depthwise' )
68
+ else :
69
+ layer ['depthwise_quantizer' ] = None
60
70
if keras_layer ['config' ]['bias_quantizer' ] is not None :
61
71
layer ['bias_quantizer' ] = get_quantizer_from_config (keras_layer , 'bias' )
62
72
else :
@@ -74,8 +84,14 @@ def parse_qsepconv_layer(keras_layer, input_names, input_shapes, data_reader):
74
84
elif '2D' in keras_layer ['class_name' ]:
75
85
layer , output_shape = parse_conv2d_layer (keras_layer , input_names , input_shapes , data_reader )
76
86
77
- layer ['depthwise_quantizer' ] = get_quantizer_from_config (keras_layer , 'depthwise' )
78
- layer ['pointwise_quantizer' ] = get_quantizer_from_config (keras_layer , 'pointwise' )
87
+ if keras_layer ['config' ]['depthwise_quantizer' ] is not None :
88
+ layer ['depthwise_quantizer' ] = get_quantizer_from_config (keras_layer , 'depthwise' )
89
+ else :
90
+ layer ['depthwise_quantizer' ] = None
91
+ if keras_layer ['config' ]['pointwise_quantizer' ] is not None :
92
+ layer ['pointwise_quantizer' ] = get_quantizer_from_config (keras_layer , 'pointwise' )
93
+ else :
94
+ layer ['pointwise_quantizer' ] = None
79
95
80
96
if keras_layer ['config' ]['bias_quantizer' ] is not None :
81
97
layer ['bias_quantizer' ] = get_quantizer_from_config (keras_layer , 'bias' )
@@ -91,8 +107,14 @@ def parse_qrnn_layer(keras_layer, input_names, input_shapes, data_reader):
91
107
92
108
layer , output_shape = parse_rnn_layer (keras_layer , input_names , input_shapes , data_reader )
93
109
94
- layer ['weight_quantizer' ] = get_quantizer_from_config (keras_layer , 'kernel' )
95
- layer ['recurrent_quantizer' ] = get_quantizer_from_config (keras_layer , 'recurrent' )
110
+ if keras_layer ['config' ]['kernel_quantizer' ] is not None :
111
+ layer ['weight_quantizer' ] = get_quantizer_from_config (keras_layer , 'kernel' )
112
+ else :
113
+ layer ['weight_quantizer' ] = None
114
+ if keras_layer ['config' ]['recurrent_quantizer' ] is not None :
115
+ layer ['recurrent_quantizer' ] = get_quantizer_from_config (keras_layer , 'recurrent' )
116
+ else :
117
+ layer ['recurrent_quantizer' ] = None
96
118
97
119
if keras_layer ['config' ]['bias_quantizer' ] is not None :
98
120
layer ['bias_quantizer' ] = get_quantizer_from_config (keras_layer , 'bias' )
0 commit comments