From 9847528a8430fb6bf00826845de74fbe4a1a596d Mon Sep 17 00:00:00 2001
From: auphelia <jakobapk@web.de>
Date: Mon, 13 Feb 2023 11:52:15 +0000
Subject: [PATCH] [Notebooks/Tests] Fix typo in nb and fix build_dataflow test
---
notebooks/end2end_example/bnn-pynq/cnv_end2end_example.ipynb | 2 +-
notebooks/end2end_example/bnn-pynq/tfc_end2end_example.ipynb | 2 +-
src/finn/qnn-data/build_dataflow/dataflow_build_config.json | 1 +
tests/util/test_build_dataflow.py | 1 -
4 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/notebooks/end2end_example/bnn-pynq/cnv_end2end_example.ipynb b/notebooks/end2end_example/bnn-pynq/cnv_end2end_example.ipynb
index 8ea6a3500..388accad3 100644
--- a/notebooks/end2end_example/bnn-pynq/cnv_end2end_example.ipynb
+++ b/notebooks/end2end_example/bnn-pynq/cnv_end2end_example.ipynb
@@ -524,7 +524,7 @@
"metadata": {},
"outputs": [],
"source": [
- "model = ModelWrapper(build_dir + \"/end2end_cnv_w1a1_pynq_deploy.onnx\")\n",
+ "model = ModelWrapper(build_dir + \"/end2end_cnv_w1a1_synth.onnx\")\n",
"iname = model.graph.input[0].name\n",
"ishape = model.get_tensor_shape(iname)\n",
"np.save(deployment_dir + \"/input.npy\", x.reshape(ishape))"
diff --git a/notebooks/end2end_example/bnn-pynq/tfc_end2end_example.ipynb b/notebooks/end2end_example/bnn-pynq/tfc_end2end_example.ipynb
index 7e9980cf2..eec17b2fa 100644
--- a/notebooks/end2end_example/bnn-pynq/tfc_end2end_example.ipynb
+++ b/notebooks/end2end_example/bnn-pynq/tfc_end2end_example.ipynb
@@ -873,7 +873,7 @@
"source": [
"import numpy as np\n",
"\n",
- "model = ModelWrapper(build_dir + \"/tfc_w1_a1_pynq_deploy.onnx\")\n",
+ "model = ModelWrapper(build_dir + \"/tfc_w1_a1_post_synthesis.onnx\")\n",
"iname = model.graph.input[0].name\n",
"oname = parent_model.graph.output[0].name\n",
"ishape = model.get_tensor_shape(iname)\n",
diff --git a/src/finn/qnn-data/build_dataflow/dataflow_build_config.json b/src/finn/qnn-data/build_dataflow/dataflow_build_config.json
index 27ec38f6a..a053c1a22 100644
--- a/src/finn/qnn-data/build_dataflow/dataflow_build_config.json
+++ b/src/finn/qnn-data/build_dataflow/dataflow_build_config.json
@@ -7,6 +7,7 @@
"standalone_thresholds": true,
"shell_flow_type": "vivado_zynq",
"verify_save_rtlsim_waveforms": true,
+ "force_python_rtlsim": true,
"verify_steps": [
"initial_python",
"streamlined_python",
diff --git a/tests/util/test_build_dataflow.py b/tests/util/test_build_dataflow.py
index 915e54f4e..39f0b0dc8 100644
--- a/tests/util/test_build_dataflow.py
+++ b/tests/util/test_build_dataflow.py
@@ -41,7 +41,6 @@ from finn.util.basic import make_build_dir
@pytest.mark.slow
@pytest.mark.vivado
@pytest.mark.end2end
-@pytest.mark.xfail
def test_end2end_build_dataflow_directory():
test_dir = make_build_dir("test_build_dataflow_directory_")
target_dir = test_dir + "/build_dataflow"
--
GitLab