From bbf1343cbcc07d7f2fca8ced6cc70e90b8d7d778 Mon Sep 17 00:00:00 2001
From: Yaman Umuroglu <maltanar@gmail.com>
Date: Wed, 29 Apr 2020 14:38:56 +0100
Subject: [PATCH] [PYNQ] metadata_prop is always string, cast port arg
accordingly
---
src/finn/core/remote_exec.py | 2 +-
src/finn/core/throughput_test.py | 2 +-
src/finn/transformation/fpgadataflow/make_deployment.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/finn/core/remote_exec.py b/src/finn/core/remote_exec.py
index 5c330e29a..e97eb19a1 100644
--- a/src/finn/core/remote_exec.py
+++ b/src/finn/core/remote_exec.py
@@ -38,7 +38,7 @@ def remote_exec(model, execution_context):
input values."""
# TODO fix for multi input-output
pynq_ip = model.get_metadata_prop("pynq_ip")
- pynq_port = model.get_metadata_prop("pynq_port")
+ pynq_port = int(model.get_metadata_prop("pynq_port"))
pynq_username = model.get_metadata_prop("pynq_username")
pynq_password = model.get_metadata_prop("pynq_password")
pynq_target_dir = model.get_metadata_prop("pynq_target_dir")
diff --git a/src/finn/core/throughput_test.py b/src/finn/core/throughput_test.py
index dda30b638..fc929237b 100644
--- a/src/finn/core/throughput_test.py
+++ b/src/finn/core/throughput_test.py
@@ -36,7 +36,7 @@ def throughput_test(model):
Returns a dictionary with results of the throughput test"""
pynq_ip = model.get_metadata_prop("pynq_ip")
- pynq_port = model.get_metadata_prop("pynq_port")
+ pynq_port = int(model.get_metadata_prop("pynq_port"))
pynq_username = model.get_metadata_prop("pynq_username")
pynq_password = model.get_metadata_prop("pynq_password")
pynq_target_dir = model.get_metadata_prop("pynq_target_dir")
diff --git a/src/finn/transformation/fpgadataflow/make_deployment.py b/src/finn/transformation/fpgadataflow/make_deployment.py
index 28b6b2c34..a185f5392 100644
--- a/src/finn/transformation/fpgadataflow/make_deployment.py
+++ b/src/finn/transformation/fpgadataflow/make_deployment.py
@@ -53,7 +53,7 @@ class DeployToPYNQ(Transformation):
def apply(self, model):
# set metadata properties accordingly to user input specifications
model.set_metadata_prop("pynq_ip", self.ip)
- model.set_metadata_prop("pynq_port", self.port)
+ model.set_metadata_prop("pynq_port", str(self.port))
model.set_metadata_prop("pynq_username", self.username)
model.set_metadata_prop("pynq_password", self.password)
model.set_metadata_prop("pynq_target_dir", self.target_dir)
--
GitLab