small changes to transposes

Author: Jonathan-Shoemaker

hls4ml/model/types.py

@@ -229,7 +229,6 @@ def __init__(self, var_name, type_name, precision, data, quantizer=None, keep_di
         self.data = data
         self.nzeros = -1
         self.shape = list(self.data.shape)
-        print("Weight Variable shape object creation:", self.shape)
         self.data_length = np.prod(self.data.shape)
         self.nonzeros = np.count_nonzero(self.data)
         self.nzeros = self.data_length - self.nonzeros

hls4ml/templates/vivado/nnet_utils/nnet_conv1dtranspose_stream.h

@@ -13,13 +13,13 @@ void kernel_shift_tr_1d(
     typename data_T::value_type kernel_window[CONFIG_T::trfilt_width * CONFIG_T::n_chan]
 ) {
     #pragma HLS INLINE
-    #pragma HLS PIPELINE II = 1
 
     // Shift kernel_window by one step to the left (manual shift operation)
     static const int filt_width = CONFIG_T::trfilt_width - 1;
     KernelShiftWidth: for (int i_iw = 0; i_iw < filt_width; i_iw++) {
-        #pragma HLS UNROLL
+        #pragma HLS PIPELINE II = 1
         KernelShiftChannel: for (unsigned i_ic = 0; i_ic < CONFIG_T::n_chan; i_ic++) {
+            #pragma HLS UNROLL
             // Shift every element in kernel_window to the left
             kernel_window[i_iw * CONFIG_T::n_chan + i_ic] = kernel_window[(i_iw + 1) * CONFIG_T::n_chan + i_ic];
         }

hls4ml/templates/vivado/nnet_utils/nnet_conv2dtranspose_resource.h

@@ -115,6 +115,7 @@ void conv_2d_transpose_resource_cl(
 
             StrideHeightResultLoop:
             for (unsigned i_sh = 0; i_sh < CONFIG_T::stride_height; i_sh++) {
+                #pragma HLS UNROLL
                 StrideWidthResultLoop:
                 for (unsigned i_sw = 0; i_sw < CONFIG_T::stride_width; i_sw++) {
                     #pragma HLS UNROLL
@@ -125,8 +126,7 @@ void conv_2d_transpose_resource_cl(
 
                     if (height_ind >= CONFIG_T::pad_top && height_ind < CONFIG_T::out_height + CONFIG_T::pad_top && 
                         width_ind >= CONFIG_T::pad_left && width_ind < CONFIG_T::out_width + CONFIG_T::pad_left) {
-                        ResultLoop:
-                        for (unsigned i_res = 0; i_res < mult_n_out; i_res++) {
+                        ResultLoop: for (unsigned i_res = 0; i_res < mult_n_out; i_res++) {
                             #pragma HLS UNROLL
 
                             res[((height_ind-CONFIG_T::pad_top)*CONFIG_T::out_width + width_ind-CONFIG_T::pad_left)*

hls4ml/templates/vivado/nnet_utils/nnet_conv_stream.h

@@ -156,13 +156,13 @@ void kernel_shift_1d(
     typename data_T::value_type kernel_window[CONFIG_T::filt_width * CONFIG_T::n_chan]
 ) {
     #pragma HLS inline
-    #pragma HLS PIPELINE II = 1
 
     // Shift kernel_window by one step to the left (manual shift operation)
     static const int filt_width = CONFIG_T::filt_width - 1;
     KernelShiftWidth: for (int i_iw = 0; i_iw < filt_width; i_iw++) {
-        #pragma HLS UNROLL
+        #pragma HLS PIPELINE II = 1
         KernelShiftChannel: for (unsigned i_ic = 0; i_ic < CONFIG_T::n_chan; i_ic++) {
+            #pragma HLS UNROLL
             // Shift every element in kernel_window to the left
             kernel_window[i_iw * CONFIG_T::n_chan + i_ic] = kernel_window[(i_iw + 1) * CONFIG_T::n_chan + i_ic];
         }