Fix merge conflict in docker/finn_entrypoint.sh while merging upstream/dev (cd72c1cc) · Commits · streichg / Finn · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

Finn
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

Admin message

To receive notifications about scheduled maintenance, please subscribe to the mailing-list gitlab-operations@sympa.ethz.ch. You can subscribe to the mailing-list at https://sympa.ethz.ch

cd72c1cc

Commit cd72c1cc authored 4 years ago by Tobi-Alonso

Downloads
- Plain Diff

Fix merge conflict in docker/finn_entrypoint.sh while merging upstream/dev

parents 1eef6625 ef3d4c9d

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

docker/finn_entrypoint.sh 1 addition, 1 deletion

docker/finn_entrypoint.sh
docs/finn/getting_started.rst 1 addition, 0 deletions

docs/finn/getting_started.rst
src/finn/custom_op/fpgadataflow/fmpadding_batch.py 27 additions, 24 deletions

src/finn/custom_op/fpgadataflow/fmpadding_batch.py
src/finn/custom_op/fpgadataflow/tlastmarker.py 110 additions, 34 deletions

src/finn/custom_op/fpgadataflow/tlastmarker.py
src/finn/custom_op/registry.py 1 addition, 1 deletion

src/finn/custom_op/registry.py
src/finn/transformation/fpgadataflow/insert_tlastmarker.py 62 additions, 8 deletions

src/finn/transformation/fpgadataflow/insert_tlastmarker.py
tests/fpgadataflow/test_fpgadataflow_fmpadding.py 10 additions, 6 deletions

tests/fpgadataflow/test_fpgadataflow_fmpadding.py

with 212 additions and 74 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment