[iOS] fix iPhone and simulator arch conflicts with Xcode12 #523
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
Codecov Report
@@ Coverage Diff @@
## master #523 +/- ##
=======================================
Coverage 24.47% 24.47%
=======================================
Files 287 287
Lines 9030 9030
=======================================
Hits 2210 2210
Misses 6820 6820 Continue to review full report at Codecov.
|
neiltian-tencent
approved these changes
Nov 6, 2020
gttiankai
pushed a commit
that referenced
this pull request
Nov 9, 2020
gttiankai
pushed a commit
that referenced
this pull request
Nov 10, 2020
Closed
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
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.
xcode12为模拟器编译sdk时增加了arm64架构，导致与为iPhone编译的sdk合并时出现架构冲突问题。
在build_ios.sh中增加对xcode版本的判断，使用xcode12时，不为模拟器的arm64架构编译代码。