Skip to content

Commit 96aee42

Browse files
committed
static_cast<typename ExtractPipeType<res_pipe>::value_type::value_type>
1 parent ec992b4 commit 96aee42

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,9 @@ template <class input1_pipe, class input2_pipe, class res_pipe, typename CONFIG_
107107
MaxPack:
108108
#pragma unroll
109109
for (int j = 0; j < outputSize; j++) {
110-
out_data[j] = static_cast<typename ExtractPipeType<res_pipe>::value_type::value_type>(
111-
(in_data1[j] > in_data2[j]) ? static_cast<res_T>(in_data1[j]) : static_cast<res_T>(in_data2[j]));
110+
out_data[j] = (in_data1[j] > in_data2[j])
111+
? static_cast<typename ExtractPipeType<res_pipe>::value_type::value_type>(in_data1[j])
112+
: static_cast<typename ExtractPipeType<res_pipe>::value_type::value_type>(in_data2[j]);
112113
}
113114

114115
res_pipe::write(out_data);
@@ -130,8 +131,9 @@ template <class input1_pipe, class input2_pipe, class res_pipe, typename CONFIG_
130131
MinPack:
131132
#pragma unroll
132133
for (int j = 0; j < outputSize; j++) {
133-
out_data[j] = static_cast<typename ExtractPipeType<res_pipe>::value_type::value_type>(
134-
(in_data1[j] < in_data2[j]) ? static_cast<res_T>(in_data1[j]) : static_cast<res_T>(in_data2[j]));
134+
out_data[j] = (in_data1[j] < in_data2[j])
135+
? static_cast<typename ExtractPipeType<res_pipe>::value_type::value_type>(in_data1[j])
136+
: static_cast<typename ExtractPipeType<res_pipe>::value_type::value_type>(in_data2[j]);
135137
}
136138

137139
res_pipe::write(out_data);

0 commit comments

Comments
 (0)