[Test] solved merge conlict by accepting both changes (6616f46b) · 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

6616f46b

Commit 6616f46b authored 5 years ago by auphelia

Downloads
- Plain Diff

[Test] solved merge conlict by accepting both changes

parents 6a95520e fa421928

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

Dockerfile 0 additions, 1 deletion

Dockerfile
run-docker.sh 6 additions, 1 deletion

run-docker.sh
src/finn/custom_op/fpgadataflow/streamingfclayer_batch.py 17 additions, 0 deletions

src/finn/custom_op/fpgadataflow/streamingfclayer_batch.py
src/finn/transformation/fpgadataflow/templates.py 3 additions, 1 deletion

src/finn/transformation/fpgadataflow/templates.py
src/finn/util/data_packing.py 19 additions, 3 deletions

src/finn/util/data_packing.py
tests/fpgadataflow/test_data_packing.py 14 additions, 2 deletions

tests/fpgadataflow/test_data_packing.py
tests/fpgadataflow/test_fpgadataflow_ip_stitch.py 18 additions, 44 deletions

tests/fpgadataflow/test_fpgadataflow_ip_stitch.py
tests/fpgadataflow/test_layer_streaming_maxpool_batch.py 2 additions, 0 deletions

tests/fpgadataflow/test_layer_streaming_maxpool_batch.py

with 79 additions and 52 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