Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the bug of fuse conv #529

Merged
merged 3 commits into from
Nov 10, 2020
Merged

Fix the bug of fuse conv #529

merged 3 commits into from
Nov 10, 2020

Conversation

1627180283
Copy link
Collaborator

Solve the problem that bias will be fused twice

@codecov-io
Copy link

Codecov Report

Merging #529 (302a745) into master (8bbda01) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #529   +/-   ##
=======================================
  Coverage   24.56%   24.56%           
=======================================
  Files         287      287           
  Lines        9048     9048           
=======================================
  Hits         2223     2223           
  Misses       6825     6825           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8bbda01...302a745. Read the comment docs.

@gttiankai gttiankai merged commit 47fa40a into Tencent:master Nov 10, 2020
gttiankai added a commit that referenced this pull request Nov 10, 2020
Co-authored-by: ealinli <ealinli@tencent.com>
Co-authored-by: lucasktian <lucasktian@tencent.com>
darrenyao87 added a commit that referenced this pull request Nov 16, 2020
* master: (48 commits)
  create issue templates (#549)
  [OPENCL] fix fp16 select with short condition (#544)
  [Metal] enable CPU N8UC4 Mat in metal ConvertFromMat (#543)
  Add fuse SpaceToDepth and DepthToSpace (#542)
  [TOOL][ADD] add output name param support (#537)
  [CONVERTER][BUG] fix the bug of fuse conv (#529)
  [UPD] update iOS&macos building scripts, check building errors (#531)
  [Metal] fix reshape out-of-bound access bug (#496)
  Feature demo hairsegmentation (#530)
  [Metal] fix bugs in Copy NCHW_FLAOT mat from metal to CPU (#472)
  support SpaceToDepth and DepthToSpace Operator (#526)
  update onnx coreml convert tool (#467)
  [ARM] fix reduce l2 layer error (#527)
  Patch rknpu (#528)
  [OPENCL] add opencl code gen to make stage (#521)
  Feature issue 475 (#517)
  [ARM][BUG] fix int8 dwconv kernel shape error (#514)
  [OPENCL] change opencl force fp32 to precision mode && fix layer (#522)
  [iOS] fix iPhone and simulator arch conflicts with Xcode12 (#523)
  Set name and type of Reformat LayerParam (#519)
  ...

# Conflicts:
#	examples/android/demo/src/main/java/com/tencent/tnn/demo/StreamBlazeFaceAlign/StreamBlazeFaceAlignFragment.java
#	examples/android/demo/src/main/java/com/tencent/tnn/demo/StreamBlazeFaceDetector/StreamBlazeFaceDetectFragment.java
#	examples/android/demo/src/main/java/com/tencent/tnn/demo/StreamFaceDetector/StreamFaceDetectFragment.java
#	examples/android/demo/src/main/java/com/tencent/tnn/demo/StreamObjectDetector/StreamObjectDetectFragment.java
#	examples/android/demo/src/main/java/com/tencent/tnn/demo/StreamObjectDetectorSSD/StreamObjectDetectSSDFragment.java
#	include/tnn/core/status.h
#	platforms/ios/tnn.xcodeproj/project.pbxproj
#	source/tnn/core/default_network.cc
#	source/tnn/device/cpu/cpu_blob_converter.cc
#	source/tnn/interpreter/net_structure.cc
#	source/tnn/interpreter/net_structure.h
#	source/tnn/optimizer/net_optimizer_insert_int8_reformat.cc
#	source/tnn/utils/mat_utils.cc
#	source/tnn/utils/naive_compute.cc
#	test/test.cc
#	tools/onnx2tnn/src/core/onnx_fuse/onnx2tnn_fuse_spacetodepth.cc
lnmdlong pushed a commit that referenced this pull request Sep 2, 2021
* master: (55 commits)
  [OPT] optimize memory useage of instance
  [ATLAS][OPT] reduce model string copy
  fix spell error (#564)
  [OPENCL][FIX] fix share opencl context (#563)
  add missing parameter in CreateContext (#551)
  [ADD]support ShareCommandQueue between instances (#556)
  Hotfix opencl select (#555)
  Eff opt (#554)
  [OPENCL] optimize pooling with fine-grained parallelsim (#553)
  create issue templates (#549)
  [OPENCL] fix fp16 select with short condition (#544)
  [Metal] enable CPU N8UC4 Mat in metal ConvertFromMat (#543)
  Add fuse SpaceToDepth and DepthToSpace (#542)
  [TOOL][ADD] add output name param support (#537)
  [ATLAS][BUG] allocate context for each weight memory avoid device mismatch
  [ATLAS][BUG] fix weights buffer free error
  [CONVERTER][BUG] fix the bug of fuse conv (#529)
  [ATLAS][BUG] fix compile error due to api change
  [UPD] update iOS&macos building scripts, check building errors (#531)
  [Metal] fix reshape out-of-bound access bug (#496)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants