Skip to content

Commit 3550df0

Browse files
collucacolluca
committed
sw: Fix -Wincompatible-pointer-types warnings
1 parent 7ac213e commit 3550df0

File tree

5 files changed

+31
-14
lines changed

5 files changed

+31
-14
lines changed

‎sw/dnn/batchnorm/scripts/datagen.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ def emit_header(**kwargs):
5959
ofmap = ofmap.permute(0, 2, 3, 1)
6060

6161
n, ih, iw, ci = ifmap.shape
62+
ifmap = data_utils.flatten(ifmap)
63+
ofmap = data_utils.flatten(ofmap)
6264

6365
ifmap_uid = 'ifmap'
6466
ofmap_uid = 'ofmap'

‎sw/dnn/conv2d/scripts/datagen.py

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,24 @@ def emit_header(**kwargs):
4848

4949
conv2d_output = golden_model(inputs, filters[0],
5050
padding=filter['padding'], stride=filter['stride'])
51+
output_dim = conv2d_output.shape
5152

5253
# compute checksum row-wise
5354
conv2d_checksum = np.sum(conv2d_output.numpy(), axis=1)
5455

5556
ctype = data_utils.ctype_from_precision_t(prec)
5657

58+
inputs = data_utils.flatten(inputs.numpy())
59+
filters = data_utils.flatten(filters[0].numpy())
60+
conv2d_output = data_utils.flatten(conv2d_output.numpy())
61+
5762
layer_cfg = {
5863
'CO': out_channels,
5964
'CI': in_channels,
6065
'IH': input_dim['height'],
6166
'IW': input_dim['width'],
62-
'OH': conv2d_output.shape[1],
63-
'OW': conv2d_output.shape[2],
67+
'OH': output_dim[1],
68+
'OW': output_dim[2],
6469
'FH': filter['height'],
6570
'FW': filter['width'],
6671
'ifmap': 'conv2d_ifmap_dram',
@@ -71,18 +76,18 @@ def emit_header(**kwargs):
7176

7277
data_str = [emit_license()]
7378
data_str += [format_array_declaration(ctype, 'conv2d_ifmap_dram',
74-
inputs.numpy().shape, BURST_ALIGNMENT)]
79+
inputs.shape, BURST_ALIGNMENT)]
7580
data_str += [format_array_declaration(ctype, 'conv2d_weights_dram',
76-
filters[0].numpy().shape, BURST_ALIGNMENT)]
81+
filters.shape, BURST_ALIGNMENT)]
7782
data_str += [format_array_declaration(ctype, 'conv2d_ofmap_dram',
78-
conv2d_output.numpy().shape, BURST_ALIGNMENT)]
83+
conv2d_output.shape, BURST_ALIGNMENT)]
7984
data_str += [format_struct_definition('conv_layer', 'layer', layer_cfg)]
8085
data_str += [format_array_definition(ctype, 'conv2d_ifmap_dram',
81-
inputs.numpy(), BURST_ALIGNMENT)]
86+
inputs, BURST_ALIGNMENT)]
8287
data_str += [format_array_definition(ctype, 'conv2d_weights_dram',
83-
filters[0].numpy(), BURST_ALIGNMENT)]
88+
filters, BURST_ALIGNMENT)]
8489
data_str += [format_array_definition(ctype, 'conv2d_ofmap_dram',
85-
conv2d_output.numpy(), BURST_ALIGNMENT)]
90+
conv2d_output, BURST_ALIGNMENT)]
8691
data_str += [format_array_definition(ctype, 'conv2d_checksum',
8792
conv2d_checksum, BURST_ALIGNMENT)]
8893

‎sw/dnn/fusedconv/scripts/datagen.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -176,32 +176,36 @@ def emit_header(**kwargs):
176176
'dtype': prec
177177
}
178178

179+
ifmap_padded = data_utils.flatten(ifmap_padded.numpy())
180+
kernel = data_utils.flatten(kernel.numpy())
181+
ofmap_before = data_utils.flatten(ofmap_before.numpy())
182+
179183
data_str = [emit_license()]
180184
data_str += [format_array_declaration(ctype, 'fusedconv_pInBuffer_dram',
181-
ifmap_padded.numpy().shape, BURST_ALIGNMENT)]
185+
ifmap_padded.shape, BURST_ALIGNMENT)]
182186
data_str += [format_array_declaration(ctype, 'fusedconv_pWeight_dram',
183-
kernel.numpy().shape, BURST_ALIGNMENT)]
187+
kernel.shape, BURST_ALIGNMENT)]
184188
data_str += [format_array_declaration(ctype, 'fusedconv_lambda_dram',
185189
bn_l.numpy().shape, BURST_ALIGNMENT)]
186190
data_str += [format_array_declaration(ctype, 'fusedconv_kappa_dram',
187191
bn_k.numpy().shape, BURST_ALIGNMENT)]
188192
data_str += [format_array_declaration(ctype, 'fusedconv_pOutBuffer_dram',
189-
ofmap_before.numpy().shape, BURST_ALIGNMENT)]
193+
ofmap_before.shape, BURST_ALIGNMENT)]
190194
data_str += [format_array_declaration(ctype, 'fusedconv_pCheckOutBuffer_dram',
191195
ofmap.numpy().shape, BURST_ALIGNMENT)]
192196
data_str += [format_struct_definition('kernel_fp32', 'layer', layer_cfg)]
193197
data_str += [format_scalar_definition('uint32_t', 'dw', kwargs['depthwise'])]
194198
data_str += [format_scalar_definition('uint32_t', 'chw_layer', kwargs['chw_layer'])]
195199
data_str += [format_array_definition(ctype, 'fusedconv_pInBuffer_dram',
196-
ifmap_padded.numpy(), BURST_ALIGNMENT)]
200+
ifmap_padded, BURST_ALIGNMENT)]
197201
data_str += [format_array_definition(ctype, 'fusedconv_pWeight_dram',
198-
kernel.numpy(), BURST_ALIGNMENT)]
202+
kernel, BURST_ALIGNMENT)]
199203
data_str += [format_array_definition(ctype, 'fusedconv_lambda_dram',
200204
bn_l.numpy(), BURST_ALIGNMENT)]
201205
data_str += [format_array_definition(ctype, 'fusedconv_kappa_dram',
202206
bn_k.numpy(), BURST_ALIGNMENT)]
203207
data_str += [format_array_definition(ctype, 'fusedconv_pOutBuffer_dram',
204-
ofmap_before.numpy(), BURST_ALIGNMENT)]
208+
ofmap_before, BURST_ALIGNMENT)]
205209
data_str += [format_array_definition(ctype, 'fusedconv_pCheckOutBuffer_dram',
206210
ofmap.numpy(), BURST_ALIGNMENT)]
207211

‎sw/dnn/maxpool/scripts/datagen.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ def emit_header(**kwargs):
5454
n, ih, iw, ci = ifmap.shape
5555
_, oh, ow, co = ofmap.shape
5656

57+
ifmap = data_utils.flatten(ifmap)
58+
ofmap = data_utils.flatten(ofmap)
59+
5760
ifmap_uid = 'ifmap'
5861
ofmap_uid = 'ofmap'
5962

‎sw/dnn/softmax/scripts/datagen.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ def emit_header(**kwargs):
4545
ofmap = golden_model(ifmap, reduce_dim)
4646
ofmap = ofmap.detach().numpy()
4747

48+
ifmap = data_utils.flatten(ifmap)
49+
ofmap = data_utils.flatten(ofmap)
50+
4851
ctype = data_utils.ctype_from_precision_t(prec)
4952

5053
ifmap_uid = 'ifmap'

0 commit comments

Comments
 (0)