From 645fac2d45aee052a284720480b860cb5ca6eca7 Mon Sep 17 00:00:00 2001 From: Yaman Umuroglu <maltanar@gmail.com> Date: Sun, 23 Aug 2020 23:23:50 +0200 Subject: [PATCH] [Test] call AnnotateResources for Vitis tests --- tests/end2end/test_vitis_end2end_cnv_w1a1.py | 8 +++++++- tests/end2end/test_vitis_end2end_tfc_w1a1.py | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/tests/end2end/test_vitis_end2end_cnv_w1a1.py b/tests/end2end/test_vitis_end2end_cnv_w1a1.py index 3f8799c04..35be81574 100644 --- a/tests/end2end/test_vitis_end2end_cnv_w1a1.py +++ b/tests/end2end/test_vitis_end2end_cnv_w1a1.py @@ -54,7 +54,6 @@ from finn.transformation.infer_shapes import InferShapes from finn.transformation.streamline import Streamline from finn.util.basic import alveo_part_map, alveo_default_platform from finn.util.test import get_test_model_trained, load_test_checkpoint_or_skip -from finn.transformation.fpgadataflow.annotate_resources import AnnotateResources from finn.transformation.fpgadataflow.vitis_build import VitisBuild, VitisOptStrategy import pkg_resources as pk from finn.transformation.double_to_single_float import DoubleToSingleFloat @@ -63,6 +62,8 @@ from finn.transformation.lower_convs_to_matmul import LowerConvsToMatMul from finn.transformation.streamline.reorder import MakeMaxPoolNHWC from finn.transformation.infer_data_layouts import InferDataLayouts from finn.transformation.fpgadataflow.annotate_cycles import AnnotateCycles +from finn.transformation.fpgadataflow.annotate_resources import AnnotateResources +import warnings build_dir = "/tmp/" + os.environ["FINN_INST_NAME"] test_alveo_board = os.getenv("ALVEO_BOARD", default="U250") @@ -184,6 +185,11 @@ def test_end2end_vitis_cnv_w1a1_build(): strategy=VitisOptStrategy.BUILD_SPEED, ) ) + model = model.transform(AnnotateResources("synth")) + warnings.warn( + "Post-synthesis resources (excluding shell): " + + model.get_metadata_prop("res_total_synth") + ) model.save(build_dir + "/end2end_vitis_cnv_w1a1_build.onnx") diff --git a/tests/end2end/test_vitis_end2end_tfc_w1a1.py b/tests/end2end/test_vitis_end2end_tfc_w1a1.py index c5057f253..d6ea7aeea 100644 --- a/tests/end2end/test_vitis_end2end_tfc_w1a1.py +++ b/tests/end2end/test_vitis_end2end_tfc_w1a1.py @@ -65,6 +65,8 @@ from finn.transformation.infer_data_layouts import InferDataLayouts from finn.transformation.fpgadataflow.make_deployment import DeployToPYNQ from pkgutil import get_data from finn.core.onnx_exec import execute_onnx +from finn.transformation.fpgadataflow.annotate_resources import AnnotateResources +import warnings build_dir = "/tmp/" + os.environ["FINN_INST_NAME"] test_alveo_board = os.getenv("ALVEO_BOARD", default="U250") @@ -170,7 +172,11 @@ def test_end2end_vitis_tfc_w1a1_build(): strategy=VitisOptStrategy.BUILD_SPEED, ) ) - # TODO post-synth resources + model = model.transform(AnnotateResources("synth")) + warnings.warn( + "Post-synthesis resources (excluding shell): " + + model.get_metadata_prop("res_total_synth") + ) model.save(build_dir + "/end2end_vitis_tfc_w1a1_build.onnx") -- GitLab