Merge pull request #893 from codeWorm2015/metal

commit before test

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 " \(res) "
   }
   
   var preprocessKernel: CusomKernel

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

@@ -79,7 +79,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 +87,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/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/Kernels/SoftmaxKernel.swift

@@ -43,9 +43,7 @@ class SoftmaxKernel<P: PrecisionType>: Kernel, Computable{
       N: Int32(param.input.tensorDim[0]),
       K: Int32(param.input.tensorDim[1])
     )
-    
-    print(" soft max param: ")
-    print(smp)
+
     encoder.setBytes(&smp, 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] {