From 41b13251d582b15c65b73a60c8cb7aef6f70fc3e Mon Sep 17 00:00:00 2001
From: liuruilong <liuruilong@baidu.com>
Date: Mon, 3 Sep 2018 20:27:21 +0800
Subject: [PATCH] commit before test

---
 .../paddle-mobile-demo/Net/Genet.swift                 |  2 +-
 .../paddle-mobile-demo/ViewController.swift            |  3 +--
 metal/paddle-mobile/paddle-mobile/Executor.swift       | 10 +++++-----
 .../Operators/Kernels/SoftmaxKernel.swift              |  4 +---
 .../paddle-mobile/framework/Texture.swift              |  2 +-
 5 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/metal/paddle-mobile-demo/paddle-mobile-demo/Net/Genet.swift b/metal/paddle-mobile-demo/paddle-mobile-demo/Net/Genet.swift
index 0ba8c2f293..daccf165b7 100644
--- a/metal/paddle-mobile-demo/paddle-mobile-demo/Net/Genet.swift
+++ b/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
diff --git a/metal/paddle-mobile-demo/paddle-mobile-demo/ViewController.swift b/metal/paddle-mobile-demo/paddle-mobile-demo/ViewController.swift
index ecffd6af6d..40129d1b14 100644
--- a/metal/paddle-mobile-demo/paddle-mobile-demo/ViewController.swift
+++ b/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 {
diff --git a/metal/paddle-mobile/paddle-mobile/Executor.swift b/metal/paddle-mobile/paddle-mobile/Executor.swift
index 0085cac22f..48f31341a0 100644
--- a/metal/paddle-mobile/paddle-mobile/Executor.swift
+++ b/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()
diff --git a/metal/paddle-mobile/paddle-mobile/Operators/Kernels/SoftmaxKernel.swift b/metal/paddle-mobile/paddle-mobile/Operators/Kernels/SoftmaxKernel.swift
index 0c166c3563..ab99065b49 100644
--- a/metal/paddle-mobile/paddle-mobile/Operators/Kernels/SoftmaxKernel.swift
+++ b/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()
diff --git a/metal/paddle-mobile/paddle-mobile/framework/Texture.swift b/metal/paddle-mobile/paddle-mobile/framework/Texture.swift
index d3beb92a5f..c6e8842182 100644
--- a/metal/paddle-mobile/paddle-mobile/framework/Texture.swift
+++ b/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] {
-- 
GitLab