[BUG]fix reduce op convert with wrong axes #1724
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # examples/ios/TNNExamples/TNNCameraPreviewController/TNNViewModel/TNNFaceDetectAlignerViewModel.mm # model/download_model.sh
* 'master' of https://github.com/darrenyao87/TNN: Feature rknpu support (#387) Feature arm yuv2bgra (#381)
# Conflicts: # examples/ios/TNNExamples/TNNCameraPreviewController/TNNViewModel/TNNFaceDetectAlignerViewModel.mm # examples/ios/TNNExamples/TNNYoutuFaceAlignController/TNNYoutuFaceAlignController.mm
* upstream/master: (31 commits) [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) [DEVICE][OPENCL] 优化3*3卷积和非对称卷积 (#515) [iOS] fix tnn iOS&maxOS build error (#508) [DEV][UPD] 1. Int8Reformat -> Reformat; [ONNX][BUG] fix pool fusion bug (#500) Enhance warpaffine nearest (#501) [OPENCL] fix chinese comments (#493) Feature mat make border (#491) Enhance arm int8 (#486) [NPU][BUG] fix comiple error due to api change Npu fp16 fix (#488) Feature fp16 workflow (#482) Opencl reduce softmax opt (#443) ... # Conflicts: # platforms/ios/tnn.xcodeproj/project.pbxproj
* upstream/master: 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) [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)
* upstream/master: (39 commits) Feature arm fp16 op (#588) [QUANTIZED][BUG]1. add QuantizedUpsample(layer_type.cc); (#644) support empty mat (#603) [RKNPU][BUG] fix memleak in network init (#640) [RKNPU][ADD] add rkmodel cache interface (#633) Fix issue 599 (#608) fix abstract_layer_acc.cc shadowed variable (#617) Fix sign compare warning (#627) [OPENCL] fix reduce multi axis kernel (#614) Fix metal convacc selection (#609) [ONNX2TNN][BUG] 1. fic onnx2tnn convolution input channel; (#611) [QUANT][BUG] fix per tensor quantconcat error (#607) [CONVERTER][BUG] 1. fix Issue #604; (#605) Fix remove squeeze (#571) Fix issue #566 (#570) Fix typo. (#594) [BUG] fix layer resource count error when packing model (#592) Fix typo. (#590) [OPENCL][FIX]修复IMAC opencl 1.2 兼容错误导致无法运行unit test问题 (#593) Feature quant upsample (#589) ... # Conflicts: # source/tnn/core/default_network.cc # source/tnn/device/cpu/cpu_context.h # source/tnn/device/opencl/opencl_context.h
* upstream/master: (106 commits) Stable v0.3 merge master (#709) Dev issue 695 (#708) Patch rknpu cache (#707) [CONVERTER2TNN][BUG]1.fix bug for convert2tnn build.sh (#700) [ARM][BUG] fix upsample cubic openmp too many args (#692) [CONVERTER2TNN][UPD] 1. default do not clean build directory; (#694) Feature fp16 arm32 (#690) pose demo (#665) [TOOLS][ADD] Model checker support Huawei NPU (#684) Fix input name and the bug of optimization model (#674) [CUDA][FIX] fix merge error and support cuda scale [CUDA]mdf cuda reduce_l2 [NPU][ADD] 添加NPU ResizeBilinearV2算子的convert (#646) fix github action failures fix ctest running issue fix gcc7.5 compiling issue [CUDA]delete redundant md5 [SCRIPTS][BUILD] close treat warning as error [SCRIPTS][BUILD] set openvino build type release Feature opencl kernel opt merge (#672) ... # Conflicts: # include/tnn/utils/half_utils.h # platforms/ios/tnn.xcodeproj/project.pbxproj # source/tnn/device/arm/acc/Half8.h # source/tnn/device/arm/acc/arm_relu6_layer_acc.cc # source/tnn/device/arm/acc/arm_sigmoid_layer_acc.cc # source/tnn/device/arm/acc/arm_unary_layer_acc.h # source/tnn/device/arm/acc/compute/compute.cc # source/tnn/device/arm/arm_blob_converter.cc # source/tnn/device/arm/arm_util.cc # source/tnn/utils/cpu_utils.cc
# Conflicts: # CMakeLists.txt
# Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
teslawho
approved these changes
Jul 13, 2022
darrenyao87
added a commit
that referenced
this pull request
Jul 19, 2022
* master: (59 commits) [CUDA][ADD] add logsoftmax operator & unittest (#1728) return error when mat.data_ == nullptr (#1733) [METAL] fix metal binary op (#1729) [BUG]fix reduce op convert with wrong axes (#1724) Hotfix m1 build (#1715) [DRQ][BUG]1. fix bug for max_values; (#1716) [UPD]update merge logic for swish groupnorm deconv (#1708) [BUG]fix coreml error of slicev2、padv2 and matmul; (#1703) [iOS][UPD]1. add missing file for xcode project; (#1705) [mac] 1. FIX X86 and ARM conflict; 2. ADD ARM arch on intel cpu (You can use ARM if rosetta-X86 crash). 3. Use ios project build/profile M1-Mac. (#1700) [METAL] fix stride slice crach when dims is 2 (#1701) Fix windows x86 build (#1697) Optimize dynamic range quantize (#1699) [FIX] fix compile macos framework (#1687) [UPD][DRQ] support quantizing matmul's const weight (#1698) Dev metal ngray (#1693) [UPD][TOOLS] 1.increase subs_length 2.align model support bool and int32 input 3. fix gather and onehot convert 4. gather_nd support indices_shape[-1] < r (#1686) avoid nullptr in IsSupport (#1685) [ARM] fix arm cross compile error caused by float-abi (#1678) Dev x86 layer adapter (#1683) ... # Conflicts: # platforms/ios/tnn.xcodeproj/project.pbxproj # source/tnn/device/x86/CMakeLists.txt
ZaoZhe6666
pushed a commit
to ZaoZhe6666/TNN
that referenced
this pull request
Aug 2, 2022
* [BUG]fix YouTu face alignment model * [UPD]update mean pts file logic * [UPD]draw face points green * [UPD]unify example controller list * [UPD]unify example controller list * [UPD]move blaze anchor file to resource * [METAL]update tnn project * [UPD]update tool onnx2coreml * [ADD]support ShareCommandQueue between instances * [ADD]support ShareCommandQueue between instances * [UPD]add log message * [UPD]transfer file half.hpp * [UPD]fix xcode compile error with fp16 * [UPD]fix xcode compile error with fp16 * [UPD]update model type erro msg * [FIX]fix logic error of constofshape * [UPD]update debug message * [FIX]fsupport int32 for neg op * [BUG]fix init error with nil commadbuffer * [UPD]add mac build xcode project; fix ios mac build script; * [UPD]add mac build xcode project; fix ios mac build script; * [ADD]add QQ group 2 of TNN * [BUG]fix dynamic dequant error; fix arm pad error; * [BUG]support coreml padv2 * [BUG]fix ccoreml matmul error when it has const input blob * [BUG]fix coreml slicev2 * [UPD]add convert logic of swish * [BUG]fix error cpu error for x86 mac * [UPD]support fusion for gemm + bn * [UPD]add convert logic of swish * [UPD]support fusion for deconv+add and deconv+add+bn * [UPD]add aliyun disk link for tnn models * [UPD]support fusion for group norm * [UPD]support fusion for swish * [BUG]fix reduce op convert with wrong axes Co-authored-by: neiltian <65950677+neiltian-tencent@users.noreply.github.com> Co-authored-by: lucasktian <lucasktian@tencent.com>
ZaoZhe6666
pushed a commit
to ZaoZhe6666/TNN
that referenced
this pull request
Aug 2, 2022
* [BUG]fix YouTu face alignment model * [UPD]update mean pts file logic * [UPD]draw face points green * [UPD]unify example controller list * [UPD]unify example controller list * [UPD]move blaze anchor file to resource * [METAL]update tnn project * [UPD]update tool onnx2coreml * [ADD]support ShareCommandQueue between instances * [ADD]support ShareCommandQueue between instances * [UPD]add log message * [UPD]transfer file half.hpp * [UPD]fix xcode compile error with fp16 * [UPD]fix xcode compile error with fp16 * [UPD]update model type erro msg * [FIX]fix logic error of constofshape * [UPD]update debug message * [FIX]fsupport int32 for neg op * [BUG]fix init error with nil commadbuffer * [UPD]add mac build xcode project; fix ios mac build script; * [UPD]add mac build xcode project; fix ios mac build script; * [ADD]add QQ group 2 of TNN * [BUG]fix dynamic dequant error; fix arm pad error; * [BUG]support coreml padv2 * [BUG]fix ccoreml matmul error when it has const input blob * [BUG]fix coreml slicev2 * [UPD]add convert logic of swish * [BUG]fix error cpu error for x86 mac * [UPD]support fusion for gemm + bn * [UPD]add convert logic of swish * [UPD]support fusion for deconv+add and deconv+add+bn * [UPD]add aliyun disk link for tnn models * [UPD]support fusion for group norm * [UPD]support fusion for swish * [BUG]fix reduce op convert with wrong axes Co-authored-by: neiltian <65950677+neiltian-tencent@users.noreply.github.com> Co-authored-by: lucasktian <lucasktian@tencent.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.