Merge branch 'metal' into metal

metal/paddle-mobile-demo/paddle-mobile-demo.xcodeproj/project.pbxproj

@@ -494,19 +494,19 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = A798K58VVL;
+				CODE_SIGN_IDENTITY = "iPhone Distribution";
+				CODE_SIGN_STYLE = Manual;
+				DEVELOPMENT_TEAM = 6T9LLJKSM4;
 				INFOPLIST_FILE = "paddle-mobile-demo/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "com.baidu.paddle-mobile";
+				PRODUCT_BUNDLE_IDENTIFIER = com.baidu.mms.qa;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "";
-				PROVISIONING_PROFILE_SPECIFIER = "";
+				PROVISIONING_PROFILE = "ba9c4b24-7bd0-49c5-93cd-e3051e775d6c";
+				PROVISIONING_PROFILE_SPECIFIER = Distribution_MMS;
 				SWIFT_OBJC_BRIDGING_HEADER = "paddle-mobile-demo/paddle-mobile-demo-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 4.0;
@@ -520,19 +520,19 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = A798K58VVL;
+				CODE_SIGN_IDENTITY = "iPhone Distribution";
+				CODE_SIGN_STYLE = Manual;
+				DEVELOPMENT_TEAM = 6T9LLJKSM4;
 				INFOPLIST_FILE = "paddle-mobile-demo/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "com.baidu.paddle-mobile";
+				PRODUCT_BUNDLE_IDENTIFIER = com.baidu.mms.qa;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "";
-				PROVISIONING_PROFILE_SPECIFIER = "";
+				PROVISIONING_PROFILE = "ba9c4b24-7bd0-49c5-93cd-e3051e775d6c";
+				PROVISIONING_PROFILE_SPECIFIER = Distribution_MMS;
 				SWIFT_OBJC_BRIDGING_HEADER = "paddle-mobile-demo/paddle-mobile-demo-Bridging-Header.h";
 				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";

metal/paddle-mobile-demo/paddle-mobile-demo/Net/Genet.swift

@@ -31,7 +31,7 @@ class Genet: Net {
   }
   
   func resultStr(res: [Float]) -> String {
-    return " 哈哈  还没好 genet !";
+    return " \(Array<Float>(res.suffix(10))) ... "
   }
   
   var preprocessKernel: CusomKernel

metal/paddle-mobile-demo/paddle-mobile-demo/Net/MobileNetSSD.swift

@@ -48,12 +48,12 @@ class MobileNet_ssd_hand: Net{
     }
     
     var scoreFormatArr: [Float32] = score.metalTexture.realNHWC(dim: (n: score.padToFourDim[0], h: score.padToFourDim[1], w: score.padToFourDim[2], c: score.padToFourDim[3]))
-    print("score: ")
-    print(scoreFormatArr.strideArray())
-    
+//    print("score: ")
+//    print(scoreFormatArr.strideArray())
+//
     var bboxArr = bbox.metalTexture.float32Array()
-    print("bbox: ")
-    print(bboxArr.strideArray())
+//    print("bbox: ")
+//    print(bboxArr.strideArray())
     
     let nmsCompute = NMSCompute.init()
     nmsCompute.scoreThredshold = 0.01

metal/paddle-mobile-demo/paddle-mobile-demo/ViewController.swift

@@ -19,17 +19,18 @@ import MetalPerformanceShaders
 
 let threadSupport = [1]
 
-let modelHelperMap: [SupportModel : Net] = [ .mobilenet : MobileNet.init(), .mobilenet_ssd : MobileNet_ssd_hand.init(), .genet : Genet.init()]
+//.mobilenet : MobileNet.init(),
+let modelHelperMap: [SupportModel : Net] = [.mobilenet_ssd : MobileNet_ssd_hand.init(), .genet : Genet.init()]
 //, .genet : Genet.init()
 //let modelHelperMap: [SupportModel : Net] = [.mobilenet : MobileNet.init(), .mobilenet_ssd : MobileNet_ssd_hand.init()]
 
 enum SupportModel: String{
-  case mobilenet = "mobilenet"
+//  case mobilenet = "mobilenet"
   case mobilenet_ssd = "mobilenetssd"
   case genet          = "genet"
   static func supportedModels() -> [SupportModel] {
-    //
-    return [.mobilenet, .mobilenet_ssd ,.genet]
+    //.mobilenet,
+    return [.mobilenet_ssd ,.genet]
   }
 }
 
@@ -79,7 +80,7 @@ class ViewController: UIViewController {
       return
     }
     do {
-      let max = 1
+      let max = 50
       let startDate = Date.init()
       for i in 0..<max {
         try net.predict(inTexture: inTexture) { [weak self] (result) in
@@ -87,7 +88,6 @@ class ViewController: UIViewController {
             fatalError()
           }
           
-          print(result.resultArray.strideArray())
           if i == max - 1 {
             let time = Date.init().timeIntervalSince(startDate)
             DispatchQueue.main.async {

metal/paddle-mobile/paddle-mobile.xcodeproj/xcuserdata/liuruilong.xcuserdatad/xcschemes/paddle-mobile.xcscheme

@@ -33,7 +33,7 @@
       </AdditionalOptions>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

metal/paddle-mobile/paddle-mobile/Executor.swift

@@ -126,11 +126,11 @@ public class Executor<P: PrecisionType> {
       //            print(stridableInput)
       
       //            let _: Flo? = input.logDesc(header: "input: ", stridable: true)
-      for i in 0..<self.ops.count {
-        let op = self.ops[i]
-        print(" 第 \(i) 个 op: ")
-        op.delogOutput()
-      }
+//      for i in 0..<self.ops.count {
+//        let op = self.ops[i]
+//        print(" 第 \(i) 个 op: ")
+//        op.delogOutput()
+//      }
       
 //      return;
 //      self.ops[testTo - 2].delogOutput()

metal/paddle-mobile/paddle-mobile/Operators/Base/Operator.swift

@@ -101,7 +101,7 @@ class Operator <KernelType:  Computable , ParameterType>: OperatorProtocol where
   let scope: Scope
   var kernel: KerType
   required init(device: MTLDevice, opDesc: OpDesc, inScope: Scope) throws {
-    print("create op: \(opDesc.type)")
+//    print("create op: \(opDesc.type)")
     type = opDesc.type
     scope = inScope
     inputs = opDesc.inputs

metal/paddle-mobile/paddle-mobile/Operators/Kernels/BatchNormKernel.swift

@@ -63,7 +63,6 @@ class BatchNormKernel<P: PrecisionType>: Kernel, Computable {
     guard let encoder = commandBuffer.makeComputeCommandEncoder() else {
       throw PaddleMobileError.predictError(message: " encoder is nil")
     }
-    print("BatchNorm compute")
     encoder.setTexture(param.input.metalTexture, index: 0)
     encoder.setTexture(param.output.metalTexture, index: 1)
     encoder.setBuffer(newScale, offset: 0, index: 0)

metal/paddle-mobile/paddle-mobile/Operators/Kernels/ConvAddKernel.swift

@@ -59,14 +59,14 @@ class ConvAddKernel<P: PrecisionType>: Kernel, Computable {
     
     let offsetX = (Int(param.dilations[0]) * (param.filter.width - 1) + 1)/2 - Int(param.paddings[0])
     
-    print(" function: \(functionName)")
-    print("offset x: \(offsetX)")
-    print("offset y: \(offsetY)")
+//    print(" function: \(functionName)")
+//    print("offset x: \(offsetX)")
+//    print("offset y: \(offsetY)")
     
     let offsetZ = 0.0
     let inMetalParam = MetalConvParam.init(offsetX: Int16(offsetX), offsetY: Int16(offsetY), offsetZ: Int16(offsetZ), strideX: UInt16(param.stride[0]), strideY: UInt16(param.stride[1]), dilationX: UInt16(param.dilations[0]), dilationY: UInt16(param.dilations[1]))
-    print("metal param: ")
-    print(inMetalParam)
+//    print("metal param: ")
+//    print(inMetalParam)
     
     metalParam = inMetalParam
   }

metal/paddle-mobile/paddle-mobile/Operators/Kernels/ConvBNReluKernel.swift

@@ -88,17 +88,16 @@ class ConvBNReluKernel<P: PrecisionType>: Kernel, Computable, Testable {
     let offsetX = param.filter.width/2 - Int(param.paddings[0])
     let offsetY = param.filter.height/2 - Int(param.paddings[1])
     
-    print(" param filter width: \(param.filter.width)")
-    print(" param filter height: \(param.filter.height)")
-    
-    print(" param paddings: \(param.paddings)")
-    
-    print("ConvBNReluKernel offset x: \(offsetX)")
-    print("ConvBNReluKernel offset y: \(offsetY)")
+//    print(" param filter width: \(param.filter.width)")
+//    print(" param filter height: \(param.filter.height)")
+//
+//    print(" param paddings: \(param.paddings)")
+//
+//    print("ConvBNReluKernel offset x: \(offsetX)")
+//    print("ConvBNReluKernel offset y: \(offsetY)")
     
     let offsetZ = 0.0
     
-    print(" fuck ")
     metalParam = MetalConvParam.init(offsetX: Int16(offsetX), offsetY: Int16(offsetY), offsetZ: Int16(offsetZ), strideX: UInt16(param.stride[0]), strideY: UInt16(param.stride[1]), dilationX: UInt16(param.dilations[0]), dilationY: UInt16(param.dilations[1]))
     
     var invs: [P] = []

metal/paddle-mobile/paddle-mobile/Operators/Kernels/SoftmaxKernel.swift

@@ -43,7 +43,6 @@ class SoftmaxKernel<P: PrecisionType>: Kernel, Computable{
     }
     encoder.setTexture(param.input.metalTexture, index: 0)
     encoder.setTexture(param.output.metalTexture, index: 1)
-    
     encoder.setBytes(&metalParam, length: MemoryLayout<SoftmaxMetalParam>.size, index: 0)
     encoder.dispatch(computePipline: pipline, outTexture: param.output.metalTexture)
     encoder.endEncoding()

metal/paddle-mobile/paddle-mobile/framework/Texture.swift

@@ -50,7 +50,7 @@ public class Texture<P: PrecisionType>: Tensorial {
     guard  padToFourDim.cout() == 4 else {
       fatalError("- not support -")
     }
-    return metalTexture.toTensor(dim: (n: padToFourDim[0], c: padToFourDim[1], h: padToFourDim[2], w: padToFourDim[3]))
+    return metalTexture.toTensor(dim: (n: dim[0], c: dim[3], h: dim[1], w: dim[2]))
   }
   
   func realNHWC() -> [Float32] {