Resolved conflict in docker/finn_entrypoint.sh while merging feature/Add_channelwise_op
Showing
- docker/finn_entrypoint.sh 2 additions, 2 deletionsdocker/finn_entrypoint.sh
- src/finn/custom_op/fpgadataflow/channelwise_op_batch.py 18 additions, 22 deletionssrc/finn/custom_op/fpgadataflow/channelwise_op_batch.py
- src/finn/custom_op/fpgadataflow/pool_batch.py 395 additions, 0 deletionssrc/finn/custom_op/fpgadataflow/pool_batch.py
- src/finn/custom_op/im2col.py 2 additions, 0 deletionssrc/finn/custom_op/im2col.py
- src/finn/custom_op/registry.py 2 additions, 0 deletionssrc/finn/custom_op/registry.py
- src/finn/transformation/fpgadataflow/convert_to_hls_layers.py 210 additions, 25 deletions...finn/transformation/fpgadataflow/convert_to_hls_layers.py
- src/finn/transformation/fpgadataflow/prepare_cppsim.py 0 additions, 1 deletionsrc/finn/transformation/fpgadataflow/prepare_cppsim.py
- src/finn/transformation/streamline/absorb.py 37 additions, 0 deletionssrc/finn/transformation/streamline/absorb.py
- src/finn/transformation/streamline/reorder.py 66 additions, 0 deletionssrc/finn/transformation/streamline/reorder.py
- src/finn/util/onnx.py 4 additions, 3 deletionssrc/finn/util/onnx.py
- tests/fpgadataflow/test_convert_to_hls_channelwise_layer.py 115 additions, 0 deletionstests/fpgadataflow/test_convert_to_hls_channelwise_layer.py
- tests/fpgadataflow/test_convert_to_hls_pool_batch.py 160 additions, 0 deletionstests/fpgadataflow/test_convert_to_hls_pool_batch.py
- tests/fpgadataflow/test_fpgadataflow_channelwise_ops.py 1 addition, 1 deletiontests/fpgadataflow/test_fpgadataflow_channelwise_ops.py
- tests/transformation/test_absorb_mul_into_topk.py 108 additions, 0 deletionstests/transformation/test_absorb_mul_into_topk.py
- tests/transformation/test_move_mul_past_dw_conv.py 93 additions, 0 deletionstests/transformation/test_move_mul_past_dw_conv.py
Loading
Please register or sign in to comment