Fix merge conflict in docker/finn_entrypoint.sh while merging upstream/dev
No related branches found
No related tags found
Showing
- .gitignore 3 additions, 0 deletions.gitignore
- docker/Dockerfile.finn_dev 1 addition, 1 deletiondocker/Dockerfile.finn_dev
- docker/finn_entrypoint.sh 2 additions, 2 deletionsdocker/finn_entrypoint.sh
- docs/finn/getting_started.rst 1 addition, 0 deletionsdocs/finn/getting_started.rst
- docs/finn/internals.rst 4 additions, 0 deletionsdocs/finn/internals.rst
- run-docker.sh 8 additions, 5 deletionsrun-docker.sh
- src/finn/core/onnx_exec.py 12 additions, 4 deletionssrc/finn/core/onnx_exec.py
- src/finn/custom_op/fpgadataflow/fmpadding_batch.py 27 additions, 24 deletionssrc/finn/custom_op/fpgadataflow/fmpadding_batch.py
- src/finn/custom_op/fpgadataflow/tlastmarker.py 110 additions, 34 deletionssrc/finn/custom_op/fpgadataflow/tlastmarker.py
- src/finn/custom_op/quantavgpool2d.py 83 additions, 0 deletionssrc/finn/custom_op/quantavgpool2d.py
- src/finn/custom_op/registry.py 3 additions, 1 deletionsrc/finn/custom_op/registry.py
- src/finn/transformation/fpgadataflow/insert_tlastmarker.py 62 additions, 8 deletionssrc/finn/transformation/fpgadataflow/insert_tlastmarker.py
- src/finn/transformation/fpgadataflow/prepare_cppsim.py 40 additions, 5 deletionssrc/finn/transformation/fpgadataflow/prepare_cppsim.py
- src/finn/transformation/infer_datatypes.py 7 additions, 1 deletionsrc/finn/transformation/infer_datatypes.py
- src/finn/transformation/lower_convs_to_matmul.py 35 additions, 22 deletionssrc/finn/transformation/lower_convs_to_matmul.py
- src/finn/transformation/streamline/collapse_repeated.py 4 additions, 0 deletionssrc/finn/transformation/streamline/collapse_repeated.py
- src/finn/transformation/streamline/remove.py 69 additions, 0 deletionssrc/finn/transformation/streamline/remove.py
- src/finn/transformation/streamline/reorder.py 66 additions, 0 deletionssrc/finn/transformation/streamline/reorder.py
- src/finn/util/basic.py 83 additions, 0 deletionssrc/finn/util/basic.py
- src/finn/util/vivado.py 8 additions, 3 deletionssrc/finn/util/vivado.py
Loading
Please register or sign in to comment