From 6b409baf091c1f3e131734a93dc66beafc444486 Mon Sep 17 00:00:00 2001
From: Felix Jentzsch <felix.jentzsch@upb.de>
Date: Thu, 2 Mar 2023 10:44:58 +0100
Subject: [PATCH] [Thres] remove workaround for vivado_hls bug for T[0][0]=0
case
---
src/finn/custom_op/fpgadataflow/matrixvectoractivation.py | 7 -------
src/finn/custom_op/fpgadataflow/thresholding_batch.py | 7 -------
src/finn/custom_op/fpgadataflow/vectorvectoractivation.py | 7 -------
3 files changed, 21 deletions(-)
diff --git a/src/finn/custom_op/fpgadataflow/matrixvectoractivation.py b/src/finn/custom_op/fpgadataflow/matrixvectoractivation.py
index 40f625093..d6285a6f6 100644
--- a/src/finn/custom_op/fpgadataflow/matrixvectoractivation.py
+++ b/src/finn/custom_op/fpgadataflow/matrixvectoractivation.py
@@ -709,13 +709,6 @@ class MatrixVectorActivation(HLSCustomOp):
# ensure all thresholds are integer
assert (orig_thres_matrix.astype(np.int32) == orig_thres_matrix).all()
ret = orig_thres_matrix
- # workaround for vivado_hls threshold bug
- if ret[0][0] == 0 and n_thres_steps == 1:
- ret = np.copy(ret)
- ret[0][0] = 1
- warnings.warn(
- "Setting 0-valued first threshold to 1 to avoid vivado_hls bug"
- )
# ensure channels = mh , duplicating if necessary
if ret.shape[0] == 1:
ret = np.tile(ret, (mh, 1))
diff --git a/src/finn/custom_op/fpgadataflow/thresholding_batch.py b/src/finn/custom_op/fpgadataflow/thresholding_batch.py
index ce8c31ee9..292f70941 100644
--- a/src/finn/custom_op/fpgadataflow/thresholding_batch.py
+++ b/src/finn/custom_op/fpgadataflow/thresholding_batch.py
@@ -319,13 +319,6 @@ class Thresholding_Batch(HLSCustomOp):
np.mod(orig_thres_matrix, 1), 0
).all(), "Need int threshold tensor"
ret = orig_thres_matrix
- # workaround for vivado_hls threshold bug
- if ret[0][0] == 0 and n_thres_steps == 1:
- ret = np.copy(ret)
- ret[0][0] = 1
- warnings.warn(
- "Setting 0-valued first threshold to 1 to avoid vivado_hls bug"
- )
# ensure channels = mh , duplicating if necessary
if ret.shape[0] == 1:
ret = np.tile(ret, (mh, 1))
diff --git a/src/finn/custom_op/fpgadataflow/vectorvectoractivation.py b/src/finn/custom_op/fpgadataflow/vectorvectoractivation.py
index 5d996e10d..a2dd3c75d 100644
--- a/src/finn/custom_op/fpgadataflow/vectorvectoractivation.py
+++ b/src/finn/custom_op/fpgadataflow/vectorvectoractivation.py
@@ -418,13 +418,6 @@ class VectorVectorActivation(HLSCustomOp):
# ensure all thresholds are integer
assert (orig_thres_matrix.astype(np.int32) == orig_thres_matrix).all()
ret = orig_thres_matrix
- # workaround for vivado_hls threshold bug
- if ret[0][0] == 0 and n_thres_steps == 1:
- ret = np.copy(ret)
- ret[0][0] = 1
- warnings.warn(
- "Setting 0-valued first threshold to 1 to avoid vivado_hls bug"
- )
# ensure channels = mh , duplicating if necessary
if ret.shape[0] == 1:
ret = np.tile(ret, (ch, 1))
--
GitLab