From 8a63727155c2a736844f1f3b4bd2fe1354140f80 Mon Sep 17 00:00:00 2001
From: Yaman Umuroglu <yamanu@xilinx.com>
Date: Thu, 2 Dec 2021 13:21:04 +0100
Subject: [PATCH] [Test] fix npy2apintstream test envvar
---
tests/fpgadataflow/test_fpgadataflow_ipstitch.py | 4 ++--
tests/util/test_data_packing_hls.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/fpgadataflow/test_fpgadataflow_ipstitch.py b/tests/fpgadataflow/test_fpgadataflow_ipstitch.py
index a4e75f525..3f7a700db 100644
--- a/tests/fpgadataflow/test_fpgadataflow_ipstitch.py
+++ b/tests/fpgadataflow/test_fpgadataflow_ipstitch.py
@@ -333,7 +333,7 @@ def test_fpgadataflow_ipstitch_iodma_floorplan():
@pytest.mark.slow
@pytest.mark.vivado
@pytest.mark.vitis
-def test_fpgadataflow_ipstitch_vitis(board, period_ns, extw):
+def test_fpgadataflow_ipstitch_vitis_end2end(board, period_ns, extw):
if "VITIS_PATH" not in os.environ:
pytest.skip("VITIS_PATH not set")
platform = alveo_default_platform[board]
@@ -355,7 +355,7 @@ def test_fpgadataflow_ipstitch_vitis(board, period_ns, extw):
@pytest.mark.parametrize("board", ["Pynq-Z1"])
@pytest.mark.slow
@pytest.mark.vivado
-def test_fpgadataflow_ipstitch_zynqbuild(board):
+def test_fpgadataflow_ipstitch_zynqbuild_end2end(board):
model = create_two_fc_model()
if model.graph.node[0].op_type == "StreamingDataflowPartition":
sdp_node = getCustomOp(model.graph.node[0])
diff --git a/tests/util/test_data_packing_hls.py b/tests/util/test_data_packing_hls.py
index 7113a3051..e2b5dc4c3 100644
--- a/tests/util/test_data_packing_hls.py
+++ b/tests/util/test_data_packing_hls.py
@@ -99,7 +99,7 @@ def test_npy2apintstream(test_shape, dtype):
g++ -o test_npy2apintstream test.cpp /workspace/cnpy/cnpy.cpp \
-I/workspace/cnpy/ -I{}/include -I/workspace/finn/src/finn/qnn-data/cpp \
--std=c++11 -lz""".format(
- os.environ["VIVADO_PATH"]
+ os.environ["HLS_PATH"]
)
with open(test_dir + "/compile.sh", "w") as f:
f.write(cmd_compile)
--
GitLab