diff --git a/notebooks/end2end_example/tfc_end2end_example.ipynb b/notebooks/end2end_example/tfc_end2end_example.ipynb
index 1db1dd84c749a36babf41a5a8767a62ca6531cd6..6b7c6308772435bf213715534438a323e0705841 100644
--- a/notebooks/end2end_example/tfc_end2end_example.ipynb
+++ b/notebooks/end2end_example/tfc_end2end_example.ipynb
@@ -84,7 +84,9 @@
"name": "stderr",
"output_type": "stream",
"text": [
- "/workspace/brevitas/brevitas_examples/bnn_pynq/models/TFC.py:80: TracerWarning: torch.tensor results are registered as constants in the trace. You can safely ignore this warning if you use this function to create tensors out of constant variables that would be the same every time you call this function. In any other case, this might cause the trace to be incorrect.\n",
+ "Downloading: \"https://github.com/Xilinx/brevitas/releases/download/bnn_pynq-r0/tfc_1w1a-ff8140dc.pth\" to /home/maltanar/.cache/torch/checkpoints/tfc_1w1a-ff8140dc.pth\n",
+ "100%|██████████| 249052/249052 [00:00<00:00, 759439.97it/s]\n",
+ "/workspace/brevitas/brevitas_examples/bnn_pynq/models/FC.py:83: TracerWarning: torch.tensor results are registered as constants in the trace. You can safely ignore this warning if you use this function to create tensors out of constant variables that would be the same every time you call this function. In any other case, this might cause the trace to be incorrect.\n",
" x = 2.0 * x - torch.tensor([1.0], device=x.device)\n"
]
}
@@ -132,7 +134,7 @@
" "
],
"text/plain": [
- "<IPython.lib.display.IFrame at 0x7f98457e4048>"
+ "<IPython.lib.display.IFrame at 0x7f1b8e6db128>"
]
},
"execution_count": 3,
@@ -293,7 +295,7 @@
" "
],
"text/plain": [
- "<IPython.lib.display.IFrame at 0x7f97d7ff7cf8>"
+ "<IPython.lib.display.IFrame at 0x7f1add273cf8>"
]
},
"execution_count": 6,
@@ -402,7 +404,7 @@
" "
],
"text/plain": [
- "<IPython.lib.display.IFrame at 0x7f97d46a65f8>"
+ "<IPython.lib.display.IFrame at 0x7f1adc25df60>"
]
},
"execution_count": 8,
@@ -456,7 +458,7 @@
" "
],
"text/plain": [
- "<IPython.lib.display.IFrame at 0x7f97d46ad240>"
+ "<IPython.lib.display.IFrame at 0x7f1adc2548d0>"
]
},
"execution_count": 9,
@@ -532,7 +534,7 @@
" "
],
"text/plain": [
- "<IPython.lib.display.IFrame at 0x7f97d46a6668>"
+ "<IPython.lib.display.IFrame at 0x7f1adc254630>"
]
},
"execution_count": 10,
@@ -592,7 +594,7 @@
" "
],
"text/plain": [
- "<IPython.lib.display.IFrame at 0x7f9872793940>"
+ "<IPython.lib.display.IFrame at 0x7f1add27eba8>"
]
},
"execution_count": 11,
@@ -627,7 +629,7 @@
"text": [
"\n",
"Stopping http://0.0.0.0:8081\n",
- "Serving '/tmp/finn_dev_maltanar/dataflow_partition0_cuza0or8/df_model.onnx' at http://0.0.0.0:8081\n"
+ "Serving '/tmp/finn_dev_maltanar/dataflow_partition0_8y5bzo4x/df_model.onnx' at http://0.0.0.0:8081\n"
]
},
{
@@ -644,7 +646,7 @@
" "
],
"text/plain": [
- "<IPython.lib.display.IFrame at 0x7f987278b9e8>"
+ "<IPython.lib.display.IFrame at 0x7f1b7af8d240>"
]
},
"execution_count": 12,
@@ -835,7 +837,7 @@
" "
],
"text/plain": [
- "<IPython.lib.display.IFrame at 0x7f97d464ca20>"
+ "<IPython.lib.display.IFrame at 0x7f1adc266ba8>"
]
},
"execution_count": 16,
@@ -868,7 +870,7 @@
},
{
"cell_type": "code",
- "execution_count": 18,
+ "execution_count": 17,
"metadata": {},
"outputs": [
{
@@ -887,7 +889,7 @@
},
{
"cell_type": "code",
- "execution_count": 19,
+ "execution_count": 18,
"metadata": {},
"outputs": [],
"source": [
@@ -906,7 +908,7 @@
},
{
"cell_type": "code",
- "execution_count": 20,
+ "execution_count": 19,
"metadata": {},
"outputs": [
{
@@ -926,7 +928,7 @@
},
{
"cell_type": "code",
- "execution_count": 21,
+ "execution_count": 20,
"metadata": {},
"outputs": [],
"source": [
@@ -966,7 +968,7 @@
},
{
"cell_type": "code",
- "execution_count": 22,
+ "execution_count": 21,
"metadata": {},
"outputs": [],
"source": [
@@ -989,22 +991,22 @@
},
{
"cell_type": "code",
- "execution_count": 23,
+ "execution_count": 22,
"metadata": {},
"outputs": [
{
"data": {
"text/plain": [
"[key: \"pynq_driver_dir\"\n",
- "value: \"/tmp/finn_dev_maltanar/pynq_driver_f266zjp6\"\n",
+ "value: \"/tmp/finn_dev_maltanar/pynq_driver_ilfzbags\"\n",
", key: \"vivado_pynq_proj\"\n",
- "value: \"/tmp/finn_dev_maltanar/vivado_zynq_proj__qx46zlk\"\n",
+ "value: \"/tmp/finn_dev_maltanar/vivado_zynq_proj_erwcr5nk\"\n",
", key: \"bitfile\"\n",
- "value: \"/tmp/finn_dev_maltanar/vivado_zynq_proj__qx46zlk/resizer.bit\"\n",
+ "value: \"/tmp/finn_dev_maltanar/vivado_zynq_proj_erwcr5nk/resizer.bit\"\n",
", key: \"hw_handoff\"\n",
- "value: \"/tmp/finn_dev_maltanar/vivado_zynq_proj__qx46zlk/resizer.hwh\"\n",
+ "value: \"/tmp/finn_dev_maltanar/vivado_zynq_proj_erwcr5nk/resizer.hwh\"\n",
", key: \"vivado_synth_rpt\"\n",
- "value: \"/tmp/finn_dev_maltanar/vivado_zynq_proj__qx46zlk/synth_report.xml\"\n",
+ "value: \"/tmp/finn_dev_maltanar/vivado_zynq_proj_erwcr5nk/synth_report.xml\"\n",
", key: \"platform\"\n",
"value: \"zynq-iodma\"\n",
", key: \"pynq_ip\"\n",
@@ -1018,15 +1020,15 @@
", key: \"pynq_target_dir\"\n",
"value: \"/home/xilinx/finn_tfc_end2end_example\"\n",
", key: \"pynq_deployment_dir\"\n",
- "value: \"/tmp/finn_dev_maltanar/pynq_deployment_624bd_nc\"\n",
+ "value: \"/tmp/finn_dev_maltanar/pynq_deployment_eyiu4sxk\"\n",
", key: \"pynq_deploy_dir\"\n",
- "value: \"/tmp/finn_dev_maltanar/pynq_deployment_624bd_nc\"\n",
+ "value: \"/tmp/finn_dev_maltanar/pynq_deployment_eyiu4sxk\"\n",
", key: \"exec_mode\"\n",
"value: \"remote_pynq\"\n",
"]"
]
},
- "execution_count": 23,
+ "execution_count": 22,
"metadata": {},
"output_type": "execute_result"
}
@@ -1037,18 +1039,30 @@
},
{
"cell_type": "code",
- "execution_count": 24,
+ "execution_count": 23,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
- "total 4212\r\n",
+ "/home/xilinx/finn_tfc_end2end_example/pynq_deployment_624bd_nc:\r\n",
+ "total 4228\r\n",
"-rw-r--r-- 1 xilinx xilinx 9391 Sep 4 10:37 driver.py\r\n",
"drwxr-xr-x 4 xilinx xilinx 4096 Sep 4 10:37 finn\r\n",
+ "-rw-r--r-- 1 xilinx xilinx 3264 Sep 4 10:38 input.npy\r\n",
+ "-rw-r--r-- 1 root root 205 Sep 4 10:39 nw_metrics.txt\r\n",
+ "-rw-r--r-- 1 root root 120 Sep 4 10:38 output.npy\r\n",
"-rw-r--r-- 1 xilinx xilinx 4045671 Sep 4 10:37 resizer.bit\r\n",
- "-rw-r--r-- 1 xilinx xilinx 246211 Sep 4 10:37 resizer.hwh\r\n"
+ "-rw-r--r-- 1 xilinx xilinx 246211 Sep 4 10:37 resizer.hwh\r\n",
+ "-rw-r--r-- 1 root root 32 Sep 4 10:39 sds_trace_data.dat\r\n",
+ "\r\n",
+ "/home/xilinx/finn_tfc_end2end_example/pynq_deployment_eyiu4sxk:\r\n",
+ "total 4212\r\n",
+ "-rw-r--r-- 1 xilinx xilinx 8493 Sep 5 01:24 driver.py\r\n",
+ "drwxr-xr-x 4 xilinx xilinx 4096 Sep 5 01:24 finn\r\n",
+ "-rw-r--r-- 1 xilinx xilinx 4045671 Sep 5 01:24 resizer.bit\r\n",
+ "-rw-r--r-- 1 xilinx xilinx 246211 Sep 5 01:24 resizer.hwh\r\n"
]
}
],
@@ -1065,16 +1079,16 @@
},
{
"cell_type": "code",
- "execution_count": 25,
+ "execution_count": 24,
"metadata": {},
"outputs": [
{
"data": {
"text/plain": [
- "<matplotlib.image.AxesImage at 0x7f9857a748d0>"
+ "<matplotlib.image.AxesImage at 0x7f1b5b7cddd8>"
]
},
- "execution_count": 25,
+ "execution_count": 24,
"metadata": {},
"output_type": "execute_result"
}
@@ -1098,7 +1112,7 @@
},
{
"cell_type": "code",
- "execution_count": 26,
+ "execution_count": 25,
"metadata": {},
"outputs": [],
"source": [
@@ -1118,7 +1132,7 @@
},
{
"cell_type": "code",
- "execution_count": 27,
+ "execution_count": 26,
"metadata": {},
"outputs": [],
"source": [
@@ -1140,7 +1154,7 @@
},
{
"cell_type": "code",
- "execution_count": 28,
+ "execution_count": 27,
"metadata": {},
"outputs": [
{
@@ -1149,7 +1163,7 @@
"<BarContainer object of 10 artists>"
]
},
- "execution_count": 28,
+ "execution_count": 27,
"metadata": {},
"output_type": "execute_result"
},
@@ -1196,7 +1210,7 @@
},
{
"cell_type": "code",
- "execution_count": 31,
+ "execution_count": 28,
"metadata": {},
"outputs": [
{
@@ -1204,10 +1218,10 @@
"output_type": "stream",
"text": [
"Network metrics:\n",
- "runtime[ms]: 7.485151290893555\n",
- "throughput[images/s]: 1335978.3405000796\n",
- "DRAM_in_bandwidth[Mb/s]: 130.9258773690078\n",
- "DRAM_out_bandwidth[Mb/s]: 13.359783405000796\n",
+ "runtime[ms]: 7.472753524780273\n",
+ "throughput[images/s]: 1338194.8122387773\n",
+ "DRAM_in_bandwidth[Mb/s]: 131.14309159940018\n",
+ "DRAM_out_bandwidth[Mb/s]: 13.381948122387772\n",
"fclk[mhz]: 100.0\n",
"N: 10000\n"
]
@@ -1232,7 +1246,7 @@
},
{
"cell_type": "code",
- "execution_count": 32,
+ "execution_count": 29,
"metadata": {},
"outputs": [
{
diff --git a/notebooks/end2end_example/tfc_end2end_verification.ipynb b/notebooks/end2end_example/tfc_end2end_verification.ipynb
index 1ce17d3da3e4313f2b89eb6a790efcee704f70e9..92de7fb7e42b5d0013af31cc0fd88e34d354def8 100644
--- a/notebooks/end2end_example/tfc_end2end_verification.ipynb
+++ b/notebooks/end2end_example/tfc_end2end_verification.ipynb
@@ -264,7 +264,7 @@
" "
],
"text/plain": [
- "<IPython.lib.display.IFrame at 0x7f776245ac18>"
+ "<IPython.lib.display.IFrame at 0x7f3cac09d978>"
]
},
"execution_count": 8,
@@ -409,7 +409,16 @@
"outputs": [],
"source": [
"from finn.transformation.fpgadataflow.prepare_rtlsim import PrepareRTLSim\n",
- "child_model = ModelWrapper(build_dir + \"/tfc_w1_a1_ipgen.onnx\")\n",
+ "from finn.transformation.fpgadataflow.prepare_ip import PrepareIP\n",
+ "from finn.transformation.fpgadataflow.hlssynth_ip import HLSSynthIP\n",
+ "\n",
+ "test_fpga_part = \"xc7z020clg400-1\"\n",
+ "target_clk_ns = 10\n",
+ "\n",
+ "child_model = ModelWrapper(build_dir + \"/tfc_w1_a1_set_folding_factors.onnx\")\n",
+ "child_model = child_model.transform(GiveUniqueNodeNames())\n",
+ "child_model = child_model.transform(PrepareIP(test_fpga_part, target_clk_ns))\n",
+ "child_model = child_model.transform(HLSSynthIP())\n",
"child_model = child_model.transform(SetExecMode(\"rtlsim\"))\n",
"child_model = child_model.transform(PrepareRTLSim())\n",
"child_model.save(build_dir + \"/tfc_w1_a1_dataflow_child.onnx\")"
@@ -478,18 +487,44 @@
},
{
"cell_type": "code",
- "execution_count": 15,
+ "execution_count": 18,
"metadata": {},
- "outputs": [],
+ "outputs": [
+ {
+ "name": "stderr",
+ "output_type": "stream",
+ "text": [
+ "/workspace/finn/src/finn/transformation/fpgadataflow/hlssynth_ip.py:70: UserWarning: Using pre-existing IP for StreamingFCLayer_Batch_3\n",
+ " warnings.warn(\"Using pre-existing IP for %s\" % node.name)\n",
+ "/workspace/finn/src/finn/transformation/fpgadataflow/hlssynth_ip.py:70: UserWarning: Using pre-existing IP for StreamingFCLayer_Batch_1\n",
+ " warnings.warn(\"Using pre-existing IP for %s\" % node.name)\n",
+ "/workspace/finn/src/finn/transformation/fpgadataflow/hlssynth_ip.py:70: UserWarning: Using pre-existing IP for StreamingFCLayer_Batch_2\n",
+ " warnings.warn(\"Using pre-existing IP for %s\" % node.name)\n",
+ "/workspace/finn/src/finn/transformation/fpgadataflow/hlssynth_ip.py:70: UserWarning: Using pre-existing IP for StreamingFCLayer_Batch_0\n",
+ " warnings.warn(\"Using pre-existing IP for %s\" % node.name)\n"
+ ]
+ }
+ ],
"source": [
- "child_model = ModelWrapper(build_dir + \"/tfc_w1_a1_ipstitch.onnx\")\n",
+ "from finn.transformation.fpgadataflow.insert_dwc import InsertDWC\n",
+ "from finn.transformation.fpgadataflow.insert_fifo import InsertFIFO\n",
+ "from finn.transformation.fpgadataflow.create_stitched_ip import CreateStitchedIP\n",
+ "\n",
+ "child_model = ModelWrapper(build_dir + \"/tfc_w1_a1_dataflow_child.onnx\")\n",
+ "child_model = child_model.transform(InsertDWC())\n",
+ "child_model = child_model.transform(InsertFIFO())\n",
+ "child_model = child_model.transform(GiveUniqueNodeNames())\n",
+ "child_model = child_model.transform(PrepareIP(test_fpga_part, target_clk_ns))\n",
+ "child_model = child_model.transform(HLSSynthIP())\n",
+ "child_model = child_model.transform(CreateStitchedIP(test_fpga_part, target_clk_ns))\n",
+ "child_model = child_model.transform(PrepareRTLSim())\n",
"child_model.set_metadata_prop(\"exec_mode\",\"rtlsim\")\n",
"child_model.save(build_dir + \"/tfc_w1_a1_dataflow_child.onnx\")"
]
},
{
"cell_type": "code",
- "execution_count": 16,
+ "execution_count": 19,
"metadata": {},
"outputs": [],
"source": [
@@ -502,7 +537,7 @@
},
{
"cell_type": "code",
- "execution_count": 17,
+ "execution_count": 20,
"metadata": {},
"outputs": [
{
@@ -522,6 +557,13 @@
"else:\n",
" print(\"The results are not the same!\")"
]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "metadata": {},
+ "outputs": [],
+ "source": []
}
],
"metadata": {