Skip to content

Commit 934d9ba

Browse files
author
liqing
committed
beta 0.1.1.4
- refactor OpenGL, test relative codes - optimize LRN - fix doc link error
1 parent 2fc8a20 commit 934d9ba

File tree

122 files changed

+13113
-1413
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+13113
-1413
lines changed

‎3rd_party/imageHelper/stb_image.h‎

Lines changed: 7547 additions & 0 deletions
Large diffs are not rendered by default.

‎3rd_party/imageHelper/stb_image_resize.h‎

Lines changed: 2630 additions & 0 deletions
Large diffs are not rendered by default.

‎3rd_party/imageHelper/stb_image_write.h‎

Lines changed: 1622 additions & 0 deletions
Large diffs are not rendered by default.

‎doc/AddOp_EN.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
Before adding Op, please refer to [Op Manual](OpList.md) to avoid unnecessary duplication.
66

77
In MNN, adding Op consists of the following steps:
8-
1. [Add model description of Op](#Add model description of Op)
9-
2. [Add model conversion of Op](#Add model conversion of Op)
10-
3. [Calculate output tensor size of Op](#Calculate output tensor size of Op)
8+
1. [Add model description of Op](#Add_model_description_of_Op)
9+
2. [Add model conversion of Op](#Add_model_conversion_of_Op)
10+
3. [Calculate output tensor size of Op](#Calculate_output_tensor_size_of_Op)
1111
4. Add Op implementation (execution) corresponding to Backend([CPU](#CPU)|[Metal](#Metal)|[Vulkan](#Vulkan)|[OpenCL](#OpenCL)|[OpenGL](#OpenGL))
1212

1313
## Add model description of Op

‎project/ios/MNN.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,6 @@
416416
9200049921EDBDF600BCE892 /* TensorTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9200045D21EDBDF600BCE892 /* TensorTest.cpp */; };
417417
9200049A21EDBDF600BCE892 /* ImageProcessTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9200045F21EDBDF600BCE892 /* ImageProcessTest.cpp */; };
418418
9200049B21EDBDF600BCE892 /* MatrixTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9200046021EDBDF600BCE892 /* MatrixTest.cpp */; };
419-
9200049C21EDBDF600BCE892 /* ConstTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9200046221EDBDF600BCE892 /* ConstTest.cpp */; };
420419
9200049D21EDBDF600BCE892 /* TFQuantizedConv2DTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9200046321EDBDF600BCE892 /* TFQuantizedConv2DTest.cpp */; };
421420
9200049F21EDBDF600BCE892 /* PackTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9200046521EDBDF600BCE892 /* PackTest.cpp */; };
422421
920004A021EDBDF600BCE892 /* SqueezeTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9200046621EDBDF600BCE892 /* SqueezeTest.cpp */; };
@@ -517,7 +516,6 @@
517516
9243106C2239FE0B0016DA25 /* MetalSize.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9243106A2239FE0A0016DA25 /* MetalSize.mm */; };
518517
9243106D2239FE0B0016DA25 /* MetalSize.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 9243106B2239FE0B0016DA25 /* MetalSize.hpp */; };
519518
9243106F2239FE190016DA25 /* MetalSize.metal in Sources */ = {isa = PBXBuildFile; fileRef = 9243106E2239FE190016DA25 /* MetalSize.metal */; };
520-
924310712239FE460016DA25 /* SizeTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 924310702239FE460016DA25 /* SizeTest.cpp */; };
521519
924F131921A81C74006D46A4 /* MetalTranspose.mm in Sources */ = {isa = PBXBuildFile; fileRef = 924F131721A81C74006D46A4 /* MetalTranspose.mm */; };
522520
924F131A21A81C74006D46A4 /* MetalTranspose.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 924F131821A81C74006D46A4 /* MetalTranspose.hpp */; };
523521
924F131C21A81C80006D46A4 /* MetalTranspose.metal in Sources */ = {isa = PBXBuildFile; fileRef = 924F131B21A81C80006D46A4 /* MetalTranspose.metal */; };
@@ -613,6 +611,8 @@
613611
AE7BE4BB2285564F002CEEA6 /* CPUOPRegister.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AE7BE4BA2285564F002CEEA6 /* CPUOPRegister.cpp */; };
614612
AE7BE4BD22855665002CEEA6 /* MetalOPRegister.mm in Sources */ = {isa = PBXBuildFile; fileRef = AE7BE4BC22855665002CEEA6 /* MetalOPRegister.mm */; };
615613
AEC3B31F211BEF710046AD86 /* MNNDefine.h in Headers */ = {isa = PBXBuildFile; fileRef = AEC3B31E211BEF710046AD86 /* MNNDefine.h */; settings = {ATTRIBUTES = (Public, ); }; };
614+
C425F8742292A31F00B4682D /* MNNPowC8.S in Sources */ = {isa = PBXBuildFile; fileRef = C425F8732292A31D00B4682D /* MNNPowC8.S */; };
615+
C425F8762292A32B00B4682D /* MNNPowC8.S in Sources */ = {isa = PBXBuildFile; fileRef = C425F8752292A32A00B4682D /* MNNPowC8.S */; };
616616
CE96FE7121707D58004AB400 /* MetalTensorConverter.mm in Sources */ = {isa = PBXBuildFile; fileRef = CE96FE5F21707D57004AB400 /* MetalTensorConverter.mm */; };
617617
CE96FE7221707D58004AB400 /* MetalUnary.hpp in Headers */ = {isa = PBXBuildFile; fileRef = CE96FE6021707D57004AB400 /* MetalUnary.hpp */; };
618618
CE96FE7321707D58004AB400 /* MetalSigmoid.hpp in Headers */ = {isa = PBXBuildFile; fileRef = CE96FE6121707D57004AB400 /* MetalSigmoid.hpp */; };
@@ -1118,7 +1118,6 @@
11181118
9200045D21EDBDF600BCE892 /* TensorTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TensorTest.cpp; sourceTree = "<group>"; };
11191119
9200045F21EDBDF600BCE892 /* ImageProcessTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ImageProcessTest.cpp; sourceTree = "<group>"; };
11201120
9200046021EDBDF600BCE892 /* MatrixTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MatrixTest.cpp; sourceTree = "<group>"; };
1121-
9200046221EDBDF600BCE892 /* ConstTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConstTest.cpp; sourceTree = "<group>"; };
11221121
9200046321EDBDF600BCE892 /* TFQuantizedConv2DTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TFQuantizedConv2DTest.cpp; sourceTree = "<group>"; };
11231122
9200046521EDBDF600BCE892 /* PackTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PackTest.cpp; sourceTree = "<group>"; };
11241123
9200046621EDBDF600BCE892 /* SqueezeTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SqueezeTest.cpp; sourceTree = "<group>"; };
@@ -1217,7 +1216,6 @@
12171216
9243106A2239FE0A0016DA25 /* MetalSize.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MetalSize.mm; sourceTree = "<group>"; };
12181217
9243106B2239FE0B0016DA25 /* MetalSize.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = MetalSize.hpp; sourceTree = "<group>"; };
12191218
9243106E2239FE190016DA25 /* MetalSize.metal */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.metal; path = MetalSize.metal; sourceTree = "<group>"; };
1220-
924310702239FE460016DA25 /* SizeTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SizeTest.cpp; sourceTree = "<group>"; };
12211219
924B11AB21E73B9C006B37DB /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Platforms/iPhoneOS.platform/Developer/Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
12221220
924F131721A81C74006D46A4 /* MetalTranspose.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MetalTranspose.mm; sourceTree = "<group>"; };
12231221
924F131821A81C74006D46A4 /* MetalTranspose.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = MetalTranspose.hpp; sourceTree = "<group>"; };
@@ -1319,6 +1317,8 @@
13191317
AE7BE4BA2285564F002CEEA6 /* CPUOPRegister.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CPUOPRegister.cpp; sourceTree = "<group>"; };
13201318
AE7BE4BC22855665002CEEA6 /* MetalOPRegister.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MetalOPRegister.mm; sourceTree = "<group>"; };
13211319
AEC3B31E211BEF710046AD86 /* MNNDefine.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MNNDefine.h; sourceTree = "<group>"; };
1320+
C425F8732292A31D00B4682D /* MNNPowC8.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = MNNPowC8.S; sourceTree = "<group>"; };
1321+
C425F8752292A32A00B4682D /* MNNPowC8.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = MNNPowC8.S; sourceTree = "<group>"; };
13221322
CE96FE5F21707D57004AB400 /* MetalTensorConverter.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MetalTensorConverter.mm; sourceTree = "<group>"; };
13231323
CE96FE6021707D57004AB400 /* MetalUnary.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = MetalUnary.hpp; sourceTree = "<group>"; };
13241324
CE96FE6121707D57004AB400 /* MetalSigmoid.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = MetalSigmoid.hpp; sourceTree = "<group>"; };
@@ -1933,6 +1933,7 @@
19331933
488874AF215B639E0079B12E /* arm32 */ = {
19341934
isa = PBXGroup;
19351935
children = (
1936+
C425F8732292A31D00B4682D /* MNNPowC8.S */,
19361937
486B4BC0222D4831001E73E3 /* MNNMatrixMax.S */,
19371938
486B4BB8222901D5001E73E3 /* MNNMatrixProd.S */,
19381939
48A8A62A21D5FE3100C2B9A7 /* MNNNV21ToRGBAUnit.S */,
@@ -1998,6 +1999,7 @@
19981999
488874D9215B639E0079B12E /* arm64 */ = {
19992000
isa = PBXGroup;
20002001
children = (
2002+
C425F8752292A32A00B4682D /* MNNPowC8.S */,
20012003
48EB45EC2255D270006C2322 /* MNNConvDwF23MulTransUnit.S */,
20022004
48EB45ED2255D270006C2322 /* MNNConvDwF23SourceTransUnit.S */,
20032005
486B4BC2222D4845001E73E3 /* MNNMatrixMax.S */,
@@ -2140,7 +2142,6 @@
21402142
9200047B21EDBDF600BCE892 /* BinaryOPTest.cpp */,
21412143
9200048421EDBDF600BCE892 /* CastTest.cpp */,
21422144
9200048A21EDBDF600BCE892 /* ConcatTest.cpp */,
2143-
9200046221EDBDF600BCE892 /* ConstTest.cpp */,
21442145
9200047421EDBDF600BCE892 /* ConvolutionTest.cpp */,
21452146
9200049721EDBDF600BCE892 /* CropAndResizeTest.cpp */,
21462147
9200048D21EDBDF600BCE892 /* CropTest.cpp */,
@@ -2175,7 +2176,6 @@
21752176
9200048121EDBDF600BCE892 /* ScaleTest.cpp */,
21762177
9200049321EDBDF600BCE892 /* SeLUTest.cpp */,
21772178
9200048621EDBDF600BCE892 /* SigmoidTest.cpp */,
2178-
924310702239FE460016DA25 /* SizeTest.cpp */,
21792179
9200049021EDBDF600BCE892 /* SliceTest.cpp */,
21802180
9200048E21EDBDF600BCE892 /* SliceTFTest.cpp */,
21812181
9200047E21EDBDF600BCE892 /* SoftmaxTest.cpp */,
@@ -2729,6 +2729,7 @@
27292729
4888762D215B639F0079B12E /* CPULRN.cpp in Sources */,
27302730
48C054A322081C9B00E91945 /* MNNAddBiasRelu.S in Sources */,
27312731
488875E2215B639F0079B12E /* CPUCropAndResize.cpp in Sources */,
2732+
C425F8742292A31F00B4682D /* MNNPowC8.S in Sources */,
27322733
EBB38F2421E748B9005F76D7 /* ShapeExpandDims.cpp in Sources */,
27332734
488875E3215B639F0079B12E /* CPUSelu.cpp in Sources */,
27342735
48887643215B639F0079B12E /* ConvOpt.cpp in Sources */,
@@ -2906,6 +2907,7 @@
29062907
48AE9EA82212D403009DB6F4 /* MNNMatrixAdd.S in Sources */,
29072908
48887629215B639F0079B12E /* CPUTranspose.cpp in Sources */,
29082909
488876D1215B639F0079B12E /* CPUQuantizedAvgPool.cpp in Sources */,
2910+
C425F8762292A32B00B4682D /* MNNPowC8.S in Sources */,
29092911
48887696215B639F0079B12E /* MNNWinogradMatrixProductLeft.S in Sources */,
29102912
EBB38F0521E748B9005F76D7 /* ShapeCrop.cpp in Sources */,
29112913
488875C5215B639F0079B12E /* MetalReLU.mm in Sources */,
@@ -3116,14 +3118,12 @@
31163118
920004BE21EDBDF600BCE892 /* CastTest.cpp in Sources */,
31173119
920004AB21EDBDF600BCE892 /* InterpTest.cpp in Sources */,
31183120
920004C421EDBDF600BCE892 /* ConcatTest.cpp in Sources */,
3119-
924310712239FE460016DA25 /* SizeTest.cpp in Sources */,
31203121
920004AA21EDBDF600BCE892 /* GatherV2Test.cpp in Sources */,
31213122
920004B621EDBDF600BCE892 /* BatchToSpaceNDTest.cpp in Sources */,
31223123
920004BB21EDBDF600BCE892 /* ScaleTest.cpp in Sources */,
31233124
920004D021EDBDF600BCE892 /* PReLUTest.cpp in Sources */,
31243125
920004C021EDBDF600BCE892 /* SigmoidTest.cpp in Sources */,
31253126
920004CE21EDBDF600BCE892 /* UnaryTest.cpp in Sources */,
3126-
9200049C21EDBDF600BCE892 /* ConstTest.cpp in Sources */,
31273127
920004A921EDBDF600BCE892 /* ReductionTest.cpp in Sources */,
31283128
920004A521EDBDF600BCE892 /* TileTest.cpp in Sources */,
31293129
920004B921EDBDF600BCE892 /* NormalizeTest.cpp in Sources */,

0 commit comments

Comments
 (0)