Merge pull request #1 from alex-yang-upenn/merge

Merging changes from separate Vitis Accelerator backend branch

Author: alex-yang-upenn

hls4ml/backends/__init__.py

@@ -2,20 +2,18 @@
 from hls4ml.backends.fpga.fpga_backend import FPGABackend  # noqa: F401
 from hls4ml.backends.quartus.quartus_backend import QuartusBackend
 from hls4ml.backends.symbolic.symbolic_backend import SymbolicExpressionBackend
+from hls4ml.backends.vitis_accelerator.vitis_accelerator_config import VitisAcceleratorConfig  # noqa: F401
 from hls4ml.backends.vivado.vivado_backend import VivadoBackend
 from hls4ml.backends.vivado_accelerator.vivado_accelerator_backend import VivadoAcceleratorBackend
 from hls4ml.backends.vivado_accelerator.vivado_accelerator_config import VivadoAcceleratorConfig  # noqa: F401
 
 from hls4ml.backends.vitis.vitis_backend import VitisBackend  # isort: skip
+from hls4ml.backends.vitis_accelerator.vitis_accelerator_backend import VitisAcceleratorBackend  # isort: skip
 
-#[K] start
-from hls4ml.backends.vitis_accelerator.vitis_accelerator_backend import VitisAcceleratorBackend
-from hls4ml.backends.vitis_accelerator.vitis_accelerator_config import VitisAcceleratorConfig
-#[K] end
 
 register_backend('Vivado', VivadoBackend)
 register_backend('VivadoAccelerator', VivadoAcceleratorBackend)
 register_backend('Vitis', VitisBackend)
-register_backend('VitisAccelerator', VitisAcceleratorBackend) #[K]
+register_backend('VitisAccelerator', VitisAcceleratorBackend)
 register_backend('Quartus', QuartusBackend)
 register_backend('SymbolicExpression', SymbolicExpressionBackend)

hls4ml/backends/vitis_accelerator/vitis_accelerator_backend.py

@@ -1,10 +1,5 @@
-import os
-import sys
-
-from hls4ml.backends import VitisBackend
-from hls4ml.backends import VivadoBackend
+from hls4ml.backends import VitisBackend, VivadoBackend
 from hls4ml.model.flow import get_flow, register_flow
-from hls4ml.report import parse_vivado_report
 
 
 class VitisAcceleratorBackend(VitisBackend):
@@ -63,4 +58,4 @@ def _register_flows(self):
         ip_flow_requirements.insert(ip_flow_requirements.index('vivado:init_layers'), validation_flow)
         ip_flow_requirements.insert(ip_flow_requirements.index('vivado:apply_templates'), template_flow)
 
-        self._default_flow = register_flow('ip', None, requires=ip_flow_requirements, backend=self.name)
+        self._default_flow = register_flow('ip', None, requires=ip_flow_requirements, backend=self.name)

hls4ml/backends/vitis_accelerator/vitis_accelerator_config.py

@@ -1,11 +1,6 @@
 import json
 import os
 
-import numpy as np
-
-from hls4ml.model.layers import FixedPrecisionType, IntegerPrecisionType
-
-
 class VitisAcceleratorConfig:
     def __init__(self, config):
         self.config = config.config

hls4ml/templates/vitis_accelerator/myproject_host_cl.cpp

@@ -22,7 +22,7 @@ void runFPGAHelper(FpgaObj<in_buffer_t, out_buffer_t> &fpga) {
     fpga.write_ss_safe(ss.str());
 }
 
-int main(int argc, char** argv) {
+int main(int argc, char **argv) {
     if (argc != 2) {
         std::cout << "Usage: " << argv[0] << " <XCLBIN Filename>" << std::endl;
         return EXIT_FAILURE;

hls4ml/templates/vitis_accelerator/nnet_utils/nnet_types.h

@@ -19,8 +19,8 @@ template <typename T, unsigned N> struct array {
     const T &operator[](size_t pos) const { return data[pos]; }
 
     array &operator=(const array &other) {
-//        if (&other == this)
-//            return *this;
+        //        if (&other == this)
+        //            return *this;
 
         assert(N == other.size && "Array sizes must match.");
 

hls4ml/writer/__init__.py

@@ -1,7 +1,7 @@
 from hls4ml.writer.quartus_writer import QuartusWriter
 from hls4ml.writer.symbolic_writer import SymbolicExpressionWriter
-from hls4ml.writer.vitis_writer import VitisWriter
 from hls4ml.writer.vitis_accelerator_writer import VitisAcceleratorWriter
+from hls4ml.writer.vitis_writer import VitisWriter
 from hls4ml.writer.vivado_accelerator_writer import VivadoAcceleratorWriter
 from hls4ml.writer.vivado_writer import VivadoWriter
 from hls4ml.writer.writers import Writer, get_writer, register_writer  # noqa: F401

hls4ml/writer/vitis_accelerator_writer.py

@@ -1,4 +1,3 @@
-import glob
 import os
 from shutil import copy, copytree
 
@@ -51,29 +50,8 @@ def write_parameters_overrides(self, model):
             fout.write(newline)
         f.close()
         fout.close()
-    
-    def write_build_script_backend_override(self, model):
-#        try:
-#
-##            filedir = os.path.dirname(os.path.abspath(__file__))
-##            writerspath = os.path.join(filedir, '../writer')
-##            vitis_accelerator_writer_file = writerspath + "vitis_accelerator_writer.py"
-#            with open(model.config.get_output_dir() + '/project.tcl', 'r') as file:
-#                lines = file.readlines()
-#                print("[K]\n")
-#                print(lines)
-#
-#            with open(model.config.get_output_dir() + '/project.tcl', 'r', 'w') as file:
-#                print ('[K] overriding project.tcl')
-#                for line in lines:
-#                    if 'backend' in line:
-#                        index = line.find('backend')
-#                        line = line[:index] + 'backend ' + 'vitisaccelerator' + '\n'
-#                    file.write(line)
-#        
-#        except FileNotFoundError:
-#            print("File project.tcl not found.")
 
+    def write_build_script_backend_override(self, model):
         # project.tcl
         f = open(f'{model.config.get_output_dir()}/project.tcl', 'w')
         f.write('variable project_name\n')
@@ -276,7 +254,7 @@ def write_nnet_utils_overrides(self, model):
         srcpath = os.path.join(filedir, '../templates/vitis_accelerator/nnet_utils/')
         dstpath = f'{model.config.get_output_dir()}/firmware/nnet_utils/'
         copy(srcpath + "nnet_types.h", dstpath + "nnet_types.h")
-    
+
     def write_hls(self, model):
         """
         Write the HLS project. Calls the steps from VivadoWriter, adapted for Vitis

prj_backend_tests/hls4ml_setup.sh

@@ -1,11 +1,11 @@
 import hls4ml
+from hls4ml.backends import VitisAcceleratorConfig
 
 # Fetch a keras model from our example repository
 # This will download our example model to your working directory and return an example configuration file
 config = hls4ml.utils.fetch_example_model('KERAS_3layer.json')
 
 # You can print it to see some default parameters
-#print("[K] Print config:")
 #print(config)
 
 # Default config:
@@ -29,17 +29,17 @@
 config['OutputDir'] = 'prj_tuto_vitis_stream'
 config['ProjectName'] = 'PrjTutoVitisStream'
 config['Backend'] = 'VitisAccelerator'
-config['Part'] = 'xcvc1902-vsvd1760-2MP-e-S'
+config['Part'] = 'xcu50-fsvh2104-2-e'
 config['IOType'] = 'io_stream'
+config['AcceleratorConfig'] = {}  # Initialize AcceleratorConfig as a dictionary
+config['AcceleratorConfig']['Platform'] = 'xilinx_u50_gen3x16_xdma_5_202210_1'
 
-#print("[K] Print config after setting up backend:")
-#print(config)
+print("[K] Print config after setting up backend:")
+print(config)
 
-#print("[K] Convert it to hls project")
 # Convert it to a hls project
 hls_model = hls4ml.converters.keras_to_hls(config)
 
-#print("[K] Print full list of example model if you want to explore more")
 ## Print full list of example model if you want to explore more
 #hls4ml.utils.fetch_example_list()