Merge branch 'main' into da4ml-v2

JanFSchulte · web-flow · commit 97c6c8e5ef76 · 2025-06-27T09:53:28.000-04:00
diff --git a/hls4ml/templates/oneapi/firmware/nnet_utils/nnet_merge.h b/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]);
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -68,17 +68,17 @@ template <class input1_T, class input2_T, class res_T, typename CONFIG_T>`
`68`	`68`	`void maximum(const input1_T &data1, const input2_T &data2, res_T &res) {`
`69`	`69`	`#pragma unroll`
`70`	`70`	`for (int i = 0; i < CONFIG_T::n_elem; i++) {`
`71`		`- res[i] = static_cast<typename res_T::value_type>((data1[i] > data2[i]) ? static_cast<res_T>(data1[i])`
`72`		`- : static_cast<res_T>(data2[i]));`
	`71`	`+ res[i] = (data1[i] > data2[i]) ? static_cast<typename res_T::value_type>(data1[i])`
	`72`	`+ : static_cast<typename res_T::value_type>(data2[i]);`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`template <class input1_T, class input2_T, class res_T, typename CONFIG_T>`
`77`	`77`	`void minimum(const input1_T &data1, const input2_T &data2, res_T &res) {`
`78`	`78`	`#pragma unroll`
`79`	`79`	`for (int i = 0; i < CONFIG_T::n_elem; i++) {`
`80`		`- res[i] = static_cast<typename res_T::value_type>((data1[i] < data2[i]) ? static_cast<res_T>(data1[i])`
`81`		`- : static_cast<res_T>(data2[i]));`
	`80`	`+ res[i] = (data1[i] < data2[i]) ? static_cast<typename res_T::value_type>(data1[i])`
	`81`	`+ : static_cast<typename res_T::value_type>(data2[i]);`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`