template and test fix (#1319)

* template and test fix

* intel/ac_types/ac_int.hpp:156:30: error: unsigned _BitInt must have a bit size of at least 1

* more oneapi fix

Author: calad0i

hls4ml/templates/oneapi/firmware/nnet_utils/nnet_merge.h

@@ -68,17 +68,17 @@ template <class input1_T, class input2_T, class res_T, typename CONFIG_T>
 void maximum(const input1_T &data1, const input2_T &data2, res_T &res) {
     #pragma unroll
     for (int i = 0; i < CONFIG_T::n_elem; i++) {
-        res[i] = static_cast<typename res_T::value_type>((data1[i] > data2[i]) ? static_cast<res_T>(data1[i])
-                                                                               : static_cast<res_T>(data2[i]));
+        res[i] = (data1[i] > data2[i]) ? static_cast<typename res_T::value_type>(data1[i])
+                                       : static_cast<typename res_T::value_type>(data2[i]);
     }
 }
 
 template <class input1_T, class input2_T, class res_T, typename CONFIG_T>
 void minimum(const input1_T &data1, const input2_T &data2, res_T &res) {
     #pragma unroll
     for (int i = 0; i < CONFIG_T::n_elem; i++) {
-        res[i] = static_cast<typename res_T::value_type>((data1[i] < data2[i]) ? static_cast<res_T>(data1[i])
-                                                                               : static_cast<res_T>(data2[i]));
+        res[i] = (data1[i] < data2[i]) ? static_cast<typename res_T::value_type>(data1[i])
+                                       : static_cast<typename res_T::value_type>(data2[i]);
     }
 }
 

hls4ml/templates/oneapi/firmware/nnet_utils/nnet_merge_stream.h

@@ -85,7 +85,7 @@ template <class input1_pipe, class input2_pipe, class res_pipe, typename CONFIG_
         #pragma unroll
         for (int j = 0; j < outputSize; j++) {
             out_data[j] = static_cast<typename ExtractPipeType<res_pipe>::value_type::value_type>(
-                (in_data1[j] + in_data2[j]) * ac_fixed<1, 0, false>(0.5));
+                (in_data1[j] + in_data2[j]) * ac_fixed<2, 1, false>(0.5));
         }
 
         res_pipe::write(out_data);
@@ -107,8 +107,9 @@ template <class input1_pipe, class input2_pipe, class res_pipe, typename CONFIG_
     MaxPack:
         #pragma unroll
         for (int j = 0; j < outputSize; j++) {
-            out_data[j] = static_cast<typename ExtractPipeType<res_pipe>::value_type::value_type>(
-                (in_data1[j] > in_data2[j]) ? static_cast<res_T>(in_data1[j]) : static_cast<res_T>(in_data2[j]));
+            out_data[j] = (in_data1[j] > in_data2[j])
+                              ? static_cast<typename ExtractPipeType<res_pipe>::value_type::value_type>(in_data1[j])
+                              : static_cast<typename ExtractPipeType<res_pipe>::value_type::value_type>(in_data2[j]);
         }
 
         res_pipe::write(out_data);
@@ -130,8 +131,9 @@ template <class input1_pipe, class input2_pipe, class res_pipe, typename CONFIG_
     MinPack:
         #pragma unroll
         for (int j = 0; j < outputSize; j++) {
-            out_data[j] = static_cast<typename ExtractPipeType<res_pipe>::value_type::value_type>(
-                (in_data1[j] < in_data2[j]) ? static_cast<res_T>(in_data1[j]) : static_cast<res_T>(in_data2[j]););
+            out_data[j] = (in_data1[j] < in_data2[j])
+                              ? static_cast<typename ExtractPipeType<res_pipe>::value_type::value_type>(in_data1[j])
+                              : static_cast<typename ExtractPipeType<res_pipe>::value_type::value_type>(in_data2[j]);
         }
 
         res_pipe::write(out_data);

test/pytest/test_time_distributed.py

@@ -40,7 +40,7 @@ def test_time_distributed_layer(io_type, backend, use_h5):
     config['IOType'] = io_type
     config['HLSConfig'] = hls4ml.utils.config_from_keras_model(keras_model, default_precision='fixed<10,8>')
 
-    hls_model = hls4ml.converters.keras_to_hls(config)
+    hls_model = hls4ml.converters.keras_v2_to_hls(config)
     hls_model.compile()
 
     x = np.random.randint(0, 5, size=(10, *input_shape)).astype('float')
@@ -80,7 +80,7 @@ def test_time_distributed_layer_lstm(io_type, backend, use_h5):
     config['IOType'] = io_type
     config['HLSConfig'] = hls4ml.utils.config_from_keras_model(keras_model, default_precision='fixed<32,16>')
 
-    hls_model = hls4ml.converters.keras_to_hls(config)
+    hls_model = hls4ml.converters.keras_v2_to_hls(config)
     hls_model.compile()
 
     x = np.random.rand(10, *input_shape) - 0.5
@@ -127,7 +127,7 @@ def test_time_distributed_model(io_type, backend, use_h5):
     config['IOType'] = io_type
     config['HLSConfig'] = hls4ml.utils.config_from_keras_model(keras_model, default_precision='fixed<10,8>')
 
-    hls_model = hls4ml.converters.keras_to_hls(config)
+    hls_model = hls4ml.converters.keras_v2_to_hls(config)
     hls_model.compile()
 
     x = np.random.randint(0, 5, size=(10, *input_shape)).astype('float')