From c69f4d30c03c24d844b33e6c4081f7db8f64a940 Mon Sep 17 00:00:00 2001
From: Yaman Umuroglu <yamanu@xilinx.com>
Date: Mon, 1 Feb 2021 12:24:47 +0100
Subject: [PATCH] [Notebook] fix broken resource paths
---
notebooks/basics/1_brevitas_network_import.ipynb | 2 +-
.../end2end_example/bnn-pynq/cnv_end2end_example.ipynb | 8 ++++----
.../end2end_example/bnn-pynq/tfc_end2end_example.ipynb | 8 ++++----
.../bnn-pynq/tfc_end2end_verification.ipynb | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/notebooks/basics/1_brevitas_network_import.ipynb b/notebooks/basics/1_brevitas_network_import.ipynb
index 3c9cad615..ad2b3db8f 100644
--- a/notebooks/basics/1_brevitas_network_import.ipynb
+++ b/notebooks/basics/1_brevitas_network_import.ipynb
@@ -356,7 +356,7 @@
"from pkgutil import get_data\n",
"import onnx\n",
"import onnx.numpy_helper as nph\n",
- "raw_i = get_data(\"finn\", \"data/onnx/mnist-conv/test_data_set_0/input_0.pb\")\n",
+ "raw_i = get_data(\"finn.data\", \"onnx/mnist-conv/test_data_set_0/input_0.pb\")\n",
"input_tensor = onnx.load_tensor_from_string(raw_i)\n",
"input_tensor_npy = nph.to_array(input_tensor)\n",
"input_tensor_pyt = torch.from_numpy(input_tensor_npy).float()\n",
diff --git a/notebooks/end2end_example/bnn-pynq/cnv_end2end_example.ipynb b/notebooks/end2end_example/bnn-pynq/cnv_end2end_example.ipynb
index 795f7f22f..4130f35d7 100644
--- a/notebooks/end2end_example/bnn-pynq/cnv_end2end_example.ipynb
+++ b/notebooks/end2end_example/bnn-pynq/cnv_end2end_example.ipynb
@@ -701,16 +701,16 @@
},
{
"cell_type": "code",
- "execution_count": 40,
+ "execution_count": 2,
"metadata": {},
"outputs": [
{
"data": {
"text/plain": [
- "<matplotlib.image.AxesImage at 0x7f25af026da0>"
+ "<matplotlib.image.AxesImage at 0x7f89a07e6eb8>"
]
},
- "execution_count": 40,
+ "execution_count": 2,
"metadata": {},
"output_type": "execute_result"
},
@@ -732,7 +732,7 @@
"import matplotlib.pyplot as plt\n",
"import numpy as np\n",
"\n",
- "fn = pk.resource_filename(\"finn\", \"data/cifar10/cifar10-test-data-class3.npz\")\n",
+ "fn = pk.resource_filename(\"finn.qnn-data\", \"cifar10/cifar10-test-data-class3.npz\")\n",
"x = np.load(fn)[\"arr_0\"]\n",
"x = x.reshape(3, 32,32).transpose(1, 2, 0)\n",
"plt.imshow(x)"
diff --git a/notebooks/end2end_example/bnn-pynq/tfc_end2end_example.ipynb b/notebooks/end2end_example/bnn-pynq/tfc_end2end_example.ipynb
index a067c6f6f..8cbff4fce 100644
--- a/notebooks/end2end_example/bnn-pynq/tfc_end2end_example.ipynb
+++ b/notebooks/end2end_example/bnn-pynq/tfc_end2end_example.ipynb
@@ -1468,16 +1468,16 @@
},
{
"cell_type": "code",
- "execution_count": 53,
+ "execution_count": 2,
"metadata": {},
"outputs": [
{
"data": {
"text/plain": [
- "<matplotlib.image.AxesImage at 0x7fe2dd62bf98>"
+ "<matplotlib.image.AxesImage at 0x7fcb96004cc0>"
]
},
- "execution_count": 53,
+ "execution_count": 2,
"metadata": {},
"output_type": "execute_result"
},
@@ -1499,7 +1499,7 @@
"import onnx.numpy_helper as nph\n",
"import matplotlib.pyplot as plt\n",
"\n",
- "raw_i = get_data(\"finn\", \"data/onnx/mnist-conv/test_data_set_0/input_0.pb\")\n",
+ "raw_i = get_data(\"finn.data\", \"onnx/mnist-conv/test_data_set_0/input_0.pb\")\n",
"x = nph.to_array(onnx.load_tensor_from_string(raw_i))\n",
"plt.imshow(x.reshape(28,28), cmap='gray')"
]
diff --git a/notebooks/end2end_example/bnn-pynq/tfc_end2end_verification.ipynb b/notebooks/end2end_example/bnn-pynq/tfc_end2end_verification.ipynb
index 54738c372..4a5d3dd07 100644
--- a/notebooks/end2end_example/bnn-pynq/tfc_end2end_verification.ipynb
+++ b/notebooks/end2end_example/bnn-pynq/tfc_end2end_verification.ipynb
@@ -71,7 +71,7 @@
"from finn.util.test import get_test_model_trained\n",
"\n",
"fc = get_test_model_trained(\"TFC\", 1, 1)\n",
- "raw_i = get_data(\"finn\", \"data/onnx/mnist-conv/test_data_set_0/input_0.pb\")\n",
+ "raw_i = get_data(\"finn.data\", \"onnx/mnist-conv/test_data_set_0/input_0.pb\")\n",
"input_tensor = onnx.load_tensor_from_string(raw_i)\n",
"input_brevitas = torch.from_numpy(nph.to_array(input_tensor)).float()\n",
"output_golden = fc.forward(input_brevitas).detach().numpy()\n",
--
GitLab