[StreamingFC] take changes from npysim branch

run-docker.sh

@@ -68,7 +68,8 @@ SCRIPTPATH=$(dirname "$SCRIPT")
 BREVITAS_REPO=https://github.com/Xilinx/brevitas.git
 EXAMPLES_REPO=https://github.com/maltanar/brevitas_cnv_lfc.git
 CNPY_REPO=https://github.com/rogersce/cnpy.git
-FINN_HLS_REPO=https://github.com/Xilinx/finn-hlslib.git
+#FINN_HLS_REPO=https://github.com/Xilinx/finn-hlslib.git
+FINN_HLS_REPO=https://github.com/Tobi-Alonso/finn-hlslib.git
 PYVERILATOR_REPO=https://github.com/maltanar/pyverilator
 PYNQSHELL_REPO=https://github.com/maltanar/PYNQ-HelloWorld.git
 

src/finn/custom_op/fpgadataflow/streamingfclayer_batch.py

@@ -791,14 +791,13 @@ class StreamingFCLayer_Batch(HLSCustomOp):
                 export_wdt = DataType.BINARY
             else:
                 export_wdt = wdt
-            wdtype_hls_str = export_wdt.get_hls_datatype_str()
             self.code_gen_dict["$DOCOMPUTE$"] = [
-                """Matrix_Vector_Activate_Stream_Batch<MW1, MH1, SIMD1, PE1, {}, {}, {}, {} >
-                (in0, out, weights, {}, numReps, {});""".format(
+                """Matrix_Vector_Activate_Stream_Batch<MW1, MH1, SIMD1, PE1, {}, {},
+                {}, {}>(in0, out, weights, {}, numReps, {});""".format(
+                    export_wdt.bitwidth(),
                     tmpl_args["TSrcI"],
                     tmpl_args["TDstI"],
                     tmpl_args["TWeightI"],
-                    wdtype_hls_str,
                     threshs,
                     self.get_nodeattr("resType"),
                 )