Merge conflicts

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0.0)
 
 option(USE_OPENMP    "build with openmp support" ON)
 option(USE_EXCEPTION "build with exception" ON)
-option(WITH_LOGGING  "print logging for debug" ON)
+option(WITH_LOGGING  "print logging for debug" OFF)
 option(WITH_SYMBOL   "build with all symbols" ON) # turn off if use jni or ios io
 option(WITH_PROFILE  "print op profile for debug" OFF)
 option(WITH_TEST     "build with unit tests" ON)

metal/MobileNetDemo/MobileNetDemo.xcodeproj/project.pbxproj

@@ -15,6 +15,7 @@
 		FCB40E5121E0CEBB0075EC91 /* mobilenet_model in Resources */ = {isa = PBXBuildFile; fileRef = FCB40E4F21E0CEBB0075EC91 /* mobilenet_model */; };
 		FCB40E5221E0CEBB0075EC91 /* mobilenet_params in Resources */ = {isa = PBXBuildFile; fileRef = FCB40E5021E0CEBB0075EC91 /* mobilenet_params */; };
 		FCB40E5421E0CEF80075EC91 /* synset.txt in Resources */ = {isa = PBXBuildFile; fileRef = FCB40E5321E0CEF80075EC91 /* synset.txt */; };
+		FCC15E13221E715400DC3CB2 /* paddle-mobile-metallib.metallib in Resources */ = {isa = PBXBuildFile; fileRef = FCC15E12221E715400DC3CB2 /* paddle-mobile-metallib.metallib */; };
 		FCD3873821E1C31F0052F3D0 /* paddle_mobile.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FCD3873721E1C31F0052F3D0 /* paddle_mobile.framework */; };
 		FCD3873921E1C31F0052F3D0 /* paddle_mobile.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = FCD3873721E1C31F0052F3D0 /* paddle_mobile.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		FCF2870921DFAEC7009A87DA /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = FCF2870821DFAEC7009A87DA /* AppDelegate.swift */; };
@@ -49,6 +50,7 @@
 		FCB40E4F21E0CEBB0075EC91 /* mobilenet_model */ = {isa = PBXFileReference; lastKnownFileType = file; path = mobilenet_model; sourceTree = "<group>"; };
 		FCB40E5021E0CEBB0075EC91 /* mobilenet_params */ = {isa = PBXFileReference; lastKnownFileType = file; path = mobilenet_params; sourceTree = "<group>"; };
 		FCB40E5321E0CEF80075EC91 /* synset.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = synset.txt; sourceTree = "<group>"; };
+		FCC15E12221E715400DC3CB2 /* paddle-mobile-metallib.metallib */ = {isa = PBXFileReference; lastKnownFileType = "archive.metal-library"; name = "paddle-mobile-metallib.metallib"; path = "../../../../Library/Developer/Xcode/DerivedData/paddle-mobile-hdsimtkoxoondndnjczkbkchcwyh/Build/Products/Release-iphoneos/paddle-mobile-metallib.metallib"; sourceTree = "<group>"; };
 		FCD3873721E1C31F0052F3D0 /* paddle_mobile.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = paddle_mobile.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		FCF2870521DFAEC7009A87DA /* MobileNetDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MobileNetDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		FCF2870821DFAEC7009A87DA /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -127,6 +129,7 @@
 		FCF286FC21DFAEC7009A87DA = {
 			isa = PBXGroup;
 			children = (
+				FCC15E12221E715400DC3CB2 /* paddle-mobile-metallib.metallib */,
 				FCD3873721E1C31F0052F3D0 /* paddle_mobile.framework */,
 				FCF2870721DFAEC7009A87DA /* MobileNetDemo */,
 				FCF2870621DFAEC7009A87DA /* Products */,
@@ -225,6 +228,7 @@
 				FCB40E5121E0CEBB0075EC91 /* mobilenet_model in Resources */,
 				FCB40DE921E0B9410075EC91 /* banana.jpeg in Resources */,
 				FCF2871021DFAEC8009A87DA /* Assets.xcassets in Resources */,
+				FCC15E13221E715400DC3CB2 /* paddle-mobile-metallib.metallib in Resources */,
 				FCB40E5421E0CEF80075EC91 /* synset.txt in Resources */,
 				FCB40E5221E0CEBB0075EC91 /* mobilenet_params in Resources */,
 				FCF2870E21DFAEC7009A87DA /* Main.storyboard in Resources */,

metal/MobileNetDemo/MobileNetDemo/AppDelegate.swift

@@ -10,37 +10,37 @@ import UIKit
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
-
-  var window: UIWindow?
-
-
-  func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
-    // Override point for customization after application launch.
-    return true
-  }
-
-  func applicationWillResignActive(_ application: UIApplication) {
-    // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
-    // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
-  }
-
-  func applicationDidEnterBackground(_ application: UIApplication) {
-    // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
-    // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
-  }
-
-  func applicationWillEnterForeground(_ application: UIApplication) {
-    // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
-  }
-
-  func applicationDidBecomeActive(_ application: UIApplication) {
-    // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
-  }
-
-  func applicationWillTerminate(_ application: UIApplication) {
-    // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
-  }
-
-
+    
+    var window: UIWindow?
+    
+    
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+        // Override point for customization after application launch.
+        return true
+    }
+    
+    func applicationWillResignActive(_ application: UIApplication) {
+        // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
+        // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
+    }
+    
+    func applicationDidEnterBackground(_ application: UIApplication) {
+        // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
+        // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
+    }
+    
+    func applicationWillEnterForeground(_ application: UIApplication) {
+        // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
+    }
+    
+    func applicationDidBecomeActive(_ application: UIApplication) {
+        // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
+    }
+    
+    func applicationWillTerminate(_ application: UIApplication) {
+        // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
+    }
+    
+    
 }
 

metal/MobileNetDemo/MobileNetDemo/MobileNet.swift

@@ -16,48 +16,52 @@ import Foundation
 import paddle_mobile
 
 public class MobileNet: Net{
-  class MobilenetPreProccess: CusomKernel {
-    init(device: MTLDevice) {
-      let s = Shape.init(inWidth: 224, inHeight: 224, inChannel: 3)
-      super.init(device: device, inFunctionName: "mobilenet_preprocess", outputDim: s, metalLoadModel: .LoadMetalInDefaultLib, metalLibPath: nil)
+    class MobilenetPreProccess: CusomKernel {
+        init(device: MTLDevice) {
+            let s = Shape.init(inWidth: 224, inHeight: 224, inChannel: 3)
+            super.init(device: device, inFunctionName: "mobilenet_preprocess", outputDim: s, metalLoadModel: .LoadMetalInDefaultLib, metalLibPath: nil)
+        }
     }
-  }
-  
-  class PreWords {
-    var contents: [String] = []
-    init(fileName: String, type: String = "txt", inBundle: Bundle = Bundle.main) {
-      if let filePath = inBundle.path(forResource: fileName, ofType: type) {
-        let string = try! String.init(contentsOfFile: filePath)
-        contents = string.components(separatedBy: CharacterSet.newlines).filter{$0.count > 10}.map{
-          String($0[$0.index($0.startIndex, offsetBy: 10)...])
+    
+    class PreWords {
+        var contents: [String] = []
+        init(fileName: String, type: String = "txt", inBundle: Bundle = Bundle.main) {
+            if let filePath = inBundle.path(forResource: fileName, ofType: type) {
+                let string = try! String.init(contentsOfFile: filePath)
+                contents = string.components(separatedBy: CharacterSet.newlines).filter{$0.count > 10}.map{
+                    String($0[$0.index($0.startIndex, offsetBy: 10)...])
+                }
+            }else{
+                fatalError("no file call \(fileName)")
+            }
+        }
+        subscript(index: Int) -> String {
+            return contents[index]
         }
-      }else{
-        fatalError("no file call \(fileName)")
-      }
     }
-    subscript(index: Int) -> String {
-      return contents[index]
+    
+    let labels = PreWords.init(fileName: "synset")
+    
+    override public func resultStr(res: [ResultHolder]) -> String {
+        let firstRes = res[0]
+        let resPointer = firstRes.result
+        var s: [String] = []
+        (0..<firstRes.capacity).map { resPointer[$0] }.top(r: 5).enumerated().forEach{
+            s.append(String(format: "%d: %@ (%3.2f%%)", $0 + 1, labels[$1.0], $1.1 * 100))
+        }
+        return s.joined(separator: "\n")
     }
-  }
-  
-  let labels = PreWords.init(fileName: "synset")
-  
-  override public func resultStr(res: ResultHolder) -> String {
-    let resPointer = res.result
-    var s: [String] = []
-    (0..<res.capacity).map { resPointer[$0] }.top(r: 5).enumerated().forEach{
-      s.append(String(format: "%d: %@ (%3.2f%%)", $0 + 1, labels[$1.0], $1.1 * 100))
+    
+    override public init(device: MTLDevice) {
+        super.init(device: device)
+        except = 0
+        modelPath = Bundle.main.path(forResource: "mobilenet_model", ofType: nil) ?! "model null"
+        paramPath = Bundle.main.path(forResource: "mobilenet_params", ofType: nil) ?! "para null"
+        preprocessKernel = MobilenetPreProccess.init(device: device)
+        inputDim = Dim.init(inDim: [1, 224, 224, 3])
+        metalLoadMode = .LoadMetalInCustomMetalLib
+        metalLibPath = Bundle.main.path(forResource: "paddle-mobile-metallib", ofType: "metallib")
+        useMPS = true
     }
-    return s.joined(separator: "\n")
-  }
-  
-  override public init(device: MTLDevice) {
-    super.init(device: device)
-    except = 0
-    modelPath = Bundle.main.path(forResource: "mobilenet_model", ofType: nil) ?! "model null"
-    paramPath = Bundle.main.path(forResource: "mobilenet_params", ofType: nil) ?! "para null"
-    preprocessKernel = MobilenetPreProccess.init(device: device)
-    inputDim = Dim.init(inDim: [1, 224, 224, 3])
-  }
 }
 

metal/MobileNetDemo/MobileNetDemo/MobilenetPreProcess.metal

@@ -14,13 +14,13 @@ kernel void mobilenet_preprocess(
                                  texture2d<float, access::write> outTexture [[texture(1)]],
                                  uint2 gid [[thread_position_in_grid]])
 {
-  if (gid.x >= outTexture.get_width() ||
-      gid.y >= outTexture.get_height()) {
-    return;
-  }
-  const auto means = float4(123.68f, 116.78f, 103.94f, 0.0f);
-  const float4 inColor = (inTexture.read(gid) * 255.0 - means) * 0.017;
-  outTexture.write(float4(inColor.z, inColor.y, inColor.x, 0.0f), gid);
+    if (gid.x >= outTexture.get_width() ||
+        gid.y >= outTexture.get_height()) {
+        return;
+    }
+    const auto means = float4(123.68f, 116.78f, 103.94f, 0.0f);
+    const float4 inColor = (inTexture.read(gid) * 255.0 - means) * 0.017;
+    outTexture.write(float4(inColor.z, inColor.y, inColor.x, 0.0f), gid);
 }
 
 kernel void mobilenet_preprocess_half(
@@ -28,11 +28,11 @@ kernel void mobilenet_preprocess_half(
                                       texture2d<half, access::write> outTexture [[texture(1)]],
                                       uint2 gid [[thread_position_in_grid]])
 {
-  if (gid.x >= outTexture.get_width() ||
-      gid.y >= outTexture.get_height()) {
-    return;
-  }
-  const auto means = half4(123.68f, 116.78f, 103.94f, 0.0f);
-  const half4 inColor = (inTexture.read(gid) * 255.0 - means) * 0.017;
-  outTexture.write(half4(inColor.z, inColor.y, inColor.x, 0.0f), gid);
+    if (gid.x >= outTexture.get_width() ||
+        gid.y >= outTexture.get_height()) {
+        return;
+    }
+    const auto means = half4(123.68f, 116.78f, 103.94f, 0.0f);
+    const half4 inColor = (inTexture.read(gid) * 255.0 - means) * 0.017;
+    outTexture.write(half4(inColor.z, inColor.y, inColor.x, 0.0f), gid);
 }

metal/MobileNetDemo/MobileNetDemo/ViewController.swift

@@ -10,84 +10,84 @@ import UIKit
 import paddle_mobile
 
 class ViewController: UIViewController {
-  @IBOutlet weak var resultTextView: UITextView!
-  @IBOutlet weak var selectImageView: UIImageView!
-  @IBOutlet weak var elapsedTimeLabel: UILabel!
-  var net: MobileNet!
-  var runner: Runner!
-  var toPredictTexture: MTLTexture?
-  
-  override func viewDidLoad() {
-    super.viewDidLoad()
-    GlobalConfig.shared.computePrecision = .Float16
-    net = MobileNet.init(device: MetalHelper.shared.device)
-    runner = Runner.init(inNet: net, commandQueue: MetalHelper.shared.queue)
+    @IBOutlet weak var resultTextView: UITextView!
+    @IBOutlet weak var selectImageView: UIImageView!
+    @IBOutlet weak var elapsedTimeLabel: UILabel!
+    var net: MobileNet!
+    var runner: Runner!
+    var toPredictTexture: MTLTexture?
     
-    if let selectImage = UIImage.init(named: "banana.jpeg") {
-      selectImageView.image = selectImage
-      runner.getTexture(image: selectImage.cgImage!) {[weak self] (texture) in
-        self?.toPredictTexture = texture
-      }
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        GlobalConfig.shared.computePrecision = .Float16
+        net = MobileNet.init(device: MetalHelper.shared.device)
+        runner = Runner.init(inNet: net, commandQueue: MetalHelper.shared.queue)
+        
+        if let selectImage = UIImage.init(named: "banana.jpeg") {
+            selectImageView.image = selectImage
+            runner.getTexture(image: selectImage.cgImage!) {[weak self] (texture) in
+                self?.toPredictTexture = texture
+            }
+        }
+        
+    }
+    
+    @IBAction func loadAct(_ sender: Any) {
+        if runner.load() {
+            let resutText = " load success ! "
+            print(resutText)
+            self.resultTextView.text = resutText
+        } else {
+            fatalError(" load error ")
+        }
+    }
+    
+    @IBAction func selectImageAct(_ sender: Any) {
+        let imagePicker = UIImagePickerController()
+        imagePicker.sourceType = .camera
+        imagePicker.delegate = self
+        self.present(imagePicker, animated: true, completion: nil)
     }
     
-  }
-  
-  @IBAction func loadAct(_ sender: Any) {
-    if runner.load() {
-      let resutText = " load success ! "
-      print(resutText)
-      self.resultTextView.text = resutText
-    } else {
-      fatalError(" load error ")
+    @IBAction func clearAct(_ sender: Any) {
+        runner.clear()
     }
-  }
-  
-  @IBAction func selectImageAct(_ sender: Any) {
-    let imagePicker = UIImagePickerController()
-    imagePicker.sourceType = .camera
-    imagePicker.delegate = self
-    self.present(imagePicker, animated: true, completion: nil)
-  }
-  
-  @IBAction func clearAct(_ sender: Any) {
-    runner.clear()
-  }
-  
-  @IBAction func predictAct(_ sender: Any) {
     
-    if let texture = toPredictTexture {
-      let beginDate = Date.init()
-      runner.predict(texture: texture) { [weak self] (success, resultHolder) in
-        if success, let inResultHolder = resultHolder {
-          let timeUse = Date.init().timeIntervalSince(beginDate)
-          DispatchQueue.main.async {
-            self?.elapsedTimeLabel.text = "\(timeUse * 1000)ms"
-            self?.resultTextView.text = self?.net.resultStr(res: inResultHolder)
-          }
-          
+    @IBAction func predictAct(_ sender: Any) {
+        
+        if let texture = toPredictTexture {
+            let beginDate = Date.init()
+            runner.predict(texture: texture) { [weak self] (success, resultHolder) in
+                if success, let inResultHolder = resultHolder {
+                    let timeUse = Date.init().timeIntervalSince(beginDate)
+                    DispatchQueue.main.async {
+                        self?.elapsedTimeLabel.text = "\(timeUse * 1000)ms"
+                        self?.resultTextView.text = self?.net.resultStr(res: inResultHolder)
+                    }
+                    
+                } else {
+                    print(" predict fail ")
+                }
+            }
         } else {
-          print(" predict fail ")
+            print(" toPredictTexture is nil ")
         }
-      }
-    } else {
-      print(" toPredictTexture is nil ")
+        
     }
     
-  }
-  
 }
 
 extension ViewController:  UIImagePickerControllerDelegate, UINavigationControllerDelegate {
-  func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [String : Any]) {
-    picker.dismiss(animated: true){[weak self] in
-      guard let sSelf = self, let image =  info["UIImagePickerControllerOriginalImage"] as? UIImage else {
-        fatalError("no image")
-      }
-      sSelf.selectImageView.image = image
-      sSelf.runner.getTexture(image: image.cgImage!, getTexture: { (texture) in
-        sSelf.toPredictTexture = texture
-      })
+    func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [String : Any]) {
+        picker.dismiss(animated: true){[weak self] in
+            guard let sSelf = self, let image =  info["UIImagePickerControllerOriginalImage"] as? UIImage else {
+                fatalError("no image")
+            }
+            sSelf.selectImageView.image = image
+            sSelf.runner.getTexture(image: image.cgImage!, getTexture: { (texture) in
+                sSelf.toPredictTexture = texture
+            })
+        }
     }
-  }
 }
 

metal/Podfile

@@ -27,3 +27,8 @@ target 'MobileNetDemo' do
     pod 'Protobuf', '~> 3.0.0'
 end
 
+
+target 'paddle-mobile-metallib' do
+    project 'paddle-mobile-metallib/paddle-mobile-metallib.xcodeproj'
+end
+

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

@@ -33,8 +33,6 @@
 		FC5E03B221DCE8D90016C137 /* mingren_input_data in Resources */ = {isa = PBXBuildFile; fileRef = FC5E03B121DCE8D90016C137 /* mingren_input_data */; };
 		FC704C1921D2375300F98BAB /* super_params in Resources */ = {isa = PBXBuildFile; fileRef = FC704C1721D2375300F98BAB /* super_params */; };
 		FC704C1A21D2375300F98BAB /* super_model in Resources */ = {isa = PBXBuildFile; fileRef = FC704C1821D2375300F98BAB /* super_model */; };
-		FC704C2221D237FC00F98BAB /* combined_mobilenet_params in Resources */ = {isa = PBXBuildFile; fileRef = FC704C1D21D237FC00F98BAB /* combined_mobilenet_params */; };
-		FC704C2321D237FC00F98BAB /* combined_mobilenet_model in Resources */ = {isa = PBXBuildFile; fileRef = FC704C1E21D237FC00F98BAB /* combined_mobilenet_model */; };
 		FC704C2421D237FC00F98BAB /* yolo_params in Resources */ = {isa = PBXBuildFile; fileRef = FC704C2021D237FC00F98BAB /* yolo_params */; };
 		FC704C2521D237FC00F98BAB /* yolo_model in Resources */ = {isa = PBXBuildFile; fileRef = FC704C2121D237FC00F98BAB /* yolo_model */; };
 		FC803BCD214D27930094B8E5 /* FPSCounter.swift in Sources */ = {isa = PBXBuildFile; fileRef = FC803BCB214D27920094B8E5 /* FPSCounter.swift */; };
@@ -44,11 +42,18 @@
 		FC9797C321D608E000F2FD90 /* mobilenet_params in Resources */ = {isa = PBXBuildFile; fileRef = FC9797C121D608DF00F2FD90 /* mobilenet_params */; };
 		FC9797C721D609FB00F2FD90 /* synset.txt in Resources */ = {isa = PBXBuildFile; fileRef = FC9797C621D609FB00F2FD90 /* synset.txt */; };
 		FC9797CF21D6506F00F2FD90 /* mingren.jpg in Resources */ = {isa = PBXBuildFile; fileRef = FC9797CE21D6506F00F2FD90 /* mingren.jpg */; };
+		FCAFD84B2231614200496A36 /* yolo_16_param in Resources */ = {isa = PBXBuildFile; fileRef = FCAFD8492231614200496A36 /* yolo_16_param */; };
+		FCAFD84C2231614200496A36 /* yolo_16_model in Resources */ = {isa = PBXBuildFile; fileRef = FCAFD84A2231614200496A36 /* yolo_16_model */; };
 		FCBCCC552122EF5500D94F7E /* MetalHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = FCBCCC542122EF5400D94F7E /* MetalHelper.swift */; };
+		FCC15E15221E716500DC3CB2 /* paddle-mobile-metallib.metallib in Resources */ = {isa = PBXBuildFile; fileRef = FCC15E14221E716400DC3CB2 /* paddle-mobile-metallib.metallib */; };
 		FCCED60521D7646E00BE8D5F /* test_image_super in Resources */ = {isa = PBXBuildFile; fileRef = FCCED60421D7646E00BE8D5F /* test_image_super */; };
+		FCE834AE2232A4AE0057BF43 /* combined_mobilenet_params in Resources */ = {isa = PBXBuildFile; fileRef = FCE834AC2232A4AE0057BF43 /* combined_mobilenet_params */; };
+		FCE834AF2232A4AE0057BF43 /* combined_mobilenet_model in Resources */ = {isa = PBXBuildFile; fileRef = FCE834AD2232A4AE0057BF43 /* combined_mobilenet_model */; };
+		FCE834B12232B6DC0057BF43 /* vision_synset.txt in Resources */ = {isa = PBXBuildFile; fileRef = FCE834B02232B6DC0057BF43 /* vision_synset.txt */; };
 		FCEBEC2C20E1391F00C0B14D /* paddle_mobile.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FCEBEC2B20E1391F00C0B14D /* paddle_mobile.framework */; };
 		FCEBEC2D20E1391F00C0B14D /* paddle_mobile.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = FCEBEC2B20E1391F00C0B14D /* paddle_mobile.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		FCF437E8214B6DDB00943429 /* MultiPredictViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FCF437E7214B6DDB00943429 /* MultiPredictViewController.swift */; };
+		FCFADE34222F63CC0037DCE8 /* test_big.JPG in Resources */ = {isa = PBXBuildFile; fileRef = FCFADE33222F63CB0037DCE8 /* test_big.JPG */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -101,8 +106,6 @@
 		FC5E03B121DCE8D90016C137 /* mingren_input_data */ = {isa = PBXFileReference; lastKnownFileType = file; path = mingren_input_data; sourceTree = "<group>"; };
 		FC704C1721D2375300F98BAB /* super_params */ = {isa = PBXFileReference; lastKnownFileType = file; path = super_params; sourceTree = "<group>"; };
 		FC704C1821D2375300F98BAB /* super_model */ = {isa = PBXFileReference; lastKnownFileType = file; path = super_model; sourceTree = "<group>"; };
-		FC704C1D21D237FC00F98BAB /* combined_mobilenet_params */ = {isa = PBXFileReference; lastKnownFileType = file; path = combined_mobilenet_params; sourceTree = "<group>"; };
-		FC704C1E21D237FC00F98BAB /* combined_mobilenet_model */ = {isa = PBXFileReference; lastKnownFileType = file; path = combined_mobilenet_model; sourceTree = "<group>"; };
 		FC704C2021D237FC00F98BAB /* yolo_params */ = {isa = PBXFileReference; lastKnownFileType = file; path = yolo_params; sourceTree = "<group>"; };
 		FC704C2121D237FC00F98BAB /* yolo_model */ = {isa = PBXFileReference; lastKnownFileType = file; path = yolo_model; sourceTree = "<group>"; };
 		FC803BCB214D27920094B8E5 /* FPSCounter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FPSCounter.swift; sourceTree = "<group>"; };
@@ -112,10 +115,17 @@
 		FC9797C121D608DF00F2FD90 /* mobilenet_params */ = {isa = PBXFileReference; lastKnownFileType = file; path = mobilenet_params; sourceTree = "<group>"; };
 		FC9797C621D609FB00F2FD90 /* synset.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = synset.txt; sourceTree = "<group>"; };
 		FC9797CE21D6506F00F2FD90 /* mingren.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = mingren.jpg; sourceTree = "<group>"; };
+		FCAFD8492231614200496A36 /* yolo_16_param */ = {isa = PBXFileReference; lastKnownFileType = file; path = yolo_16_param; sourceTree = "<group>"; };
+		FCAFD84A2231614200496A36 /* yolo_16_model */ = {isa = PBXFileReference; lastKnownFileType = file; path = yolo_16_model; sourceTree = "<group>"; };
 		FCBCCC542122EF5400D94F7E /* MetalHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MetalHelper.swift; sourceTree = "<group>"; };
+		FCC15E14221E716400DC3CB2 /* paddle-mobile-metallib.metallib */ = {isa = PBXFileReference; lastKnownFileType = "archive.metal-library"; name = "paddle-mobile-metallib.metallib"; path = "../../../../Library/Developer/Xcode/DerivedData/paddle-mobile-hdsimtkoxoondndnjczkbkchcwyh/Build/Products/Release-iphoneos/paddle-mobile-metallib.metallib"; sourceTree = "<group>"; };
 		FCCED60421D7646E00BE8D5F /* test_image_super */ = {isa = PBXFileReference; lastKnownFileType = file; path = test_image_super; sourceTree = "<group>"; };
+		FCE834AC2232A4AE0057BF43 /* combined_mobilenet_params */ = {isa = PBXFileReference; lastKnownFileType = file; path = combined_mobilenet_params; sourceTree = "<group>"; };
+		FCE834AD2232A4AE0057BF43 /* combined_mobilenet_model */ = {isa = PBXFileReference; lastKnownFileType = file; path = combined_mobilenet_model; sourceTree = "<group>"; };
+		FCE834B02232B6DC0057BF43 /* vision_synset.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = vision_synset.txt; sourceTree = "<group>"; };
 		FCEBEC2B20E1391F00C0B14D /* paddle_mobile.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = paddle_mobile.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		FCF437E7214B6DDB00943429 /* MultiPredictViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultiPredictViewController.swift; sourceTree = "<group>"; };
+		FCFADE33222F63CB0037DCE8 /* test_big.JPG */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = test_big.JPG; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -153,6 +163,7 @@
 		FC039B7520E11C550081E9F8 = {
 			isa = PBXGroup;
 			children = (
+				FCC15E14221E716400DC3CB2 /* paddle-mobile-metallib.metallib */,
 				FCEBEC2B20E1391F00C0B14D /* paddle_mobile.framework */,
 				FC039B8020E11C550081E9F8 /* paddle-mobile-demo */,
 				FC039B7F20E11C550081E9F8 /* Products */,
@@ -193,6 +204,7 @@
 		FC203FA821CBFDBA00B37166 /* images */ = {
 			isa = PBXGroup;
 			children = (
+				FCFADE33222F63CB0037DCE8 /* test_big.JPG */,
 				FC2BFCBF21DF279900C262B2 /* classify-img-output.png */,
 				FC2BFCBD21DF15D900C262B2 /* 123.jpg */,
 				FC2BFCBB21DF0A8600C262B2 /* 00001.jpg */,
@@ -257,21 +269,13 @@
 		FC704C1B21D237FC00F98BAB /* vision_model */ = {
 			isa = PBXGroup;
 			children = (
-				FC704C1C21D237FC00F98BAB /* mobilenet */,
+				FCE834AB2232A4AE0057BF43 /* vision_mobilenet */,
+				FCAFD8482231614200496A36 /* yolo_16 */,
 				FC704C1F21D237FC00F98BAB /* yolo */,
 			);
 			path = vision_model;
 			sourceTree = "<group>";
 		};
-		FC704C1C21D237FC00F98BAB /* mobilenet */ = {
-			isa = PBXGroup;
-			children = (
-				FC704C1D21D237FC00F98BAB /* combined_mobilenet_params */,
-				FC704C1E21D237FC00F98BAB /* combined_mobilenet_model */,
-			);
-			path = mobilenet;
-			sourceTree = "<group>";
-		};
 		FC704C1F21D237FC00F98BAB /* yolo */ = {
 			isa = PBXGroup;
 			children = (
@@ -316,6 +320,25 @@
 			path = mobilenet;
 			sourceTree = "<group>";
 		};
+		FCAFD8482231614200496A36 /* yolo_16 */ = {
+			isa = PBXGroup;
+			children = (
+				FCAFD8492231614200496A36 /* yolo_16_param */,
+				FCAFD84A2231614200496A36 /* yolo_16_model */,
+			);
+			path = yolo_16;
+			sourceTree = "<group>";
+		};
+		FCE834AB2232A4AE0057BF43 /* vision_mobilenet */ = {
+			isa = PBXGroup;
+			children = (
+				FCE834B02232B6DC0057BF43 /* vision_synset.txt */,
+				FCE834AC2232A4AE0057BF43 /* combined_mobilenet_params */,
+				FCE834AD2232A4AE0057BF43 /* combined_mobilenet_model */,
+			);
+			path = vision_mobilenet;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -381,20 +404,25 @@
 				FCCED60521D7646E00BE8D5F /* test_image_super in Resources */,
 				FC039B8C20E11C560081E9F8 /* LaunchScreen.storyboard in Resources */,
 				FC9797CF21D6506F00F2FD90 /* mingren.jpg in Resources */,
-				FC704C2221D237FC00F98BAB /* combined_mobilenet_params in Resources */,
+				FCAFD84B2231614200496A36 /* yolo_16_param in Resources */,
+				FCE834AF2232A4AE0057BF43 /* combined_mobilenet_model in Resources */,
 				FC704C1921D2375300F98BAB /* super_params in Resources */,
 				FC2BFCBE21DF15D900C262B2 /* 123.jpg in Resources */,
 				FC039B8920E11C560081E9F8 /* Assets.xcassets in Resources */,
 				FC9797C721D609FB00F2FD90 /* synset.txt in Resources */,
+				FCFADE34222F63CC0037DCE8 /* test_big.JPG in Resources */,
 				FC5E03B221DCE8D90016C137 /* mingren_input_data in Resources */,
 				FC704C1A21D2375300F98BAB /* super_model in Resources */,
 				FC039B8720E11C550081E9F8 /* Main.storyboard in Resources */,
+				FCE834B12232B6DC0057BF43 /* vision_synset.txt in Resources */,
 				FC9797C221D608E000F2FD90 /* mobilenet_model in Resources */,
+				FCAFD84C2231614200496A36 /* yolo_16_model in Resources */,
 				FC2BFCC021DF279900C262B2 /* classify-img-output.png in Resources */,
 				FC203FB221CBFDBA00B37166 /* test.jpg in Resources */,
-				FC704C2321D237FC00F98BAB /* combined_mobilenet_model in Resources */,
+				FCC15E15221E716500DC3CB2 /* paddle-mobile-metallib.metallib in Resources */,
 				FC9797C321D608E000F2FD90 /* mobilenet_params in Resources */,
 				FC704C2421D237FC00F98BAB /* yolo_params in Resources */,
+				FCE834AE2232A4AE0057BF43 /* combined_mobilenet_params in Resources */,
 				FC2BFCBC21DF0A8600C262B2 /* 00001.jpg in Resources */,
 				FC9797BE21D6045B00F2FD90 /* banana.jpeg in Resources */,
 				FC704C2521D237FC00F98BAB /* yolo_model in Resources */,

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

@@ -16,36 +16,36 @@ import UIKit
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
-
+    
     var window: UIWindow?
-
+    
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         return true
     }
-
+    
     func applicationWillResignActive(_ application: UIApplication) {
         // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
         // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
     }
-
+    
     func applicationDidEnterBackground(_ application: UIApplication) {
         // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
         // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
     }
-
+    
     func applicationWillEnterForeground(_ application: UIApplication) {
         // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
     }
-
+    
     func applicationDidBecomeActive(_ application: UIApplication) {
         // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
     }
-
+    
     func applicationWillTerminate(_ application: UIApplication) {
         // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
     }
-
-
+    
+    
 }
 

metal/paddle-mobile-demo/paddle-mobile-demo/Assets.xcassets/paddle-mobile.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "paddle-mobile.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

metal/paddle-mobile-demo/paddle-mobile-demo/Base.lproj/Main.storyboard

@@ -155,7 +155,7 @@
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="paddle-mobile.png" translatesAutoresizingMaskIntoConstraints="NO" id="4ey-Xr-U4e">
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="paddle-mobile" translatesAutoresizingMaskIntoConstraints="NO" id="4ey-Xr-U4e">
                                 <rect key="frame" x="90" y="637" width="195" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="4ey-Xr-U4e" secondAttribute="height" multiplier="6.5:1" id="8c5-FF-lB9"/>
@@ -246,10 +246,6 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2p5-S3-M4T">
-                                <rect key="frame" x="16" y="63" width="240" height="128"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            </imageView>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="37q-nm-0H7">
                                 <rect key="frame" x="38" y="610" width="42" height="30"/>
                                 <constraints>
@@ -287,7 +283,16 @@
                                     <constraint firstAttribute="height" constant="30" id="eAt-Uc-BxX"/>
                                 </constraints>
                                 <state key="normal" title="clear"/>
+                                <connections>
+                                    <action selector="clear:" destination="4MS-jc-i6A" eventType="touchUpInside" id="yW8-Dq-qwU"/>
+                                </connections>
                             </button>
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="2p5-S3-M4T">
+                                <rect key="frame" x="0.0" y="20" width="375" height="211"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" secondItem="2p5-S3-M4T" secondAttribute="height" multiplier="16:9" id="9Gh-8L-t3g"/>
+                                </constraints>
+                            </imageView>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
@@ -295,20 +300,26 @@
                             <constraint firstItem="DZa-sd-lY7" firstAttribute="leading" secondItem="pdS-6e-Pd1" secondAttribute="trailing" constant="45" id="8dB-uI-cs9"/>
                             <constraint firstItem="fAg-ai-yaA" firstAttribute="leading" secondItem="37q-nm-0H7" secondAttribute="trailing" constant="39" id="EAV-Oq-jeD"/>
                             <constraint firstItem="vsb-FH-h7h" firstAttribute="bottom" secondItem="fAg-ai-yaA" secondAttribute="bottom" constant="27" id="Px0-A9-Eql"/>
+                            <constraint firstItem="2p5-S3-M4T" firstAttribute="leading" secondItem="vsb-FH-h7h" secondAttribute="leading" id="RNx-6D-oix"/>
                             <constraint firstItem="pdS-6e-Pd1" firstAttribute="leading" secondItem="fAg-ai-yaA" secondAttribute="trailing" constant="32" id="ZUR-Nv-aNb"/>
+                            <constraint firstItem="2p5-S3-M4T" firstAttribute="top" secondItem="vsb-FH-h7h" secondAttribute="top" id="atk-ma-aSA"/>
                             <constraint firstItem="vsb-FH-h7h" firstAttribute="bottom" secondItem="pdS-6e-Pd1" secondAttribute="bottom" constant="27" id="kPx-mt-ab9"/>
+                            <constraint firstItem="2p5-S3-M4T" firstAttribute="trailing" secondItem="vsb-FH-h7h" secondAttribute="trailing" id="mwX-bu-jJY"/>
                             <constraint firstItem="37q-nm-0H7" firstAttribute="leading" secondItem="vsb-FH-h7h" secondAttribute="leading" constant="38" id="trH-Fq-sSv"/>
                             <constraint firstItem="vsb-FH-h7h" firstAttribute="bottom" secondItem="DZa-sd-lY7" secondAttribute="bottom" constant="27" id="yNJ-hq-2Qg"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="vsb-FH-h7h"/>
                     </view>
+                    <connections>
+                        <outlet property="imageView" destination="2p5-S3-M4T" id="ePO-1L-eb4"/>
+                    </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="hGb-Pb-icS" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-721" y="-427"/>
+            <point key="canvasLocation" x="-135.19999999999999" y="-218.1409295352324"/>
         </scene>
     </scenes>
     <resources>
-        <image name="paddle-mobile.png" width="402" height="62"/>
+        <image name="paddle-mobile" width="402" height="62"/>
     </resources>
 </document>

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

@@ -17,14 +17,15 @@ import MetalKit
 import Foundation
 import paddle_mobile
 
-public class MetalHelper {
-  let device: MTLDevice
-  let queue: MTLCommandQueue
-  let textureLoader: MTKTextureLoader
-  static let shared: MetalHelper = MetalHelper.init()
-  private init(){
-    device = MTLCreateSystemDefaultDevice()!
-    queue = device.makeCommandQueue()!
-    textureLoader = MTKTextureLoader.init(device: device)
-  }
+@objc public class MetalHelper: NSObject {
+    @objc let device: MTLDevice
+    @objc let queue: MTLCommandQueue
+    @objc let textureLoader: MTKTextureLoader
+    @objc static let shared: MetalHelper = MetalHelper.init()
+    private override init(){
+        device = MTLCreateSystemDefaultDevice()!
+        queue = device.makeCommandQueue()!
+        textureLoader = MTKTextureLoader.init(device: device)
+        super.init()
+    }
 }

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

@@ -16,51 +16,51 @@ import UIKit
 import paddle_mobile
 
 class MultiPredictViewController: UIViewController {
-  var runner1: Runner!
-  var runner2: Runner!
-  override func viewDidLoad() {
-    super.viewDidLoad()
-    let mobileNet = MobileNet_ssd_hand.init(device: MetalHelper.shared.device)
-    let genet = Genet.init(device: MetalHelper.shared.device)
-    runner1 = Runner.init(inNet: mobileNet, commandQueue: MetalHelper.shared.queue)
-    let queue2 = MetalHelper.shared.device.makeCommandQueue()
+    var runner1: Runner!
+    var runner2: Runner!
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        let mobileNet = MobileNet_ssd_hand.init(device: MetalHelper.shared.device)
+        let genet = Genet.init(device: MetalHelper.shared.device)
+        runner1 = Runner.init(inNet: mobileNet, commandQueue: MetalHelper.shared.queue)
+        let queue2 = MetalHelper.shared.device.makeCommandQueue()
+        
+        runner2 = Runner.init(inNet: genet, commandQueue: MetalHelper.shared.queue)
+    }
     
-    runner2 = Runner.init(inNet: genet, commandQueue: MetalHelper.shared.queue)
-  }
-
-  @IBAction func predictAct(_ sender: Any) {
-    let success = self.runner2.load()
-//    DispatchQueue.global().async {
-      let image1 = UIImage.init(named: "hand.jpg")
-//      let success = self.runner2.load()
-//      if success {
-//        for i in 0..<10000 {
-//          print(i)
-//          self.runner2.predict(cgImage: image1!.cgImage!, completion: { (success, res) in
-//            print("result1: ")
-////            print(res)
-//          })
-//        }
-//      } else {
-//        print("load failed")
-//      }
-//      self.runner1.clear()
-//    }
-//    return
-//    DispatchQueue.global().async {
-////      sleep(1)
-//      let image1 = UIImage.init(named: "banana.jpeg")
-////      if success {
-//        for _ in 0..<10 {
-//          self.runner2.predict(cgImage: image1!.cgImage!, completion: { (success, res) in
-//            print("result2: ")
-//            print(res)
-//          })
-//        }
-////      } else {
-////        print("load failed")
-////      }
-////      self.runner2.clear()
-//    }
-  }
+    @IBAction func predictAct(_ sender: Any) {
+        let success = self.runner2.load()
+        //    DispatchQueue.global().async {
+        let image1 = UIImage.init(named: "hand.jpg")
+        //      let success = self.runner2.load()
+        //      if success {
+        //        for i in 0..<10000 {
+        //          print(i)
+        //          self.runner2.predict(cgImage: image1!.cgImage!, completion: { (success, res) in
+        //            print("result1: ")
+        ////            print(res)
+        //          })
+        //        }
+        //      } else {
+        //        print("load failed")
+        //      }
+        //      self.runner1.clear()
+        //    }
+        //    return
+        //    DispatchQueue.global().async {
+        ////      sleep(1)
+        //      let image1 = UIImage.init(named: "banana.jpeg")
+        ////      if success {
+        //        for _ in 0..<10 {
+        //          self.runner2.predict(cgImage: image1!.cgImage!, completion: { (success, res) in
+        //            print("result2: ")
+        //            print(res)
+        //          })
+        //        }
+        ////      } else {
+        ////        print("load failed")
+        ////      }
+        ////      self.runner2.clear()
+        //    }
+    }
 }

metal/paddle-mobile-demo/paddle-mobile-demo/Net/CPUCompute.mm

@@ -20,30 +20,30 @@
 #import <algorithm>
 
 struct NMSParam {
-  
-  float *score_data;
-  
-  float *box_data;
-  
-  float *output;
-  
-  int output_size;
-  
-  std::vector<int> score_dim;
-  
-  std::vector<int> box_dim;
-  
-  float scoreThredshold;
-  
-  int nmsTopK;
-  
-  int keepTopK;
-  
-  float nmsEta;
-  
-  float nmsThreshold;
-  
-  int background_label;
+    
+    float *score_data;
+    
+    float *box_data;
+    
+    float *output;
+    
+    int output_size;
+    
+    std::vector<int> score_dim;
+    
+    std::vector<int> box_dim;
+    
+    float scoreThredshold;
+    
+    int nmsTopK;
+    
+    int keepTopK;
+    
+    float nmsEta;
+    
+    float nmsThreshold;
+    
+    int background_label;
 };
 
 
@@ -53,63 +53,63 @@ constexpr int kBBoxSize = 4;
 template <class T>
 bool SortScorePairDescend(const std::pair<float, T>& pair1,
                           const std::pair<float, T>& pair2) {
-  return pair1.first > pair2.first;
+    return pair1.first > pair2.first;
 }
 
 template <class T>
 static inline void GetMaxScoreIndex(
                                     const std::vector<T>& scores, const T threshold, int top_k,
                                     std::vector<std::pair<T, int>>* sorted_indices) {
-  for (size_t i = 0; i < scores.size(); ++i) {
-    if (scores[i] > threshold) {
-      sorted_indices->push_back(std::make_pair(scores[i], i));
+    for (size_t i = 0; i < scores.size(); ++i) {
+        if (scores[i] > threshold) {
+            sorted_indices->push_back(std::make_pair(scores[i], i));
+        }
+    }
+    // Sort the score pair according to the scores in descending order
+    std::stable_sort(sorted_indices->begin(), sorted_indices->end(),
+                     SortScorePairDescend<int>);
+    // Keep top_k scores if needed.
+    if (top_k > -1 && top_k < static_cast<int>(sorted_indices->size())) {
+        sorted_indices->resize(top_k);
     }
-  }
-  // Sort the score pair according to the scores in descending order
-  std::stable_sort(sorted_indices->begin(), sorted_indices->end(),
-                   SortScorePairDescend<int>);
-  // Keep top_k scores if needed.
-  if (top_k > -1 && top_k < static_cast<int>(sorted_indices->size())) {
-    sorted_indices->resize(top_k);
-  }
 }
 
 template <class T>
 static inline T BBoxArea(const T* box, const bool normalized) {
-  if (box[2] < box[0] || box[3] < box[1]) {
-    // If coordinate values are is invalid
-    // (e.g. xmax < xmin or ymax < ymin), return 0.
-    return static_cast<T>(0.);
-  } else {
-    const T w = box[2] - box[0];
-    const T h = box[3] - box[1];
-    if (normalized) {
-      return w * h;
+    if (box[2] < box[0] || box[3] < box[1]) {
+        // If coordinate values are is invalid
+        // (e.g. xmax < xmin or ymax < ymin), return 0.
+        return static_cast<T>(0.);
     } else {
-      // If coordinate values are not within range [0, 1].
-      return (w + 1) * (h + 1);
+        const T w = box[2] - box[0];
+        const T h = box[3] - box[1];
+        if (normalized) {
+            return w * h;
+        } else {
+            // If coordinate values are not within range [0, 1].
+            return (w + 1) * (h + 1);
+        }
     }
-  }
 }
 
 template <class T>
 static inline T JaccardOverlap(const T* box1, const T* box2,
                                const bool normalized) {
-  if (box2[0] > box1[2] || box2[2] < box1[0] || box2[1] > box1[3] ||
-      box2[3] < box1[1]) {
-    return static_cast<T>(0.);
-  } else {
-    const T inter_xmin = std::max(box1[0], box2[0]);
-    const T inter_ymin = std::max(box1[1], box2[1]);
-    const T inter_xmax = std::min(box1[2], box2[2]);
-    const T inter_ymax = std::min(box1[3], box2[3]);
-    const T inter_w = inter_xmax - inter_xmin;
-    const T inter_h = inter_ymax - inter_ymin;
-    const T inter_area = inter_w * inter_h;
-    const T bbox1_area = BBoxArea<T>(box1, normalized);
-    const T bbox2_area = BBoxArea<T>(box2, normalized);
-    return inter_area / (bbox1_area + bbox2_area - inter_area);
-  }
+    if (box2[0] > box1[2] || box2[2] < box1[0] || box2[1] > box1[3] ||
+        box2[3] < box1[1]) {
+        return static_cast<T>(0.);
+    } else {
+        const T inter_xmin = std::max(box1[0], box2[0]);
+        const T inter_ymin = std::max(box1[1], box2[1]);
+        const T inter_xmax = std::min(box1[2], box2[2]);
+        const T inter_ymax = std::min(box1[3], box2[3]);
+        const T inter_w = inter_xmax - inter_xmin;
+        const T inter_h = inter_ymax - inter_ymin;
+        const T inter_area = inter_w * inter_h;
+        const T bbox1_area = BBoxArea<T>(box1, normalized);
+        const T bbox2_area = BBoxArea<T>(box2, normalized);
+        return inter_area / (bbox1_area + bbox2_area - inter_area);
+    }
 }
 
 template <typename T>
@@ -120,40 +120,40 @@ static inline void NMSFast(
                            const T score_threshold, const T nms_threshold,
                            const T eta, const int top_k,
                            std::vector<int>* selected_indices) {
-  // The total boxes for each instance.
-  int num_boxes = bbox_dim[0];
-  // 4: [xmin ymin xmax ymax]
-  int box_size = bbox_dim[1];
-
-  std::vector<T> scores_data(num_boxes);
-  std::copy_n(score_data, num_boxes, scores_data.begin());
-  std::vector<std::pair<T, int>> sorted_indices;
-  GetMaxScoreIndex(scores_data, score_threshold, top_k, &sorted_indices);
-
-  selected_indices->clear();
-  T adaptive_threshold = nms_threshold;
-
-  while (sorted_indices.size() != 0) {
-    const int idx = sorted_indices.front().second;
-    bool keep = true;
-    for (size_t k = 0; k < selected_indices->size(); ++k) {
-      if (keep) {
-        const int kept_idx = (*selected_indices)[k];
-        T overlap = JaccardOverlap<T>(bbox_data + idx * box_size,
-                                      bbox_data + kept_idx * box_size, true);
-        keep = overlap <= adaptive_threshold;
-      } else {
-        break;
-      }
-    }
-    if (keep) {
-      selected_indices->push_back(idx);
-    }
-    sorted_indices.erase(sorted_indices.begin());
-    if (keep && eta < 1 && adaptive_threshold > 0.5) {
-      adaptive_threshold *= eta;
+    // The total boxes for each instance.
+    int num_boxes = bbox_dim[0];
+    // 4: [xmin ymin xmax ymax]
+    int box_size = bbox_dim[1];
+    
+    std::vector<T> scores_data(num_boxes);
+    std::copy_n(score_data, num_boxes, scores_data.begin());
+    std::vector<std::pair<T, int>> sorted_indices;
+    GetMaxScoreIndex(scores_data, score_threshold, top_k, &sorted_indices);
+    
+    selected_indices->clear();
+    T adaptive_threshold = nms_threshold;
+    
+    while (sorted_indices.size() != 0) {
+        const int idx = sorted_indices.front().second;
+        bool keep = true;
+        for (size_t k = 0; k < selected_indices->size(); ++k) {
+            if (keep) {
+                const int kept_idx = (*selected_indices)[k];
+                T overlap = JaccardOverlap<T>(bbox_data + idx * box_size,
+                                              bbox_data + kept_idx * box_size, true);
+                keep = overlap <= adaptive_threshold;
+            } else {
+                break;
+            }
+        }
+        if (keep) {
+            selected_indices->push_back(idx);
+        }
+        sorted_indices.erase(sorted_indices.begin());
+        if (keep && eta < 1 && adaptive_threshold > 0.5) {
+            adaptive_threshold *= eta;
+        }
     }
-  }
 }
 
 template <typename T>
@@ -165,48 +165,48 @@ void MultiClassNMS(const T *boxes_data,
                    const int& background_label, const int& nms_top_k,
                    const int& keep_top_k, const T& nms_threshold,
                    const T& nms_eta, const T& score_threshold) {
-  
-  int64_t class_num = score_dim[0];
-  int64_t predict_dim = score_dim[1];
-  int num_det = 0;
-  for (int c = 0; c < class_num; ++c) {
-    if (c == background_label) continue;
-    const T *score_data = scores_data + c * predict_dim;
     
-    /// [c] is key
-    NMSFast<T>(boxes_data, box_dim, score_data, score_threshold, nms_threshold, nms_eta,
+    int64_t class_num = score_dim[0];
+    int64_t predict_dim = score_dim[1];
+    int num_det = 0;
+    for (int c = 0; c < class_num; ++c) {
+        if (c == background_label) continue;
+        const T *score_data = scores_data + c * predict_dim;
+        
+        /// [c] is key
+        NMSFast<T>(boxes_data, box_dim, score_data, score_threshold, nms_threshold, nms_eta,
                    nms_top_k, &((*indices)[c]));
-    num_det += (*indices)[c].size();
-  }
-
-  *num_nmsed_out = num_det;
-  if (keep_top_k > -1 && num_det > keep_top_k) {
-    std::vector<std::pair<T, std::pair<int, int>>> score_index_pairs;
-    for (const auto& it : *indices) {
-      int label = it.first;
-      const T* sdata = scores_data + label * predict_dim;
-      const std::vector<int>& label_indices = it.second;
-      for (size_t j = 0; j < label_indices.size(); ++j) {
-        int idx = label_indices[j];
-        // PADDLE_ENFORCE_LT(idx, predict_dim);
-        score_index_pairs.push_back(std::make_pair(sdata[idx], std::make_pair(label, idx)));
-      }
+        num_det += (*indices)[c].size();
     }
-    // Keep top k results per image.
-    std::stable_sort(score_index_pairs.begin(), score_index_pairs.end(),
-                     SortScorePairDescend<std::pair<int, int>>);
-    score_index_pairs.resize(keep_top_k);
-
-    // Store the new indices.
-    std::map<int, std::vector<int>> new_indices;
-    for (size_t j = 0; j < score_index_pairs.size(); ++j) {
-      int label = score_index_pairs[j].second.first;
-      int idx = score_index_pairs[j].second.second;
-      new_indices[label].push_back(idx);
+    
+    *num_nmsed_out = num_det;
+    if (keep_top_k > -1 && num_det > keep_top_k) {
+        std::vector<std::pair<T, std::pair<int, int>>> score_index_pairs;
+        for (const auto& it : *indices) {
+            int label = it.first;
+            const T* sdata = scores_data + label * predict_dim;
+            const std::vector<int>& label_indices = it.second;
+            for (size_t j = 0; j < label_indices.size(); ++j) {
+                int idx = label_indices[j];
+                // PADDLE_ENFORCE_LT(idx, predict_dim);
+                score_index_pairs.push_back(std::make_pair(sdata[idx], std::make_pair(label, idx)));
+            }
+        }
+        // Keep top k results per image.
+        std::stable_sort(score_index_pairs.begin(), score_index_pairs.end(),
+                         SortScorePairDescend<std::pair<int, int>>);
+        score_index_pairs.resize(keep_top_k);
+        
+        // Store the new indices.
+        std::map<int, std::vector<int>> new_indices;
+        for (size_t j = 0; j < score_index_pairs.size(); ++j) {
+            int label = score_index_pairs[j].second.first;
+            int idx = score_index_pairs[j].second.second;
+            new_indices[label].push_back(idx);
+        }
+        new_indices.swap(*indices);
+        *num_nmsed_out = keep_top_k;
     }
-    new_indices.swap(*indices);
-    *num_nmsed_out = keep_top_k;
-  }
 }
 
 template <typename T>
@@ -215,69 +215,69 @@ void MultiClassOutput(const T *scores_data,
                       const T *bboxes_data,
                       T *outputs_data,
                       const std::map<int, std::vector<int>>& selected_indices) {
-  int predict_dim = score_dim[1];
-  int count = 0;
-  for (const auto& it : selected_indices) {
-    /// one batch
-    int label = it.first;
-    const T* sdata = scores_data + label * predict_dim;
-    const std::vector<int>& indices = it.second;
-    for (size_t j = 0; j < indices.size(); ++j) {
-      int idx = indices[j];
-      const T* bdata = bboxes_data + idx * kBBoxSize;
-      outputs_data[count * kOutputDim] = label;           // label
-      outputs_data[count * kOutputDim + 1] = sdata[idx];  // score
-      // xmin, ymin, xmax, ymax
-      std::memcpy(outputs_data + count * kOutputDim + 2, bdata, 4 * sizeof(T));
-      count++;
+    int predict_dim = score_dim[1];
+    int count = 0;
+    for (const auto& it : selected_indices) {
+        /// one batch
+        int label = it.first;
+        const T* sdata = scores_data + label * predict_dim;
+        const std::vector<int>& indices = it.second;
+        for (size_t j = 0; j < indices.size(); ++j) {
+            int idx = indices[j];
+            const T* bdata = bboxes_data + idx * kBBoxSize;
+            outputs_data[count * kOutputDim] = label;           // label
+            outputs_data[count * kOutputDim + 1] = sdata[idx];  // score
+            // xmin, ymin, xmax, ymax
+            std::memcpy(outputs_data + count * kOutputDim + 2, bdata, 4 * sizeof(T));
+            count++;
+        }
     }
-  }
 }
 
 void MultiClassNMSCompute(NMSParam *param) {
-  assert(param->score_dim[0] == 1);
-  assert(param->box_dim[0] == 1);
-  assert (param->score_dim.size() == 3);
-  assert(param->box_dim.size() == 3);
-
-  float* outputs;
-  auto background_label = param->background_label;
-  auto nms_top_k = param->nmsTopK;
-  auto keep_top_k = param->keepTopK;
-  auto nms_threshold = param->nmsThreshold;
-  auto nms_eta = param->nmsEta;
-  auto score_threshold = param->scoreThredshold;
-
-  std::vector<int> score_dim_one_batch = {param->score_dim[1], param->score_dim[2]};
-  std::vector<int> box_dim_one_batch = {param->box_dim[1], param->box_dim[2]};
-  
-  std::vector<int> batch_starts = {0};
-  
-  std::map<int, std::vector<int>> indices;
-  int num_nmsed_out = 0;
-  
-  MultiClassNMS<float>(param->box_data, box_dim_one_batch, param->score_data, score_dim_one_batch, &indices, &num_nmsed_out,
-                       background_label, nms_top_k, keep_top_k, nms_threshold,
-                       nms_eta, score_threshold);
-  batch_starts.push_back(batch_starts.back() + num_nmsed_out);
-
-  int output_size = 0;
-  int num_kept = batch_starts.back();
-  if (num_kept == 0) {
-    outputs = new float[1];
-    outputs[0] = -1;
-    output_size = 1;
-  } else {
-    outputs = new float[num_kept * kOutputDim];
-    int64_t s = batch_starts[0];
-    int64_t e = batch_starts[1];
-    if (e > s) {
-      MultiClassOutput<float>(param->score_data, score_dim_one_batch, param->box_data, outputs, indices);
+    assert(param->score_dim[0] == 1);
+    assert(param->box_dim[0] == 1);
+    assert (param->score_dim.size() == 3);
+    assert(param->box_dim.size() == 3);
+    
+    float* outputs;
+    auto background_label = param->background_label;
+    auto nms_top_k = param->nmsTopK;
+    auto keep_top_k = param->keepTopK;
+    auto nms_threshold = param->nmsThreshold;
+    auto nms_eta = param->nmsEta;
+    auto score_threshold = param->scoreThredshold;
+    
+    std::vector<int> score_dim_one_batch = {param->score_dim[1], param->score_dim[2]};
+    std::vector<int> box_dim_one_batch = {param->box_dim[1], param->box_dim[2]};
+    
+    std::vector<int> batch_starts = {0};
+    
+    std::map<int, std::vector<int>> indices;
+    int num_nmsed_out = 0;
+    
+    MultiClassNMS<float>(param->box_data, box_dim_one_batch, param->score_data, score_dim_one_batch, &indices, &num_nmsed_out,
+                         background_label, nms_top_k, keep_top_k, nms_threshold,
+                         nms_eta, score_threshold);
+    batch_starts.push_back(batch_starts.back() + num_nmsed_out);
+    
+    int output_size = 0;
+    int num_kept = batch_starts.back();
+    if (num_kept == 0) {
+        outputs = new float[1];
+        outputs[0] = -1;
+        output_size = 1;
+    } else {
+        outputs = new float[num_kept * kOutputDim];
+        int64_t s = batch_starts[0];
+        int64_t e = batch_starts[1];
+        if (e > s) {
+            MultiClassOutput<float>(param->score_data, score_dim_one_batch, param->box_data, outputs, indices);
+        }
+        output_size = num_kept * kOutputDim;
     }
-    output_size = num_kept * kOutputDim;
-  }
-  param->output = outputs;
-  param->output_size = output_size;
+    param->output = outputs;
+    param->output_size = output_size;
 }
 
 @implementation CPUResult
@@ -286,31 +286,31 @@ void MultiClassNMSCompute(NMSParam *param) {
 @implementation NMSCompute
 
 -(CPUResult *)computeWithScore:(float *)score andBBoxs:(float *)bbox {
-  NMSParam param;
-  param.box_data = bbox;
-  param.score_data = score;
-  param.background_label = self.background_label;
-  param.scoreThredshold = self.scoreThredshold;
-  param.nmsTopK = self.nmsTopK;
-  param.keepTopK = self.keepTopK;
-  param.nmsEta = self.nmsEta;
-  param.nmsThreshold = self.nmsThreshold;
-  std::vector<int> score_dim;
-  for (int i = 0; i < self.scoreDim.count; ++i) {
-    score_dim.push_back(self.scoreDim[i].intValue);
-  }
-  param.score_dim = score_dim;
-  
-  std::vector<int> box_dim;
-  for (int i = 0; i < self.bboxDim.count; ++i) {
-    box_dim.push_back(self.bboxDim[i].intValue);
-  }
-  param.box_dim = box_dim;
-  MultiClassNMSCompute(&param);
-  CPUResult *cr = [[CPUResult alloc] init];
-  cr.output = param.output;
-  cr.outputSize = param.output_size;
-  return cr;
+    NMSParam param;
+    param.box_data = bbox;
+    param.score_data = score;
+    param.background_label = self.background_label;
+    param.scoreThredshold = self.scoreThredshold;
+    param.nmsTopK = self.nmsTopK;
+    param.keepTopK = self.keepTopK;
+    param.nmsEta = self.nmsEta;
+    param.nmsThreshold = self.nmsThreshold;
+    std::vector<int> score_dim;
+    for (int i = 0; i < self.scoreDim.count; ++i) {
+        score_dim.push_back(self.scoreDim[i].intValue);
+    }
+    param.score_dim = score_dim;
+    
+    std::vector<int> box_dim;
+    for (int i = 0; i < self.bboxDim.count; ++i) {
+        box_dim.push_back(self.bboxDim[i].intValue);
+    }
+    param.box_dim = box_dim;
+    MultiClassNMSCompute(&param);
+    CPUResult *cr = [[CPUResult alloc] init];
+    cr.output = param.output;
+    cr.outputSize = param.output_size;
+    return cr;
 }
 
 @end

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

@@ -16,33 +16,37 @@ import Foundation
 import paddle_mobile
 
 public class Genet: Net {
-  @objc public override init(device: MTLDevice) {
-    super.init(device: device)
-    modelPath = Bundle.main.path(forResource: "genet_model", ofType: nil) ?! "model null"
-    paramPath = Bundle.main.path(forResource: "genet_params", ofType: nil) ?! "para null"
-    preprocessKernel = GenetPreProccess.init(device: device)
-    inputDim = Dim.init(inDim: [1, 128, 128, 3])
-  }
-  
-  @objc override public init(device: MTLDevice, paramPointer: UnsafeMutableRawPointer, paramSize:Int, modePointer: UnsafeMutableRawPointer, modelSize: Int) {
-    super.init(device: device,
-               paramPointer: paramPointer,
-               paramSize: paramSize,
-               modePointer: modePointer,
-               modelSize: modelSize)
-    preprocessKernel = GenetPreProccess.init(device: device)
-    inputDim = Dim.init(inDim: [1, 128, 128, 3])
-  }
-
-  class GenetPreProccess: CusomKernel {
-    init(device: MTLDevice) {
-      let s = Shape.init(inWidth: 128, inHeight: 128, inChannel: 3)
-      super.init(device: device, inFunctionName: "genet_preprocess", outputDim: s, metalLoadModel: .LoadMetalInDefaultLib, metalLibPath: nil)
+    @objc public override init(device: MTLDevice) {
+        super.init(device: device)
+        modelPath = Bundle.main.path(forResource: "genet_model", ofType: nil) ?! "model null"
+        paramPath = Bundle.main.path(forResource: "genet_params", ofType: nil) ?! "para null"
+        preprocessKernel = GenetPreProccess.init(device: device)
+        inputDim = Dim.init(inDim: [1, 128, 128, 3])
+        metalLoadMode = .LoadMetalInCustomMetalLib
+        metalLibPath = Bundle.main.path(forResource: "paddle-mobile-metallib", ofType: "metallib")
+    }
+    
+    @objc override public init(device: MTLDevice, inParamPointer: UnsafeMutableRawPointer, inParamSize:Int, inModelPointer: UnsafeMutableRawPointer, inModelSize: Int) {
+        super.init(device: device,
+                   inParamPointer: inParamPointer,
+                   inParamSize: inParamSize,
+                   inModelPointer: inModelPointer,
+                   inModelSize: inModelSize)
+        metalLoadMode = .LoadMetalInCustomMetalLib
+        metalLibPath = Bundle.main.path(forResource: "paddle-mobile-metallib", ofType: "metallib")
+        preprocessKernel = GenetPreProccess.init(device: device)
+        inputDim = Dim.init(inDim: [1, 128, 128, 3])
+    }
+    
+    class GenetPreProccess: CusomKernel {
+        init(device: MTLDevice) {
+            let s = Shape.init(inWidth: 128, inHeight: 128, inChannel: 3)
+            super.init(device: device, inFunctionName: "genet_preprocess", outputDim: s, metalLoadModel: .LoadMetalInDefaultLib, metalLibPath: nil)
+        }
+    }
+    
+    override  public func resultStr(res: [ResultHolder]) -> String {
+        return " \(res[0].result[0]) ... "
     }
-  }
-  
-  override  public func resultStr(res: ResultHolder) -> String {
-    return " \(res.result[0]) ... "
-  }
-  
+    
 }

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

@@ -16,51 +16,53 @@ import Foundation
 import paddle_mobile
 
 public class MobileNet: Net{
-  
-  class MobilenetPreProccess: CusomKernel {
-    init(device: MTLDevice) {
-      let s = Shape.init(inWidth: 224, inHeight: 224, inChannel: 3)
-      super.init(device: device, inFunctionName: "mobilenet_preprocess", outputDim: s, metalLoadModel: .LoadMetalInDefaultLib, metalLibPath: nil)
-    }
-  }
-  
-  class PreWords {
-    var contents: [String] = []
-    init(fileName: String, type: String = "txt", inBundle: Bundle = Bundle.main) {
-      if let filePath = inBundle.path(forResource: fileName, ofType: type) {
-        let string = try! String.init(contentsOfFile: filePath)
-        contents = string.components(separatedBy: CharacterSet.newlines).filter{$0.count > 10}.map{
-          String($0[$0.index($0.startIndex, offsetBy: 10)...])
+    
+    class MobilenetPreProccess: CusomKernel {
+        init(device: MTLDevice) {
+            let s = Shape.init(inWidth: 224, inHeight: 224, inChannel: 3)
+            super.init(device: device, inFunctionName: "mobilenet_preprocess", outputDim: s, metalLoadModel: .LoadMetalInDefaultLib, metalLibPath: nil)
         }
-      }else{
-        fatalError("no file call \(fileName)")
-      }
     }
-    subscript(index: Int) -> String {
-      return contents[index]
+    
+    class PreWords {
+        var contents: [String] = []
+        init(fileName: String, type: String = "txt", inBundle: Bundle = Bundle.main) {
+            if let filePath = inBundle.path(forResource: fileName, ofType: type) {
+                let string = try! String.init(contentsOfFile: filePath)
+                contents = string.components(separatedBy: CharacterSet.newlines).filter{$0.count > 10}.map{
+                    String($0[$0.index($0.startIndex, offsetBy: 10)...])
+                }
+            }else{
+                fatalError("no file call \(fileName)")
+            }
+        }
+        subscript(index: Int) -> String {
+            return contents[index]
+        }
     }
-  }
-  
-  let labels = PreWords.init(fileName: "synset")
-  
-  override public func resultStr(res: ResultHolder) -> String {
-    let resPointer = res.result
-    var s: [String] = []
-    (0..<res.capacity).map { resPointer[$0] }.top(r: 5).enumerated().forEach{
-      s.append(String(format: "%d: %@ (%3.2f%%)", $0 + 1, labels[$1.0], $1.1 * 100))
+    
+    let labels = PreWords.init(fileName: "synset")
+    
+    override public func resultStr(res: [ResultHolder]) -> String {
+        let resPointer = res[0].result
+        var s: [String] = []
+        (0..<res[0].capacity).map { resPointer[$0] }.top(r: 5).enumerated().forEach{
+            s.append(String(format: "%d: %@ (%3.2f%%)", $0 + 1, labels[$1.0], $1.1 * 100))
+        }
+        return s.joined(separator: "\n")
     }
-    return s.joined(separator: "\n")
-  }
     
-  override public init(device: MTLDevice) {
-    super.init(device: device)
-    except = 0
-    modelPath = Bundle.main.path(forResource: "mobilenet_model", ofType: nil) ?! "model null"
-    paramPath = Bundle.main.path(forResource: "mobilenet_params", ofType: nil) ?! "para null"    
-//    metalLoadMode = .LoadMetalInCustomMetalLib
-//    metalLibPath = Bundle.main.path(forResource: "PaddleMobileMetal", ofType: "metallib") ?! " can't be nil "
-    preprocessKernel = MobilenetPreProccess.init(device: device)
-    inputDim = Dim.init(inDim: [1, 224, 224, 3])
-  }
+    override public init(device: MTLDevice) {
+        super.init(device: device)
+        except = 0
+        modelPath = Bundle.main.path(forResource: "mobilenet_model", ofType: nil) ?! "model null"
+        paramPath = Bundle.main.path(forResource: "mobilenet_params", ofType: nil) ?! "para null"    
+        //    metalLoadMode = .LoadMetalInCustomMetalLib
+        //    metalLibPath = Bundle.main.path(forResource: "PaddleMobileMetal", ofType: "metallib") ?! " can't be nil "
+        preprocessKernel = MobilenetPreProccess.init(device: device)
+        inputDim = Dim.init(inDim: [1, 224, 224, 3])
+        metalLoadMode = .LoadMetalInCustomMetalLib
+        metalLibPath = Bundle.main.path(forResource: "paddle-mobile-metallib", ofType: "metallib")
+    }
 }
 

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

@@ -16,18 +16,46 @@ import Foundation
 import paddle_mobile
 
 public class MobileNetCombined: Net {
-  @objc public override init(device: MTLDevice) {
-    super.init(device: device)
-    except = 0
-    modelPath = Bundle.main.path(forResource: "combined_mobilenet_model", ofType: nil) ?! "model null"
-    paramPath = Bundle.main.path(forResource: "combined_mobilenet_params", ofType: nil) ?! "para null"
-    inputDim = Dim.init(inDim: [1, 224, 224, 3])
-//    metalLoadMode = .LoadMetalInCustomMetalLib
-//    metalLibPath = Bundle.main.path(forResource: "PaddleMobileMetal", ofType: "metallib") ?! " can't be nil "
-  }
-  
-  override  public func resultStr(res: ResultHolder) -> String {
-    return " \(res.result[0]) ... "
-  }
-  
+    @objc public override init(device: MTLDevice) {
+        super.init(device: device)
+        except = 0
+        modelPath = Bundle.main.path(forResource: "combined_mobilenet_model", ofType: nil) ?! "model null"
+        paramPath = Bundle.main.path(forResource: "combined_mobilenet_params", ofType: nil) ?! "para null"
+        inputDim = Dim.init(inDim: [1, 224, 224, 3])
+        metalLoadMode = .LoadMetalInCustomMetalLib
+        let paddleMobileMetallib = Bundle.main.path(forResource: "paddle-mobile-metallib", ofType: "metallib")
+        metalLibPath = paddleMobileMetallib
+        useMPS = true
+        preprocessKernel = ScaleKernel.init(device: device, shape: Shape.init(inWidth: 224, inHeight: 224, inChannel: 3), metalLoadMode: .LoadMetalInCustomMetalLib, metalLibPath: paddleMobileMetallib)
+        
+    }
+    let labels = PreWords.init(fileName: "vision_synset")
+
+    class PreWords {
+        var contents: [String] = []
+        init(fileName: String, type: String = "txt", inBundle: Bundle = Bundle.main) {
+            if let filePath = inBundle.path(forResource: fileName, ofType: type) {
+                let string = try! String.init(contentsOfFile: filePath)
+                contents = string.components(separatedBy: CharacterSet.newlines).filter{$0.count > 10}.map{
+                    String($0[$0.index($0.startIndex, offsetBy: 10)...])
+                }
+            }else{
+                fatalError("no file call \(fileName)")
+            }
+        }
+        subscript(index: Int) -> String {
+            return contents[index]
+        }
+    }
+    
+    override  public func resultStr(res: [ResultHolder]) -> String {
+        let firstRes = res[0]
+        let resPointer = firstRes.result
+        var s: [String] = []
+        (0..<firstRes.capacity).map { resPointer[$0] }.top(r: 5).enumerated().forEach{
+            s.append(String(format: "%d: %@ (%3.2f%%)", $0 + 1, labels[$1.0], $1.1 * 100))
+        }
+        return s.joined(separator: "\n")
+    }
+    
 }

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

@@ -16,84 +16,84 @@ import Foundation
 import paddle_mobile
 
 public class MobileNet_ssd_hand: Net {
-  @objc public override init(device: MTLDevice) {
-    super.init(device: device)
-    except = 2
-    modelPath = Bundle.main.path(forResource: "ssd_hand_model", ofType: nil) ?! "model null"
-    paramPath = Bundle.main.path(forResource: "ssd_hand_params", ofType: nil) ?! "para null"
-//    metalLoadMode = .LoadMetalInCustomMetalLib
-//    metalLibPath = Bundle.main.path(forResource: "PaddleMobileMetal", ofType: "metallib") ?! " can't be nil "
-    preprocessKernel = MobilenetssdPreProccess.init(device: device)
-    inputDim = Dim.init(inDim: [1, 300, 300, 3])
-  }
-  
-  @objc override public init(device: MTLDevice,paramPointer: UnsafeMutableRawPointer, paramSize:Int, modePointer: UnsafeMutableRawPointer, modelSize: Int) {
-    super.init(device:device,paramPointer:paramPointer,paramSize:paramSize,modePointer:modePointer,modelSize:modelSize)
-    except = 2
-    modelPath = ""
-    paramPath = ""
-//    metalLoadMode = .LoadMetalInCustomMetalLib
-//    metalLibPath = Bundle.main.path(forResource: "PaddleMobileMetal", ofType: "metallib") ?! " can't be nil "
-    preprocessKernel = MobilenetssdPreProccess.init(device: device)
-    inputDim = Dim.init(inDim: [1, 300, 300, 3])
-  }
-  
-  class MobilenetssdPreProccess: CusomKernel {
-    init(device: MTLDevice) {
-      let s = Shape.init(inWidth: 300, inHeight: 300, inChannel: 3)
-      super.init(device: device, inFunctionName: "mobilenet_ssd_preprocess", outputDim: s, metalLoadModel: .LoadMetalInDefaultLib, metalLibPath: nil)
+    @objc public override init(device: MTLDevice) {
+        super.init(device: device)
+        except = 2
+        modelPath = Bundle.main.path(forResource: "ssd_hand_model", ofType: nil) ?! "model null"
+        paramPath = Bundle.main.path(forResource: "ssd_hand_params", ofType: nil) ?! "para null"
+        metalLoadMode = .LoadMetalInCustomMetalLib
+        metalLibPath = Bundle.main.path(forResource: "paddle-mobile-metallib", ofType: "metallib")
+        preprocessKernel = MobilenetssdPreProccess.init(device: device)
+        inputDim = Dim.init(inDim: [1, 300, 300, 3])
     }
-  }
-  
-  override public func resultStr(res: ResultHolder) -> String {
-    return " \(res)"
-  }
-  
-  override public func fetchResult(paddleMobileRes: GPUResultHolder) -> ResultHolder {
-
-//    guard let interRes = paddleMobileRes.intermediateResults else {
-//      fatalError(" need have inter result ")
-//    }
-//
-//    guard let scores = interRes["Scores"], scores.count > 0, let score = scores[0] as?  Texture<Float32> else {
-//      fatalError(" need score ")
-//    }
-//
-//    guard let bboxs = interRes["BBoxes"], bboxs.count > 0, let bbox = bboxs[0] as? Texture<Float32> else {
-//      fatalError()
-//    }
-//
-//    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())
-////
-//    var bboxArr = bbox.metalTexture.float32Array()
-////    print("bbox: ")
-////    print(bboxArr.strideArray())
-//
-//    let nmsCompute = NMSCompute.init()
-//    nmsCompute.scoreThredshold = 0.01
-//    nmsCompute.nmsTopK = 400
-//    nmsCompute.keepTopK = 200
-//    nmsCompute.nmsEta = 1.0
-//    nmsCompute.nmsThreshold = 0.45
-//    nmsCompute.background_label = 0;
-//
-//    nmsCompute.scoreDim = [NSNumber.init(value: score.tensorDim[0]), NSNumber.init(value: score.tensorDim[1]), NSNumber.init(value: score.tensorDim[2])]
-//
-//    nmsCompute.bboxDim = [NSNumber.init(value: bbox.tensorDim[0]), NSNumber.init(value: bbox.tensorDim[1]), NSNumber.init(value: bbox.tensorDim[2])]
-//    guard let result = nmsCompute.compute(withScore: &scoreFormatArr, andBBoxs: &bboxArr) else {
-//      fatalError( " result error " )
-//    }
-//
-//    let output: [Float32] = result.map { $0.floatValue }
-//
-//
-//    return output
-    fatalError()
-  }
-  
-
-  
- 
+    
+    @objc override public init(device: MTLDevice,inParamPointer: UnsafeMutableRawPointer, inParamSize:Int, inModelPointer inModePointer: UnsafeMutableRawPointer, inModelSize: Int) {
+        super.init(device:device,inParamPointer:inParamPointer,inParamSize:inParamSize,inModelPointer:inModePointer,inModelSize:inModelSize)
+        except = 2
+        modelPath = ""
+        paramPath = ""
+        metalLoadMode = .LoadMetalInCustomMetalLib
+        metalLibPath = Bundle.main.path(forResource: "paddle-mobile-metallib", ofType: "metallib")
+        preprocessKernel = MobilenetssdPreProccess.init(device: device)
+        inputDim = Dim.init(inDim: [1, 300, 300, 3])
+    }
+    
+    class MobilenetssdPreProccess: CusomKernel {
+        init(device: MTLDevice) {
+            let s = Shape.init(inWidth: 300, inHeight: 300, inChannel: 3)
+            super.init(device: device, inFunctionName: "mobilenet_ssd_preprocess", outputDim: s, metalLoadModel: .LoadMetalInDefaultLib, metalLibPath: nil)
+        }
+    }
+    
+    override public func resultStr(res: [ResultHolder]) -> String {
+        return " \(res[0])"
+    }
+    
+    override public func fetchResult(paddleMobileRes: [GPUResultHolder]) -> [ResultHolder] {
+        
+        //    guard let interRes = paddleMobileRes.intermediateResults else {
+        //      fatalError(" need have inter result ")
+        //    }
+        //
+        //    guard let scores = interRes["Scores"], scores.count > 0, let score = scores[0] as?  Texture<Float32> else {
+        //      fatalError(" need score ")
+        //    }
+        //
+        //    guard let bboxs = interRes["BBoxes"], bboxs.count > 0, let bbox = bboxs[0] as? Texture<Float32> else {
+        //      fatalError()
+        //    }
+        //
+        //    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())
+        ////
+        //    var bboxArr = bbox.metalTexture.float32Array()
+        ////    print("bbox: ")
+        ////    print(bboxArr.strideArray())
+        //
+        //    let nmsCompute = NMSCompute.init()
+        //    nmsCompute.scoreThredshold = 0.01
+        //    nmsCompute.nmsTopK = 400
+        //    nmsCompute.keepTopK = 200
+        //    nmsCompute.nmsEta = 1.0
+        //    nmsCompute.nmsThreshold = 0.45
+        //    nmsCompute.background_label = 0;
+        //
+        //    nmsCompute.scoreDim = [NSNumber.init(value: score.tensorDim[0]), NSNumber.init(value: score.tensorDim[1]), NSNumber.init(value: score.tensorDim[2])]
+        //
+        //    nmsCompute.bboxDim = [NSNumber.init(value: bbox.tensorDim[0]), NSNumber.init(value: bbox.tensorDim[1]), NSNumber.init(value: bbox.tensorDim[2])]
+        //    guard let result = nmsCompute.compute(withScore: &scoreFormatArr, andBBoxs: &bboxArr) else {
+        //      fatalError( " result error " )
+        //    }
+        //
+        //    let output: [Float32] = result.map { $0.floatValue }
+        //
+        //
+        //    return output
+        fatalError()
+    }
+    
+    
+    
+    
 }

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

@@ -16,133 +16,137 @@ import Foundation
 import paddle_mobile
 
 public class MobileNet_ssd_AR: Net {
-  @objc public override init(device: MTLDevice) {
-    super.init(device: device)
-    except = 2
-    modelPath = Bundle.main.path(forResource: "ar_model", ofType: nil) ?! "model null"
-    paramPath = Bundle.main.path(forResource: "ar_params", ofType: nil) ?! "para null"
-    preprocessKernel = MobilenetssdPreProccess.init(device: device)
-    inputDim = Dim.init(inDim: [1, 160, 160, 3])
-  }
-  
-  @objc override public init(device: MTLDevice,paramPointer: UnsafeMutableRawPointer, paramSize:Int, modePointer: UnsafeMutableRawPointer, modelSize: Int) {
-    super.init(device:device,paramPointer:paramPointer,paramSize:paramSize,modePointer:modePointer,modelSize:modelSize)
-    except = 2
-    preprocessKernel = MobilenetssdPreProccess.init(device: device)
-    inputDim = Dim.init(inDim: [1, 160, 160, 3])
-  }
-  
-  class MobilenetssdPreProccess: CusomKernel {
-    init(device: MTLDevice)  {
-      let s = Shape.init(inWidth: 160, inHeight: 160, inChannel: 3)
-      super.init(device: device, inFunctionName: "mobilent_ar_preprocess", outputDim: s, metalLoadModel: .LoadMetalInDefaultLib, metalLibPath: nil)
+    @objc public override init(device: MTLDevice) {
+        super.init(device: device)
+        except = 2
+        modelPath = Bundle.main.path(forResource: "ar_model", ofType: nil) ?! "model null"
+        paramPath = Bundle.main.path(forResource: "ar_params", ofType: nil) ?! "para null"
+        preprocessKernel = MobilenetssdPreProccess.init(device: device)
+        inputDim = Dim.init(inDim: [1, 160, 160, 3])
+        metalLoadMode = .LoadMetalInCustomMetalLib
+        metalLibPath = Bundle.main.path(forResource: "paddle-mobile-metallib", ofType: "metallib")
     }
-  }
-  
-  override public func resultStr(res: ResultHolder) -> String {
-    return " \(res.result[0])"
-  }
-  
-  override public func fetchResult(paddleMobileRes: GPUResultHolder) -> ResultHolder {
-    fatalError()
-//    guard let interRes = paddleMobileRes.intermediateResults else {
-//      fatalError(" need have inter result ")
-//    }
-//
-//    guard let scores = interRes["Scores"], scores.count > 0, let score = scores[0] as?  FetchHolder else {
-//      fatalError(" need score ")
-//    }
-//
-//    guard let bboxs = interRes["BBoxes"], bboxs.count > 0, let bbox = bboxs[0] as? FetchHolder else {
-//      fatalError()
-//    }
     
-//    let startDate = Date.init()
+    @objc override public init(device: MTLDevice, inParamPointer: UnsafeMutableRawPointer, inParamSize:Int, inModelPointer: UnsafeMutableRawPointer, inModelSize: Int) {
+        super.init(device:device,inParamPointer:inParamPointer,inParamSize:inParamSize,inModelPointer:inModelPointer,inModelSize:inModelSize)
+        except = 2
+        preprocessKernel = MobilenetssdPreProccess.init(device: device)
+        inputDim = Dim.init(inDim: [1, 160, 160, 3])
+        metalLoadMode = .LoadMetalInCustomMetalLib
+        metalLibPath = Bundle.main.path(forResource: "paddle-mobile-metallib", ofType: "metallib")
+    }
     
-//    print("scoreFormatArr: ")
-//print((0..<score.capacity).map{ score.result[$0] }.strideArray())
-//
-//    print("bbox arr: ")
-//
-//    print((0..<bbox.capacity).map{ bbox.result[$0] }.strideArray())
+    class MobilenetssdPreProccess: CusomKernel {
+        init(device: MTLDevice)  {
+            let s = Shape.init(inWidth: 160, inHeight: 160, inChannel: 3)
+            super.init(device: device, inFunctionName: "mobilent_ar_preprocess", outputDim: s, metalLoadModel: .LoadMetalInDefaultLib, metalLibPath: nil)
+        }
+    }
     
-//    let nmsCompute = NMSCompute.init()
-//    nmsCompute.scoreThredshold = 0.25
-//    nmsCompute.nmsTopK = 100
-//    nmsCompute.keepTopK = 100
-//    nmsCompute.nmsEta = 1.0
-//    nmsCompute.nmsThreshold = 0.449999988
-//    nmsCompute.background_label = 0;
-//    nmsCompute.scoreDim = [NSNumber.init(value: score.dim[0]), NSNumber.init(value: score.dim[1]), NSNumber.init(value: score.dim[2])]
-//    nmsCompute.bboxDim = [NSNumber.init(value: bbox.dim[0]), NSNumber.init(value: bbox.dim[1]), NSNumber.init(value: bbox.dim[2])]
-//    guard let result = nmsCompute.compute(withScore: score.result, andBBoxs: bbox.result) else {
-//      fatalError( " result error " )
-//    }
-//    let resultHolder = ResultHolder.init(inResult: result.output, inCapacity: Int(result.outputSize))
-//    for i in 0..<Int(result.outputSize) {
-//
-//      print("i \(i) : \(result.output[i])")
-//    }
-//    print(Date.init().timeIntervalSince(startDate))
-
-//    print(resultHolder.result![0])
-//    return resultHolder
-  }
-  
-//  override func updateProgram(program: Program) {
-  
-//    for i in [56, 66, 76, 86, 93, 99] {
-//      let opDesc = program.programDesc.blocks[0].ops[i]
-//      let output = opDesc.outputs["Out"]!.first!
-//      let v = program.scope[output]!
-//      let originTexture = v as! Texture
-//      originTexture.tensorDim = Dim.init(inDim: [originTexture.tensorDim[1] / 7, originTexture.tensorDim[0] * 7])
-//      
-//      originTexture.dim = Dim.init(inDim: [1, 1, originTexture.dim[3] / 7, originTexture.dim[2] * 7])
-//      
-//      originTexture.padToFourDim = Dim.init(inDim: [1, 1, originTexture.padToFourDim[3] / 7, originTexture.padToFourDim[2] * 7])
-//      
-//      program.scope[output] = originTexture
-//      
-//      if i == 99 {
-//        opDesc.attrs["axis"] = 0
-//      } else {
-//        opDesc.attrs["shape"] = originTexture.tensorDim.dims.map { Int32($0) }
-//      }
-//    }
-//    
-//    for i in [58, 59, 88, 89, 95, 96, 68, 69, 78, 79] {
-//      let opDesc = program.programDesc.blocks[0].ops[i]
-//      let output = opDesc.outputs["Out"]!.first!
-//      let v = program.scope[output]!
-//      
-//      
-//      
-//      let originTexture = v as! Texture
-//      originTexture.tensorDim = Dim.init(inDim: [originTexture.tensorDim[1], originTexture.tensorDim[2]])
-//      opDesc.attrs["shape"] = originTexture.tensorDim.dims.map { Int32($0) }
-//    }
-//    
-//    for i in [60, 101, 90, 97, 70, 80] {
-//      let opDesc = program.programDesc.blocks[0].ops[i]
-//      let output = opDesc.outputs["Out"]!.first!
-//      let v = program.scope[output]!
-//      let originTexture = v as! Texture
-//      originTexture.tensorDim = Dim.init(inDim: [originTexture.tensorDim[1], originTexture.tensorDim[2]])
-//      opDesc.attrs["axis"] = (opDesc.attrs["axis"]! as! Int) - 1
-//    }
-//    
-//    for i in [102] {
-//      let opDesc = program.programDesc.blocks[0].ops[i]
-//      for output in opDesc.outputs["Out"]! {
-//        let v = program.scope[output]!
-//        let originTexture = v as! Texture
-//        originTexture.tensorDim = Dim.init(inDim: [originTexture.tensorDim[1], originTexture.tensorDim[2]])
-//      }
-//      opDesc.attrs["axis"] = (opDesc.attrs["axis"]! as! Int) - 1
-//      print(" split axis \(opDesc.attrs["axis"])")
-//    }
+    override public func resultStr(res: [ResultHolder]) -> String {
+        return " \(res[0].result[0])"
+    }
+    
+    override public func fetchResult(paddleMobileRes: [GPUResultHolder]) -> [ResultHolder] {
+        fatalError()
+        //    guard let interRes = paddleMobileRes.intermediateResults else {
+        //      fatalError(" need have inter result ")
+        //    }
+        //
+        //    guard let scores = interRes["Scores"], scores.count > 0, let score = scores[0] as?  FetchHolder else {
+        //      fatalError(" need score ")
+        //    }
+        //
+        //    guard let bboxs = interRes["BBoxes"], bboxs.count > 0, let bbox = bboxs[0] as? FetchHolder else {
+        //      fatalError()
+        //    }
+        
+        //    let startDate = Date.init()
+        
+        //    print("scoreFormatArr: ")
+        //print((0..<score.capacity).map{ score.result[$0] }.strideArray())
+        //
+        //    print("bbox arr: ")
+        //
+        //    print((0..<bbox.capacity).map{ bbox.result[$0] }.strideArray())
+        
+        //    let nmsCompute = NMSCompute.init()
+        //    nmsCompute.scoreThredshold = 0.25
+        //    nmsCompute.nmsTopK = 100
+        //    nmsCompute.keepTopK = 100
+        //    nmsCompute.nmsEta = 1.0
+        //    nmsCompute.nmsThreshold = 0.449999988
+        //    nmsCompute.background_label = 0;
+        //    nmsCompute.scoreDim = [NSNumber.init(value: score.dim[0]), NSNumber.init(value: score.dim[1]), NSNumber.init(value: score.dim[2])]
+        //    nmsCompute.bboxDim = [NSNumber.init(value: bbox.dim[0]), NSNumber.init(value: bbox.dim[1]), NSNumber.init(value: bbox.dim[2])]
+        //    guard let result = nmsCompute.compute(withScore: score.result, andBBoxs: bbox.result) else {
+        //      fatalError( " result error " )
+        //    }
+        //    let resultHolder = ResultHolder.init(inResult: result.output, inCapacity: Int(result.outputSize))
+        //    for i in 0..<Int(result.outputSize) {
+        //
+        //      print("i \(i) : \(result.output[i])")
+        //    }
+        //    print(Date.init().timeIntervalSince(startDate))
+        
+        //    print(resultHolder.result![0])
+        //    return resultHolder
+    }
+    
+    //  override func updateProgram(program: Program) {
+    
+    //    for i in [56, 66, 76, 86, 93, 99] {
+    //      let opDesc = program.programDesc.blocks[0].ops[i]
+    //      let output = opDesc.outputs["Out"]!.first!
+    //      let v = program.scope[output]!
+    //      let originTexture = v as! Texture
+    //      originTexture.tensorDim = Dim.init(inDim: [originTexture.tensorDim[1] / 7, originTexture.tensorDim[0] * 7])
+    //      
+    //      originTexture.dim = Dim.init(inDim: [1, 1, originTexture.dim[3] / 7, originTexture.dim[2] * 7])
+    //      
+    //      originTexture.padToFourDim = Dim.init(inDim: [1, 1, originTexture.padToFourDim[3] / 7, originTexture.padToFourDim[2] * 7])
+    //      
+    //      program.scope[output] = originTexture
+    //      
+    //      if i == 99 {
+    //        opDesc.attrs["axis"] = 0
+    //      } else {
+    //        opDesc.attrs["shape"] = originTexture.tensorDim.dims.map { Int32($0) }
+    //      }
+    //    }
+    //    
+    //    for i in [58, 59, 88, 89, 95, 96, 68, 69, 78, 79] {
+    //      let opDesc = program.programDesc.blocks[0].ops[i]
+    //      let output = opDesc.outputs["Out"]!.first!
+    //      let v = program.scope[output]!
+    //      
+    //      
+    //      
+    //      let originTexture = v as! Texture
+    //      originTexture.tensorDim = Dim.init(inDim: [originTexture.tensorDim[1], originTexture.tensorDim[2]])
+    //      opDesc.attrs["shape"] = originTexture.tensorDim.dims.map { Int32($0) }
+    //    }
+    //    
+    //    for i in [60, 101, 90, 97, 70, 80] {
+    //      let opDesc = program.programDesc.blocks[0].ops[i]
+    //      let output = opDesc.outputs["Out"]!.first!
+    //      let v = program.scope[output]!
+    //      let originTexture = v as! Texture
+    //      originTexture.tensorDim = Dim.init(inDim: [originTexture.tensorDim[1], originTexture.tensorDim[2]])
+    //      opDesc.attrs["axis"] = (opDesc.attrs["axis"]! as! Int) - 1
+    //    }
+    //    
+    //    for i in [102] {
+    //      let opDesc = program.programDesc.blocks[0].ops[i]
+    //      for output in opDesc.outputs["Out"]! {
+    //        let v = program.scope[output]!
+    //        let originTexture = v as! Texture
+    //        originTexture.tensorDim = Dim.init(inDim: [originTexture.tensorDim[1], originTexture.tensorDim[2]])
+    //      }
+    //      opDesc.attrs["axis"] = (opDesc.attrs["axis"]! as! Int) - 1
+    //      print(" split axis \(opDesc.attrs["axis"])")
+    //    }
     // 99
-//  }
-  
+    //  }
+    
 }

metal/paddle-mobile-demo/paddle-mobile-demo/Net/PreProcessKernel.metal

@@ -17,9 +17,9 @@ using namespace metal;
 
 
 kernel void mobilenet_preprocess(
-                       texture2d<float, access::read> inTexture [[texture(0)]],
-                       texture2d<float, access::write> outTexture [[texture(1)]],
-                       uint2 gid [[thread_position_in_grid]])
+                                 texture2d<float, access::read> inTexture [[texture(0)]],
+                                 texture2d<float, access::write> outTexture [[texture(1)]],
+                                 uint2 gid [[thread_position_in_grid]])
 {
     if (gid.x >= outTexture.get_width() ||
         gid.y >= outTexture.get_height()) {
@@ -31,9 +31,9 @@ kernel void mobilenet_preprocess(
 }
 
 kernel void mobilenet_preprocess_half(
-                       texture2d<half, access::read> inTexture [[texture(0)]],
-                       texture2d<half, access::write> outTexture [[texture(1)]],
-                       uint2 gid [[thread_position_in_grid]])
+                                      texture2d<half, access::read> inTexture [[texture(0)]],
+                                      texture2d<half, access::write> outTexture [[texture(1)]],
+                                      uint2 gid [[thread_position_in_grid]])
 {
     if (gid.x >= outTexture.get_width() ||
         gid.y >= outTexture.get_height()) {
@@ -45,9 +45,9 @@ kernel void mobilenet_preprocess_half(
 }
 
 kernel void mobilenet_ssd_preprocess(
-                       texture2d<float, access::read> inTexture [[texture(0)]],
-                       texture2d<float, access::write> outTexture [[texture(1)]],
-                       uint2 gid [[thread_position_in_grid]])
+                                     texture2d<float, access::read> inTexture [[texture(0)]],
+                                     texture2d<float, access::write> outTexture [[texture(1)]],
+                                     uint2 gid [[thread_position_in_grid]])
 {
     if (gid.x >= outTexture.get_width() ||
         gid.y >= outTexture.get_height()) {
@@ -59,9 +59,9 @@ kernel void mobilenet_ssd_preprocess(
 }
 
 kernel void mobilenet_ssd_preprocess_half(
-                            texture2d<half, access::read> inTexture [[texture(0)]],
-                            texture2d<half, access::write> outTexture [[texture(1)]],
-                            uint2 gid [[thread_position_in_grid]])
+                                          texture2d<half, access::read> inTexture [[texture(0)]],
+                                          texture2d<half, access::write> outTexture [[texture(1)]],
+                                          uint2 gid [[thread_position_in_grid]])
 {
     if (gid.x >= outTexture.get_width() ||
         gid.y >= outTexture.get_height()) {
@@ -74,44 +74,44 @@ kernel void mobilenet_ssd_preprocess_half(
 
 kernel void genet_preprocess(texture2d<float, access::read> inTexture [[texture(0)]], texture2d<float, access::write> outTexture [[texture(1)]], uint2 gid [[thread_position_in_grid]])
 {
-  if (gid.x >= outTexture.get_width() ||
-      gid.y >= outTexture.get_height()) {
-    return;
-  }
-  const auto means = float4(128.0f, 128.0f, 128.0f, 0.0f);
-  const float4 inColor = (inTexture.read(gid) * 255.0 - means) * 0.017;
-  outTexture.write(float4(inColor.z, inColor.y, inColor.x, 0.0f), gid);
+    if (gid.x >= outTexture.get_width() ||
+        gid.y >= outTexture.get_height()) {
+        return;
+    }
+    const auto means = float4(128.0f, 128.0f, 128.0f, 0.0f);
+    const float4 inColor = (inTexture.read(gid) * 255.0 - means) * 0.017;
+    outTexture.write(float4(inColor.z, inColor.y, inColor.x, 0.0f), gid);
 }
 
 kernel void genet_preprocess_half(texture2d<half, access::read> inTexture [[texture(0)]], texture2d<half, access::write> outTexture [[texture(1)]], uint2 gid [[thread_position_in_grid]])
 {
-  if (gid.x >= outTexture.get_width() ||
-      gid.y >= outTexture.get_height()) {
-    return;
-  }
-  const auto means = half4(128.0f, 128.0f, 128.0f, 0.0f);
-  const half4 inColor = (inTexture.read(gid) * 255.0 - means) * 0.017;
-  outTexture.write(half4(inColor.z, inColor.y, inColor.x, 0.0f), gid);
+    if (gid.x >= outTexture.get_width() ||
+        gid.y >= outTexture.get_height()) {
+        return;
+    }
+    const auto means = half4(128.0f, 128.0f, 128.0f, 0.0f);
+    const half4 inColor = (inTexture.read(gid) * 255.0 - means) * 0.017;
+    outTexture.write(half4(inColor.z, inColor.y, inColor.x, 0.0f), gid);
 }
 
 kernel void mobilent_ar_preprocess(texture2d<float, access::read> inTexture [[texture(0)]], texture2d<float, access::write> outTexture [[texture(1)]], uint2 gid [[thread_position_in_grid]])
 {
-  if (gid.x >= outTexture.get_width() ||
-      gid.y >= outTexture.get_height()) {
-    return;
-  }
-  const auto means = float4(128.0f, 128.0f, 128.0f, 0.0f);
-  const float4 inColor = (inTexture.read(gid) * 255.0 - means) * 0.017;
-  outTexture.write(float4(inColor.z, inColor.y, inColor.x, 0.0f), gid);
+    if (gid.x >= outTexture.get_width() ||
+        gid.y >= outTexture.get_height()) {
+        return;
+    }
+    const auto means = float4(128.0f, 128.0f, 128.0f, 0.0f);
+    const float4 inColor = (inTexture.read(gid) * 255.0 - means) * 0.017;
+    outTexture.write(float4(inColor.z, inColor.y, inColor.x, 0.0f), gid);
 }
 
 kernel void mobilent_ar_preprocess_half(texture2d<half, access::read> inTexture [[texture(0)]], texture2d<half, access::write> outTexture [[texture(1)]], uint2 gid [[thread_position_in_grid]])
 {
-  if (gid.x >= outTexture.get_width() ||
-      gid.y >= outTexture.get_height()) {
-    return;
-  }
-  const auto means = half4(128.0f, 128.0f, 128.0f, 0.0f);
-  const half4 inColor = (inTexture.read(gid) * 255.0 - means) * 0.017;
-  outTexture.write(half4(inColor.z, inColor.y, inColor.x, 0.0f), gid);
+    if (gid.x >= outTexture.get_width() ||
+        gid.y >= outTexture.get_height()) {
+        return;
+    }
+    const auto means = half4(128.0f, 128.0f, 128.0f, 0.0f);
+    const half4 inColor = (inTexture.read(gid) * 255.0 - means) * 0.017;
+    outTexture.write(half4(inColor.z, inColor.y, inColor.x, 0.0f), gid);
 }

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

@@ -17,18 +17,22 @@ import Foundation
 import paddle_mobile
 
 public class YoloNet: Net {
-  @objc public override init(device: MTLDevice) {
-    super.init(device: device)
-    except = 0
-    modelPath = Bundle.main.path(forResource: "yolo_model", ofType: nil) ?! "model null"
-    paramPath = Bundle.main.path(forResource: "yolo_params", ofType: nil) ?! "para null"
-    inputDim = Dim.init(inDim: [1, 416, 416, 3])
-//    metalLoadMode = .LoadMetalInCustomMetalLib
-//    metalLibPath = Bundle.main.path(forResource: "PaddleMobileMetal", ofType: "metallib") ?! " can't be nil "
-  }
-
-  override  public func resultStr(res: ResultHolder) -> String {
-    return " \(res.result[0]) ... "
-  }
-  
+    @objc public override init(device: MTLDevice) {
+        super.init(device: device)
+        except = 0
+        modelPath = Bundle.main.path(forResource: "yolo_16_model", ofType: nil) ?! "model null"
+        paramPath = Bundle.main.path(forResource: "yolo_16_param", ofType: nil) ?! "para null"
+        inputDim = Dim.init(inDim: [1, 416, 416, 3])
+        metalLoadMode = .LoadMetalInCustomMetalLib
+        metalLibPath = Bundle.main.path(forResource: "paddle-mobile-metallib", ofType: "metallib")
+        useMPS = true
+        paramPrecision = .Float16
+        preprocessKernel = ScaleKernel.init(device: device, shape: Shape.init(inWidth: 416, inHeight: 416, inChannel: 3), metalLoadMode: .LoadMetalInCustomMetalLib, metalLibPath: Bundle.main.path(forResource: "paddle-mobile-metallib", ofType: "metallib"))
+        
+    }
+    
+    override  public func resultStr(res: [ResultHolder]) -> String {
+        return " \(res[0].result[0]) ... "
+    }
+    
 }

metal/paddle-mobile-demo/paddle-mobile-demo/OCDemo/LoadPointerViewController.h

@@ -14,6 +14,10 @@
 
 #import <UIKit/UIKit.h>
 
+
+/**
+ @b 从内存中加载模型 Demo, 可以在 main storyboard 中调整 Demo
+ */
 @interface LoadPointerViewController : UIViewController
 
 @end

metal/paddle-mobile-demo/paddle-mobile-demo/OCDemo/LoadPointerViewController.m

@@ -13,17 +13,20 @@
  limitations under the License. */
 
 #import "PaddleMobileGPU.h"
+#import "paddle_mobile_demo-Swift.h"
 #import "LoadPointerViewController.h"
-#import "paddle-mobile-demo-Bridging-Header.h"
 
 #import <Metal/Metal.h>
+#import <MetalKit/MetalKit.h>
 
 @interface LoadPointerViewController ()
 
-@property (strong, nonatomic) id<MTLDevice> device;
+@property (weak, nonatomic) IBOutlet UIImageView *imageView;
+
+@property (assign, nonatomic) BOOL loaded;
 @property (strong, nonatomic) id<MTLTexture> texture;
-@property (strong, nonatomic) id<MTLCommandQueue> queue;
-@property (strong, nonatomic) PaddleMobileGPU *runner;
+
+@property (strong, nonatomic) PaddleMobileGPU *paddleMobile;
 @property (strong, nonatomic) ModelConfig *modelConfig;
 
 @end
@@ -32,148 +35,82 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-  
-  
-  self.device = MTLCreateSystemDefaultDevice();
-  
-  self.queue = [self.device newCommandQueue];
-  
-    // Do any additional setup after loading the view.
-//  NSString *modelPath = [[NSBundle mainBundle] URLForResource:@"genet_model" withExtension:nil].path;
-//  NSString *paramPath = [[NSBundle mainBundle] URLForResource:@"genet_params" withExtension:nil].path;
-  
-  NSString *modelPath = [[NSBundle mainBundle] URLForResource:@"ar_model" withExtension:nil].path;
-  NSString *paramPath = [[NSBundle mainBundle] URLForResource:@"ar_params" withExtension:nil].path;
-
-  long fileSize;
-  FILE *fp;
-  fp = fopen([modelPath UTF8String], "rb");
-  fseek(fp, 0, SEEK_END);
-  fileSize = ftell(fp);
-  rewind(fp);
-  void *buffer = malloc(fileSize);
-  fread(buffer, 1, fileSize, fp);
-  fclose(fp);
-  
-  long paramfileSize;
-  FILE *parmaFilePointer;
-  parmaFilePointer = fopen([paramPath UTF8String], "rb");
-  fseek(parmaFilePointer, 0, SEEK_END);
-  paramfileSize = ftell(parmaFilePointer);
-  rewind(parmaFilePointer);
-  void *parmaBuffer = malloc(paramfileSize);
-  fread(parmaBuffer, 1, paramfileSize, parmaFilePointer);
-  fclose(parmaFilePointer);
-  
-  _modelConfig = [[ModelConfig alloc] init];
-//  _modelConfig.means = @[[NSNumber numberWithFloat:128.0], [NSNumber numberWithFloat:128.0], [NSNumber numberWithFloat:128.0]];
-//  _modelConfig.scale = 0.017;
-//  _modelConfig.dims = @[[NSNumber numberWithFloat:1], [NSNumber numberWithFloat:128.], [NSNumber numberWithFloat:128.0],[NSNumber numberWithFloat:3.0]];
-  _modelConfig.means = @[[NSNumber numberWithFloat:103.94], [NSNumber numberWithFloat:116.78], [NSNumber numberWithFloat:123.68]];
-  _modelConfig.scale = 1;
-  _modelConfig.dims = @[[NSNumber numberWithFloat:1], [NSNumber numberWithFloat:160.], [NSNumber numberWithFloat:160.0],[NSNumber numberWithFloat:3.0]];
-  _modelConfig.modelPointer = buffer;
-  _modelConfig.modelSize = (int)fileSize;
-  _modelConfig.paramPointer = parmaBuffer;
-  _modelConfig.paramSize = (int)paramfileSize;
+    
+    self.imageView.image = [UIImage imageNamed:@"banana.jpeg"];
+    
+    NSString *modelPath = [[NSBundle mainBundle] URLForResource:@"super_model" withExtension:nil].path;
+    NSString *paramPath = [[NSBundle mainBundle] URLForResource:@"super_params" withExtension:nil].path;
+    
+    long fileSize;
+    FILE *fp;
+    fp = fopen([modelPath UTF8String], "rb");
+    fseek(fp, 0, SEEK_END);
+    fileSize = ftell(fp);
+    rewind(fp);
+    void *buffer = malloc(fileSize);
+    fread(buffer, 1, fileSize, fp);
+    fclose(fp);
+    
+    long paramfileSize;
+    FILE *parmaFilePointer;
+    parmaFilePointer = fopen([paramPath UTF8String], "rb");
+    fseek(parmaFilePointer, 0, SEEK_END);
+    paramfileSize = ftell(parmaFilePointer);
+    rewind(parmaFilePointer);
+    void *parmaBuffer = malloc(paramfileSize);
+    fread(parmaBuffer, 1, paramfileSize, parmaFilePointer);
+    fclose(parmaFilePointer);
+    
+    _modelConfig = [[ModelConfig alloc] init];
+    _modelConfig.modelPointer = buffer;
+    _modelConfig.modelSize = (int)fileSize;
+    _modelConfig.paramPointer = parmaBuffer;
+    _modelConfig.paramSize = (int)paramfileSize;
 }
 - (IBAction)loaderButtonPressed:(id)sender {
-//  _runner = [[PaddleMobileGPU alloc] initWithCommandQueue:self.queue net:GenetType modelConfig:_modelConfig];
-  _runner = [[PaddleMobileGPU alloc] initWithCommandQueue:self.queue net:MobileNetSSDType modelConfig:_modelConfig];
-  
-  [_runner load];
+    self.paddleMobile = [[PaddleMobileGPU alloc] initWithCommandQueue:MetalHelper.shared.queue net:SuperResolutionNetType modelConfig:_modelConfig];
+    _loaded = [self.paddleMobile load];
+    NSLog(@" load 结果: %@", _loaded ? @"成功" : @"失败");
 }
 - (IBAction)predictButtonPressed:(id)sender {
-  [self predict];
-}
-
-- (id<MTLTexture>) createTextureFromImage:(UIImage*) image device:(id<MTLDevice>) device
-{
-  image  =[UIImage imageWithCGImage:[image CGImage]
-                              scale:[image scale]
-                        orientation: UIImageOrientationLeft];
-  
-  NSLog(@"orientation and size and stuff %ld %f %f", (long)image.imageOrientation, image.size.width, image.size.height);
-  
-  CGImageRef imageRef = image.CGImage;
-  
-  size_t width = self.view.frame.size.width;
-  size_t height = self.view.frame.size.height;
-  
-  size_t bitsPerComponent = CGImageGetBitsPerComponent(imageRef);
-  size_t bitsPerPixel = CGImageGetBitsPerPixel(imageRef);
-  
-  CGColorSpaceRef colorSpace = CGImageGetColorSpace(imageRef);
-  
-  CGImageAlphaInfo alphaInfo = CGImageGetAlphaInfo(imageRef);
-  
-  //  NSLog(@"%@ %u", colorSpace, alphaInfo);
-  
-  CGBitmapInfo bitmapInfo = kCGBitmapByteOrderDefault | alphaInfo;
-  //    NSLog(@"bitmap info %u", bitmapInfo);
-  
-  
-  CGContextRef context = CGBitmapContextCreate( NULL, width, height, bitsPerComponent, (bitsPerPixel / 8) * width, colorSpace, bitmapInfo);
-  
-  if( !context )
-  {
-    NSLog(@"Failed to load image, probably an unsupported texture type");
-    return nil;
-  }
-  
-  CGContextDrawImage( context, CGRectMake( 0, 0, width, height ), image.CGImage);
-  
-  
-  MTLPixelFormat format = MTLPixelFormatRGBA8Unorm;
-  
-  MTLTextureDescriptor *texDesc = [MTLTextureDescriptor texture2DDescriptorWithPixelFormat:format
-                                                                                     width:width
-                                                                                    height:height
-                                                                                 mipmapped:NO];
-  id<MTLTexture> texture = [device newTextureWithDescriptor:texDesc];
-  
-  [texture replaceRegion:MTLRegionMake2D(0, 0, width, height)
-             mipmapLevel:0
-               withBytes:CGBitmapContextGetData(context)
-             bytesPerRow:4 * width];
-  
-  return texture;
+    [self predict];
 }
 
 - (void)predict {
-  _texture = [self createTextureFromImage:[UIImage imageNamed:@"hand.jpg"] device:self.device];
-  NSTimeInterval startTime = [[NSDate date] timeIntervalSince1970];
-  NSInteger max = 428;
-  for (int i = 0;i < max; i ++) {
-    [_runner predict:_texture withCompletion:^(BOOL success , NSArray<NSNumber *> *result) {
-      if (success) {
-        if (i == max -1) {
-          double time = [[NSDate date] timeIntervalSince1970] - startTime;
-          time = (time/max)*1000;
-          NSLog(@"gap ==== %fms",time);
-        }
-//        for (int i = 0; i < result.count; i ++) {
-//          NSNumber *number = result[i];
-//          NSLog(@"result %d = %f:",i, [number floatValue]);
-//        }
-      }
-    }];
-  }
+    UIImage *image = self.imageView.image;
+    if (!image) {
+        NSLog(@" image is nil");
+        return;
+    }
+    id<MTLTexture> texture = [MetalHelper.shared.textureLoader newTextureWithCGImage:image.CGImage options:nil error:nil];
+    _texture = texture;
+    if (!_texture) {
+        NSLog(@" texture is nil");
+        return;
+    }
+    
+    if (!self.loaded) {
+        NSLog(@" not load ");
+        return;
+    }
+    
+    NSTimeInterval startTime = [[NSDate date] timeIntervalSince1970];
+    NSInteger max = 1;
+    for (int i = 0;i < max; i ++) {
+        [self.paddleMobile predict:_texture withCompletion:^(BOOL success , NSArray<NSNumber *> *result) {
+            if (success) {
+                if (i == max -1) {
+                    double time = [[NSDate date] timeIntervalSince1970] - startTime;
+                    time = (time/max)*1000;
+                    NSLog(@"gap ==== %fms",time);
+                }
+            }
+        }];
+    }
 }
-
-- (void)didReceiveMemoryWarning {
-    [super didReceiveMemoryWarning];
-    // Dispose of any resources that can be recreated.
-}
-
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-    // Get the new view controller using [segue destinationViewController].
-    // Pass the selected object to the new view controller.
+- (IBAction)clear:(id)sender {
+    [self.paddleMobile clear];
+    self.loaded = NO;
 }
-*/
 
 @end

metal/paddle-mobile-demo/paddle-mobile-demo/OCInterface/PaddleMobileGPU.h

@@ -16,8 +16,8 @@
 #import <Foundation/Foundation.h>
 
 typedef enum : NSUInteger {
-  SuperResolutionNetType,
-  MobileNetSSDType
+    SuperResolutionNetType,
+    MobileNetSSDType
 } NetType;
 
 @interface PaddleMobileGPUResult: NSObject
@@ -26,6 +26,8 @@ typedef enum : NSUInteger {
 
 @property (assign, nonatomic) int outputSize;
 
+@property (strong, nonatomic) NSArray <NSNumber *>*dim;
+
 -(void)releaseOutput;
 
 @end
@@ -88,13 +90,13 @@ typedef enum : NSUInteger {
  * texture:     需要进行预测的图像转换的 texture
  * completion:  预测完成回调
  */
--(void)predict:(id<MTLTexture>)texture withCompletion:(void (^)(BOOL, NSArray<NSNumber *> *))completion;
+-(void)predict:(id<MTLTexture>)texture withCompletion:(void (^)(BOOL, NSArray<NSArray <NSNumber *>*> *))completion;
 
 /*
  * texture:     需要进行预测的图像转换的 texture
  * completion:  预测完成回调
  */
--(void)predict:(id<MTLTexture>)texture withResultCompletion:(void (^)(BOOL, PaddleMobileGPUResult *))completion;
+-(void)predict:(id<MTLTexture>)texture withResultCompletion:(void (^)(BOOL, NSArray <PaddleMobileGPUResult *> *))completion;
 
 /*
  * 清理内存

metal/paddle-mobile-demo/paddle-mobile-demo/OCInterface/PaddleMobileGPU.m

@@ -30,65 +30,75 @@
 
 @implementation PaddleMobileGPUResult
 - (void)setOutputResult:(ResultHolder *)resultHolder {
-  self.resultHolder = resultHolder;
-  self.output = resultHolder.result;
-  self.outputSize = resultHolder.capacity;
+    self.resultHolder = resultHolder;
+    self.output = resultHolder.result;
+    self.outputSize = resultHolder.capacity;
 }
 
 -(void)releaseOutput {
-  [self.resultHolder releasePointer];
+    [self.resultHolder releasePointer];
 }
 @end
 
 @interface PaddleMobileGPU ()
 {
-  Runner *runner;
+    Runner *runner;
 }
 @end
 
 @implementation PaddleMobileGPU
 
 -(instancetype)initWithCommandQueue:(id<MTLCommandQueue>)queue net:(NetType)netType modelConfig:(ModelConfig *)config {
-  self = [super init];
-  if (self) {
-    Net *net = nil;
-    if (netType == SuperResolutionNetType) {
-      net = [[SuperResolutionNet alloc] initWithDevice:queue.device];
-    } else if (netType == MobileNetSSDType) {
-      net = [[MobileNet_ssd_AR alloc] initWithDevice:queue.device paramPointer:config.paramPointer paramSize:config.paramSize modePointer:config.modelPointer modelSize:config.modelSize];
+    self = [super init];
+    if (self) {
+        Net *net = nil;
+        if (netType == SuperResolutionNetType) {
+            net = [[SuperResolutionNet alloc] initWithDevice:queue.device inParamPointer:config.paramPointer inParamSize:config.paramSize inModelPointer:config.modelPointer inModelSize:config.modelSize];
+        } else if (netType == MobileNetSSDType) {
+            net = [[MobileNet_ssd_AR alloc] initWithDevice:queue.device inParamPointer:config.paramPointer inParamSize:config.paramSize inModelPointer:config.modelPointer inModelSize:config.modelSize];
+        }
+        runner = [[Runner alloc] initInNet:net commandQueue:queue];
     }
-    runner = [[Runner alloc] initInNet:net commandQueue:queue];
-  }
-  return self;
+    return self;
 }
 
 -(BOOL)load {
-  return [runner load];
+    return [runner load];
 }
 
--(void)predict:(id<MTLTexture>)texture withCompletion:(void (^)(BOOL, NSArray<NSNumber *> *))completion {
-  
-  [runner predictWithTexture:texture completion:^(BOOL success, ResultHolder * _Nullable result) {
-    NSMutableArray<NSNumber *> *resultArray = [NSMutableArray arrayWithCapacity:result.capacity];
-    for (int i = 0; i < result.capacity; ++i) {
-      [resultArray addObject:[NSNumber numberWithFloat:result.result[i]]];
-    }
-    completion(success, resultArray);
-    [result releasePointer];
+-(void)predict:(id<MTLTexture>)texture withCompletion:(void (^)(BOOL, NSArray<NSArray <NSNumber *>*> *))completion {
     
-  }];
+    [runner predictWithTexture:texture completion:^(BOOL success, NSArray<ResultHolder *> * _Nullable resultArr) {
+        NSMutableArray<NSMutableArray <NSNumber *>*> *ocResultArray = [NSMutableArray arrayWithCapacity:resultArr.count];
+        for (int i = 0; i < resultArr.count; ++i) {
+            ResultHolder *resultHolder = resultArr[i];
+            NSMutableArray <NSNumber *>*res = [NSMutableArray arrayWithCapacity:resultHolder.capacity];
+            for (int j = 0; j < resultHolder.capacity; ++j) {
+                [res addObject:[NSNumber numberWithFloat:resultHolder.result[i]]];
+            }
+            [ocResultArray addObject:res];
+            [resultHolder releasePointer];
+        }
+        completion(success, ocResultArray);
+    }];
 }
 
--(void)predict:(id<MTLTexture>)texture withResultCompletion:(void (^)(BOOL, PaddleMobileGPUResult *))completion {
-  [runner predictWithTexture:texture completion:^(BOOL success, ResultHolder * _Nullable result) {
-    PaddleMobileGPUResult *gpuResult = [[PaddleMobileGPUResult alloc] init];
-    [gpuResult setOutputResult:result];
-    completion(success, gpuResult);
-  }];
+-(void)predict:(id<MTLTexture>)texture withResultCompletion:(void (^)(BOOL, NSArray <PaddleMobileGPUResult *> *))completion {
+    [runner predictWithTexture:texture completion:^(BOOL success, NSArray<ResultHolder *> * _Nullable resultArr) {
+        NSMutableArray <PaddleMobileGPUResult *> *ocResultArr = [NSMutableArray arrayWithCapacity:resultArr.count];
+        for (int i = 0; i < resultArr.count; ++i) {
+            ResultHolder *result = resultArr[i];
+            PaddleMobileGPUResult *gpuResult = [[PaddleMobileGPUResult alloc] init];
+            gpuResult.dim = result.dim;
+            [gpuResult setOutputResult:result];
+            [ocResultArr addObject:gpuResult];
+        }
+        completion(success, ocResultArr);
+    }];
 }
 
 -(void)clear {
-  [runner clear];
+    [runner clear];
 }
 
 @end

metal/paddle-mobile-demo/paddle-mobile-demo/OCInterface/SuperResolutionNet.swift

@@ -16,45 +16,57 @@ import Foundation
 import paddle_mobile
 
 @objc public class SuperResolutionNet: Net{
-  override public func resultStr(res: ResultHolder) -> String {
-    return "未实现"
-  }
-  
-  @objc override public init(device: MTLDevice) {
-    super.init(device: device)
-    except = 0
-    modelPath = Bundle.main.path(forResource: "super_model", ofType: nil) ?! "model null"
-    paramPath = Bundle.main.path(forResource: "super_params", ofType: nil) ?! "para null"
-    preprocessKernel = nil
-    inputDim = Dim.init(inDim: [1, 224, 224, 1])
-//    metalLoadMode = .LoadMetalInCustomMetalLib
-//    metalLibPath = Bundle.main.path(forResource: "PaddleMobileMetal", ofType: "metallib") ?! " can't be nil "
-  }
-  
-  override public func updateProgram(program: Program) {
-    // n h w c
-    for block in program.programDesc.blocks {
-      for varDesc in block.vars {
-        if !varDesc.persistable {
-          if varDesc.type == .LodTensor {
-            let varEle = program.scope.vars[varDesc.name]
-            if let texture = varEle as? Texture {
-              let newDim = Dim.init(inDim: [texture.dim[0],  inputDim[1], inputDim[2], texture.tensorDim[1]])
-              print(" var desc name " + varDesc.name + " new dim" + "\(newDim)")
-              
-              texture.updateDims(inTensorDim: Dim.init(inDim: [texture.tensorDim[0], texture.tensorDim[1], inputDim[1], inputDim[2]]), inDim: newDim)
-              texture.initTexture(device: device, inTranspose: [0, 1, 2, 3], computePrecision: GlobalConfig.shared.computePrecision)
-              
-              let output: FetchHolder = program.scope.output() as! FetchHolder
-              output.dim = newDim
-              output.capacity = newDim.numel()
-              output.paddedCapacity = newDim.numel() * 4
-              output.initBuffer(device: device)
+    override public func resultStr(res: [ResultHolder]) -> String {
+        return "未实现"
+    }
+    
+    public override init(device: MTLDevice, inParamPointer: UnsafeMutableRawPointer, inParamSize: Int, inModelPointer: UnsafeMutableRawPointer, inModelSize: Int) {
+        super.init(device: device)
+        except = 0
+        metalLoadMode = .LoadMetalInCustomMetalLib
+        metalLibPath = Bundle.main.path(forResource: "paddle-mobile-metallib", ofType: "metallib")
+        inputDim = Dim.init(inDim: [1, 224, 224, 3])
+        self.paramPointer = inParamPointer
+        self.paramSize = inParamSize
+        self.modelPointer = inModelPointer
+        self.modelSize = inModelSize
+    }
+    
+    @objc override public init(device: MTLDevice) {
+        super.init(device: device)
+        except = 0
+        modelPath = Bundle.main.path(forResource: "super_model", ofType: nil) ?! "model null"
+        paramPath = Bundle.main.path(forResource: "super_params", ofType: nil) ?! "para null"
+        preprocessKernel = nil
+        inputDim = Dim.init(inDim: [1, 224, 224, 1])
+        metalLoadMode = .LoadMetalInCustomMetalLib
+        metalLibPath = Bundle.main.path(forResource: "paddle-mobile-metallib", ofType: "metallib")
+    }
+    
+    override public func updateProgram(program: Program) {
+        // n h w c
+        for block in program.programDesc.blocks {
+            for varDesc in block.vars {
+                if !varDesc.persistable {
+                    if varDesc.type == .LodTensor {
+                        let varEle = program.scope.vars[varDesc.name]
+                        if let texture = varEle as? Texture {
+                            let newDim = Dim.init(inDim: [texture.dim[0],  inputDim[1], inputDim[2], texture.tensorDim[1]])
+                            print(" var desc name " + varDesc.name + " new dim" + "\(newDim)")
+                            
+                            texture.updateDims(inTensorDim: Dim.init(inDim: [texture.tensorDim[0], texture.tensorDim[1], inputDim[1], inputDim[2]]), inDim: newDim)
+                            texture.initTexture(device: device, inTranspose: [0, 1, 2, 3], computePrecision: GlobalConfig.shared.computePrecision)
+                            
+                            let output: FetchHolder = program.scope.output() as! FetchHolder
+                            output.dim = newDim
+                            output.capacity = newDim.numel()
+                            output.paddedCapacity = newDim.numel() * 4
+                            output.initBuffer(device: device)
+                        }
+                    }
+                }
             }
-          }
         }
-      }
     }
-  }
 }
 

metal/paddle-mobile-demo/paddle-mobile-demo/VideoCapture/FPSCounter.swift

@@ -4,28 +4,28 @@ import Foundation
 import QuartzCore
 
 public class FPSCounter {
-  private(set) public var fps: Double = 0
-
-  var frames = 0
-  var startTime: CFTimeInterval = 0
-
-  public func start() {
-    frames = 0
-    startTime = CACurrentMediaTime()
-  }
-
-  public func frameCompleted() {
-    frames += 1
-    let now = CACurrentMediaTime()
-    let elapsed = now - startTime
-    if elapsed > 0.1 {
-      let current = Double(frames) / elapsed
-      let smoothing = 0.75
-      fps = smoothing*fps + (1 - smoothing)*current
-      if elapsed > 1 {
+    private(set) public var fps: Double = 0
+    
+    var frames = 0
+    var startTime: CFTimeInterval = 0
+    
+    public func start() {
         frames = 0
         startTime = CACurrentMediaTime()
-      }
     }
-  }
+    
+    public func frameCompleted() {
+        frames += 1
+        let now = CACurrentMediaTime()
+        let elapsed = now - startTime
+        if elapsed > 0.1 {
+            let current = Double(frames) / elapsed
+            let smoothing = 0.75
+            fps = smoothing*fps + (1 - smoothing)*current
+            if elapsed > 1 {
+                frames = 0
+                startTime = CACurrentMediaTime()
+            }
+        }
+    }
 }

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

@@ -6,15 +6,15 @@ import AVFoundation
 
 @available(iOS 10.0, *)
 @objc public protocol VideoCaptureDelegate: NSObjectProtocol {
-  @objc optional func videoCapture(_ capture: VideoCapture, didCaptureSampleBuffer sampleBuffer: CMSampleBuffer, timestamp: CMTime)
+    @objc optional func videoCapture(_ capture: VideoCapture, didCaptureSampleBuffer sampleBuffer: CMSampleBuffer, timestamp: CMTime)
     @objc optional func videoCapture(_ capture: VideoCapture, didCaptureVideoTexture texture: MTLTexture?, timestamp: CMTime)
     @objc optional func videoCapture(_ capture: VideoCapture, didCapturePhoto previewImage: UIImage?)
     @objc optional func videoCapture(_ capture: VideoCapture, didCapturePhotoTexture texture: MTLTexture?)
 }
 
 /**
-  Simple interface to the iPhone's camera.
-*/
+ Simple interface to the iPhone's camera.
+ */
 @available(iOS 10.0, *)
 public class VideoCapture: NSObject {
     public var previewLayer: AVCaptureVideoPreviewLayer?
@@ -35,9 +35,9 @@ public class VideoCapture: NSObject {
         self.cameraPosition = position
         super.init()
     }
-
+    
     public func setUp(sessionPreset: AVCaptureSession.Preset = .medium,
-                    completion: @escaping (Bool) -> Void) {
+                      completion: @escaping (Bool) -> Void) {
         queue.async {
             let success = self.setUpCamera(sessionPreset: sessionPreset)
             DispatchQueue.main.async {
@@ -45,7 +45,7 @@ public class VideoCapture: NSObject {
             }
         }
     }
-
+    
     func fontCamera() -> AVCaptureDevice? {
         let deveices = AVCaptureDevice.DiscoverySession.init(deviceTypes: [.builtInWideAngleCamera], mediaType: AVMediaType.video, position: .front).devices
         return deveices.first
@@ -62,7 +62,7 @@ public class VideoCapture: NSObject {
         
         captureSession.beginConfiguration()
         captureSession.sessionPreset = sessionPreset
-
+        
         var oCaptureDevice: AVCaptureDevice?
         switch cameraPosition {
         case .back:
@@ -79,56 +79,56 @@ public class VideoCapture: NSObject {
             print("Error: no video devices available")
             return false
         }
-
+        
         guard let videoInput = try? AVCaptureDeviceInput(device: captureDevice) else {
             print("Error: could not create AVCaptureDeviceInput")
             return false
         }
-
+        
         if captureSession.canAddInput(videoInput) {
             captureSession.addInput(videoInput)
         }
-
+        
         let previewLayer = AVCaptureVideoPreviewLayer(session: captureSession)
         previewLayer.videoGravity = AVLayerVideoGravity.resizeAspect
         previewLayer.connection?.videoOrientation = self.videoOrientation
         self.previewLayer = previewLayer
-
+        
         let settings: [String : Any] = [
-        kCVPixelBufferPixelFormatTypeKey as String: NSNumber(value: kCVPixelFormatType_32BGRA)
+            kCVPixelBufferPixelFormatTypeKey as String: NSNumber(value: kCVPixelFormatType_32BGRA)
         ]
-
+        
         videoOutput.videoSettings = settings
         videoOutput.alwaysDiscardsLateVideoFrames = true
         videoOutput.setSampleBufferDelegate(self, queue: queue)
         if captureSession.canAddOutput(videoOutput) {
             captureSession.addOutput(videoOutput)
         }
-
+        
         // We want the buffers to be in portrait orientation otherwise they are
         // rotated by 90 degrees. Need to set this _after_ addOutput()!
         videoOutput.connection(with: AVMediaType.video)?.videoOrientation = self.videoOrientation
-
+        
         if captureSession.canAddOutput(photoOutput) {
             captureSession.addOutput(photoOutput)
         }
-
+        
         captureSession.commitConfiguration()
         return true
     }
-
+    
     public func start() {
         if !captureSession.isRunning {
             captureSession.startRunning()
         }
     }
-
+    
     public func stop() {
         if captureSession.isRunning {
             captureSession.stopRunning()
         }
     }
-
+    
     /* Captures a single frame of the camera input. */
     public func capturePhoto() {
         let settings = AVCapturePhotoSettings(format: [kCVPixelBufferPixelFormatTypeKey as String: NSNumber(value: kCVPixelFormatType_32BGRA)])
@@ -139,7 +139,7 @@ public class VideoCapture: NSObject {
         ]
         photoOutput.capturePhoto(with: settings, delegate: self)
     }
-
+    
     func convertToMTLTexture(sampleBuffer: CMSampleBuffer?) -> MTLTexture? {
         if let textureCache = textureCache, let sampleBuffer = sampleBuffer, let imageBuffer = CMSampleBufferGetImageBuffer(sampleBuffer) {
             let width = CVPixelBufferGetWidth(imageBuffer)
@@ -152,7 +152,7 @@ public class VideoCapture: NSObject {
         }
         return nil
     }
-
+    
     func convertToUIImage(sampleBuffer: CMSampleBuffer?) -> UIImage? {
         if let sampleBuffer = sampleBuffer,
             let imageBuffer = CMSampleBufferGetImageBuffer(sampleBuffer) {
@@ -172,47 +172,47 @@ public class VideoCapture: NSObject {
 
 @available(iOS 10.0, *)
 extension VideoCapture: AVCaptureVideoDataOutputSampleBufferDelegate {
-  public func captureOutput(_ output: AVCaptureOutput, didOutput sampleBuffer: CMSampleBuffer, from connection: AVCaptureConnection) {
-    // Because lowering the capture device's FPS looks ugly in the preview,
-    // we capture at full speed but only call the delegate at its desired
-    // framerate. If `fps` is -1, we run at the full framerate.
-    let timestamp = CMSampleBufferGetPresentationTimeStamp(sampleBuffer)
-    let deltaTime = timestamp - lastTimestamp
-    if fps == -1 || deltaTime >= CMTimeMake(1, Int32(fps)) {
-        lastTimestamp = timestamp
-        self.delegate?.videoCapture?(self, didCaptureSampleBuffer: sampleBuffer, timestamp: timestamp)
-        if self.delegate?.responds(to: #selector(VideoCaptureDelegate.videoCapture(_:didCaptureVideoTexture:timestamp:))) ?? false{
-            let texture = convertToMTLTexture(sampleBuffer: sampleBuffer)
-            delegate?.videoCapture?(self, didCaptureVideoTexture: texture, timestamp: timestamp)
+    public func captureOutput(_ output: AVCaptureOutput, didOutput sampleBuffer: CMSampleBuffer, from connection: AVCaptureConnection) {
+        // Because lowering the capture device's FPS looks ugly in the preview,
+        // we capture at full speed but only call the delegate at its desired
+        // framerate. If `fps` is -1, we run at the full framerate.
+        let timestamp = CMSampleBufferGetPresentationTimeStamp(sampleBuffer)
+        let deltaTime = timestamp - lastTimestamp
+        if fps == -1 || deltaTime >= CMTimeMake(1, Int32(fps)) {
+            lastTimestamp = timestamp
+            self.delegate?.videoCapture?(self, didCaptureSampleBuffer: sampleBuffer, timestamp: timestamp)
+            if self.delegate?.responds(to: #selector(VideoCaptureDelegate.videoCapture(_:didCaptureVideoTexture:timestamp:))) ?? false{
+                let texture = convertToMTLTexture(sampleBuffer: sampleBuffer)
+                delegate?.videoCapture?(self, didCaptureVideoTexture: texture, timestamp: timestamp)
+            }
         }
     }
-  }
-
-  public func captureOutput(_ output: AVCaptureOutput, didDrop sampleBuffer: CMSampleBuffer, from connection: AVCaptureConnection) {
-    print("dropped frame")
-  }
+    
+    public func captureOutput(_ output: AVCaptureOutput, didDrop sampleBuffer: CMSampleBuffer, from connection: AVCaptureConnection) {
+        print("dropped frame")
+    }
 }
 
 @available(iOS 10.0, *)
 extension VideoCapture: AVCapturePhotoCaptureDelegate {
-  public func photoOutput(_ captureOutput: AVCapturePhotoOutput,
-                          didFinishProcessingPhoto photoSampleBuffer: CMSampleBuffer?,
-                          previewPhoto previewPhotoSampleBuffer: CMSampleBuffer?,
-                          resolvedSettings: AVCaptureResolvedPhotoSettings,
-                          bracketSettings: AVCaptureBracketedStillImageSettings?,
-                          error: Error?) {
-    var imageTexture: MTLTexture?
-    var previewImage: UIImage?
-    if error == nil {
-        if self.delegate?.responds(to: #selector(VideoCaptureDelegate.videoCapture(_:didCapturePhotoTexture:))) ?? false{
-            imageTexture = convertToMTLTexture(sampleBuffer: photoSampleBuffer)
-            self.delegate?.videoCapture?(self, didCapturePhotoTexture: imageTexture)
-        }
-        
-        if self.delegate?.responds(to: #selector(VideoCaptureDelegate.videoCapture(_:didCapturePhoto:))) ?? false{
-            previewImage = convertToUIImage(sampleBuffer: previewPhotoSampleBuffer)
-            self.delegate?.videoCapture?(self, didCapturePhoto: previewImage)
+    public func photoOutput(_ captureOutput: AVCapturePhotoOutput,
+                            didFinishProcessingPhoto photoSampleBuffer: CMSampleBuffer?,
+                            previewPhoto previewPhotoSampleBuffer: CMSampleBuffer?,
+                            resolvedSettings: AVCaptureResolvedPhotoSettings,
+                            bracketSettings: AVCaptureBracketedStillImageSettings?,
+                            error: Error?) {
+        var imageTexture: MTLTexture?
+        var previewImage: UIImage?
+        if error == nil {
+            if self.delegate?.responds(to: #selector(VideoCaptureDelegate.videoCapture(_:didCapturePhotoTexture:))) ?? false{
+                imageTexture = convertToMTLTexture(sampleBuffer: photoSampleBuffer)
+                self.delegate?.videoCapture?(self, didCapturePhotoTexture: imageTexture)
+            }
+            
+            if self.delegate?.responds(to: #selector(VideoCaptureDelegate.videoCapture(_:didCapturePhoto:))) ?? false{
+                previewImage = convertToUIImage(sampleBuffer: previewPhotoSampleBuffer)
+                self.delegate?.videoCapture?(self, didCapturePhoto: previewImage)
+            }
         }
     }
-  }
 }

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

@@ -19,264 +19,243 @@ import paddle_mobile
 import MetalPerformanceShaders
 
 class FileReader {
-  let file: UnsafeMutablePointer<FILE>
-  let fileSize: Int
-  init(paramPath: String) throws {
-    guard let tmpFile = fopen(paramPath, "rb") else {
-      throw PaddleMobileError.loaderError(message: "open param file error" + paramPath)
+    let file: UnsafeMutablePointer<FILE>
+    let fileSize: Int
+    init(paramPath: String) throws {
+        guard let tmpFile = fopen(paramPath, "rb") else {
+            throw PaddleMobileError.loaderError(message: "open param file error" + paramPath)
+        }
+        file = tmpFile
+        fseek(file, 0, SEEK_END)
+        fileSize = ftell(file)
+        guard fileSize > 0 else {
+            throw PaddleMobileError.loaderError(message: "param file size is too small")
+        }
+        rewind(file)
+    }
+    
+    func read<T>() -> UnsafeMutablePointer<T> {
+        let ptr = UnsafeMutablePointer<T>.allocate(capacity: MemoryLayout<T>.size * fileSize)
+        fread(ptr, fileSize, 1, file)
+        return ptr
     }
-    file = tmpFile
-    fseek(file, 0, SEEK_END)
-    fileSize = ftell(file)
-    guard fileSize > 0 else {
-      throw PaddleMobileError.loaderError(message: "param file size is too small")
+    
+    deinit {
+        fclose(file)
     }
-    rewind(file)
-  }
-  
-  func read<T>() -> UnsafeMutablePointer<T> {
-    let ptr = UnsafeMutablePointer<T>.allocate(capacity: MemoryLayout<T>.size * fileSize)
-    fread(ptr, fileSize, 1, file)
-    return ptr
-  }
-  
-  deinit {
-    fclose(file)
-  }
 }
 
 enum Platform {
-  case GPU
+    case GPU
 }
 
 let platformSupport: [(Platform, String)] = [(.GPU, "GPU")]
 
 enum SupportModel: String{
-  case yolo               = "yolo"
-  case mobilenet_combined = "mobilenet_combined"
-  case super_resolution   = "superresoltion"
-  case mobilenet          = "mobilenet"
-  
-  static func supportedModels() -> [SupportModel] {
-    return [.super_resolution, .yolo, .mobilenet_combined, .mobilenet]
-  }
+    case yolo               = "yolo"
+    case mobilenet_combined = "mobilenet_combined"
+    case super_resolution   = "superresoltion"
+    case mobilenet          = "mobilenet"
+    
+    static func supportedModels() -> [SupportModel] {
+        return [.super_resolution, .yolo, .mobilenet_combined, .mobilenet]
+    }
 }
 
 let netSupport: [SupportModel : Net] = [
-  .super_resolution : SuperResolutionNet.init(device: MetalHelper.shared.device),
-  .yolo : YoloNet.init(device: MetalHelper.shared.device),
-  .mobilenet_combined : MobileNetCombined.init(device: MetalHelper.shared.device),
-  .mobilenet : MobileNet.init(device: MetalHelper.shared.device)]
+    .super_resolution : SuperResolutionNet.init(device: MetalHelper.shared.device),
+    .yolo : YoloNet.init(device: MetalHelper.shared.device),
+    .mobilenet_combined : MobileNetCombined.init(device: MetalHelper.shared.device),
+    .mobilenet : MobileNet.init(device: MetalHelper.shared.device)]
 
 class ViewController: UIViewController {
-  @IBOutlet weak var resultTextView: UITextView!
-  @IBOutlet weak var selectImageView: UIImageView!
-  @IBOutlet weak var elapsedTimeLabel: UILabel!
-  @IBOutlet weak var modelPickerView: UIPickerView!
-  @IBOutlet weak var threadPickerView: UIPickerView!
-  @IBOutlet weak var videoView: UIView!
-  //  var videoCapture: VideoCapture!
-  
-  var selectImage: UIImage?
-  var inputPointer: UnsafeMutablePointer<Float32>?
-  var modelType: SupportModel = SupportModel.supportedModels()[0]
-  var toPredictTexture: MTLTexture?
-  
-  var runner: Runner!
-  var platform: Platform = .GPU
-  var threadNum = 1
-  
-  @IBAction func loadAct(_ sender: Any) {
-    runner = Runner.init(inNet: netSupport[modelType]!, commandQueue: MetalHelper.shared.queue)
-    if platform == .GPU {
-//      let filePath = Bundle.main.path(forResource: "mingren_input_data", ofType: nil)
-//      let fileReader = try! FileReader.init(paramPath: filePath!)
-//      let pointer: UnsafeMutablePointer<Float32> = fileReader.read()
-//      
-//      
-//      let buffer = MetalHelper.shared.device.makeBuffer(length: fileReader.fileSize, options: .storageModeShared)
-//      
-//      buffer?.contents().copyMemory(from: pointer, byteCount: fileReader.fileSize)
-      
-      
-      if self.toPredictTexture == nil {
-        
-//        runner.getTexture(inBuffer: buffer!) { [weak self] (texture) in
-//          self?.toPredictTexture = texture
-//        }
+    @IBOutlet weak var resultTextView: UITextView!
+    @IBOutlet weak var selectImageView: UIImageView!
+    @IBOutlet weak var elapsedTimeLabel: UILabel!
+    @IBOutlet weak var modelPickerView: UIPickerView!
+    @IBOutlet weak var threadPickerView: UIPickerView!
+    @IBOutlet weak var videoView: UIView!
+    //  var videoCapture: VideoCapture!
+    
+    var selectImage: UIImage?
+    var inputPointer: UnsafeMutablePointer<Float32>?
+    var modelType: SupportModel = SupportModel.supportedModels()[0]
+    var toPredictTexture: MTLTexture?
+    
+    var runner: Runner!
+    var platform: Platform = .GPU
+    var threadNum = 1
+    
+    @IBAction func loadAct(_ sender: Any) {
+        runner = Runner.init(inNet: netSupport[modelType]!, commandQueue: MetalHelper.shared.queue)
+        if platform == .GPU {
+            //      let filePath = Bundle.main.path(forResource: "mingren_input_data", ofType: nil)
+            //      let fileReader = try! FileReader.init(paramPath: filePath!)
+            //      let pointer: UnsafeMutablePointer<Float32> = fileReader.read()
+            //      
+            //      
+            //      let buffer = MetalHelper.shared.device.makeBuffer(length: fileReader.fileSize, options: .storageModeShared)
+            //      
+            //      buffer?.contents().copyMemory(from: pointer, byteCount: fileReader.fileSize)
+            
+            
+            if self.toPredictTexture == nil {
+                let beforeDate = Date.init()
+                if modelType == .mobilenet_combined || modelType == .yolo {
+                    self.toPredictTexture = try! MetalHelper.shared.textureLoader.newTexture(cgImage: selectImage!.cgImage!, options: nil)
+                } else {
+                    runner.getTexture(image: selectImage!.cgImage!) { [weak self] (texture) in
+                        let timeUse = Date.init().timeIntervalSince(beforeDate)
+                        print("get texture time use: \(timeUse)")
+                        self?.toPredictTexture = texture
+                    }
+                }
+            }
+        } else {
+            fatalError( " unsupport " )
+        }
         
-        runner.getTexture(image: selectImage!.cgImage!) { [weak self] (texture) in
-          self?.toPredictTexture = texture
+        if runner.load() {
+            print(" load success ! ")
+        } else {
+            print(" load error ! ")
         }
-      }
-    } else {
-      fatalError( " unsupport " )
     }
     
-    if runner.load() {
-      print(" load success ! ")
-    } else {
-      print(" load error ! ")
+    @IBAction func selectImageAct(_ sender: Any) {
+        let imagePicker = UIImagePickerController()
+        imagePicker.sourceType = .camera
+        imagePicker.delegate = self
+        self.present(imagePicker, animated: true, completion: nil)
     }
-  }
-  
-  @IBAction func selectImageAct(_ sender: Any) {
-    let imagePicker = UIImagePickerController()
-    imagePicker.sourceType = .camera
-    imagePicker.delegate = self
-    self.present(imagePicker, animated: true, completion: nil)
-  }
-  
-  @IBAction func clearAct(_ sender: Any) {
-    runner.clear()
-  }
-  
-  @IBAction func predictAct(_ sender: Any) {
-    let max = 1
-    switch platform {
-    case .GPU:
-      guard let inTexture = toPredictTexture else {
-        resultTextView.text = "请选择图片 ! "
-        return
-      }
-      
-      let startDate = Date.init()
-      for i in 0..<max {
-        self.runner.predict(texture: inTexture) { [weak self] (success, resultHolder)  in
-          guard let sSelf = self else {
-            fatalError()
-          }
-          
-          if success, let inResultHolder = resultHolder {
-            if i == max - 1 {
-              let time = Date.init().timeIntervalSince(startDate)
+    
+    @IBAction func clearAct(_ sender: Any) {
+        runner.clear()
+    }
+    
+    @IBAction func predictAct(_ sender: Any) {
+        let max = 1
+        switch platform {
+        case .GPU:
+            guard let inTexture = toPredictTexture else {
+                resultTextView.text = "请选择图片 ! "
+                return
+            }
             
-              print(inResultHolder.result.floatArr(count: inResultHolder.capacity).strideArray())
-              DispatchQueue.main.async {
-                sSelf.resultTextView.text = sSelf.runner.net.resultStr(res: resultHolder!)
-                sSelf.elapsedTimeLabel.text = "平均耗时: \(time/Double(max) * 1000.0) ms"
-              }
+            let startDate = Date.init()
+            for i in 0..<max {
+                self.runner.predict(texture: inTexture) { [weak self] (success, resultHolder)  in
+                    guard let sSelf = self else {
+                        fatalError()
+                    }
+                    
+                    if success, let inResultHolderArr = resultHolder {
+                        let inResultHolder = inResultHolderArr[0]
+                        if i == max - 1 {
+                            let time = Date.init().timeIntervalSince(startDate)
+                            
+                            print(inResultHolder.result.floatArr(count: inResultHolder.capacity).strideArray())
+                            DispatchQueue.main.async {
+                                sSelf.resultTextView.text = sSelf.runner.net.resultStr(res: resultHolder!)
+                                sSelf.elapsedTimeLabel.text = "平均耗时: \(time/Double(max) * 1000.0) ms"
+                            }
+                        }
+                    }
+                    
+                    DispatchQueue.main.async {
+                        resultHolder?.first?.releasePointer()
+                    }
+                }
             }
-          }
-          
-          DispatchQueue.main.async {
-            resultHolder?.releasePointer()
-          }
         }
-      }
     }
-  }
-  
-  override func viewDidLoad() {
-    super.viewDidLoad()
     
-    modelPickerView.delegate = self
-    modelPickerView.dataSource = self
-    threadPickerView.delegate = self
-    threadPickerView.dataSource = self
-    if let image = UIImage.init(named: "classify-img-output.png") {
-      selectImage = image
-      selectImageView.image = image
-    } else {
-      print("请添加测试图片")
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        GlobalConfig.shared.computePrecision = .Float16
+        GlobalConfig.shared.debug = false
+        
+        modelPickerView.delegate = self
+        modelPickerView.dataSource = self
+        threadPickerView.delegate = self
+        threadPickerView.dataSource = self
+        if let image = UIImage.init(named: "00001.jpg") {
+            selectImage = image
+            selectImageView.image = image
+        } else {
+            print("请添加测试图片")
+        }
     }
-    
-    GlobalConfig.shared.computePrecision = .Float32
-    
-    //    if platform == .CPU {
-    //      inputPointer = runner.preproccess(image: selectImage!.cgImage!)
-    //    } else if platform == .GPU {
-    //      runner.getTexture(image: selectImage!.cgImage!) {[weak self] (texture) in
-    //        self?.toPredictTexture = texture
-    //      }
-    //    } else {
-    //      fatalError( " unsupport " )
-    //    }
-    
-    //    videoCapture = VideoCapture.init(device: MetalHelper.shared.device, orientation: .portrait, position: .back)
-    //    videoCapture.fps = 30
-    //    videoCapture.delegate = self
-    //    videoCapture.setUp { (success) in
-    //      DispatchQueue.main.async {
-    //        if let preViewLayer = self.videoCapture.previewLayer {
-    //          self.videoView.layer.addSublayer(preViewLayer)
-    //          self.videoCapture.previewLayer?.frame = self.videoView.bounds
-    //        }
-    //        self.videoCapture.start()
-    //      }
-    //    }
-    
-  }
 }
 
 extension ViewController: UIPickerViewDataSource, UIPickerViewDelegate{
-  func numberOfComponents(in pickerView: UIPickerView) -> Int {
-    if pickerView == modelPickerView {
-      return 1
-    } else if pickerView == threadPickerView {
-      return 1
-    } else {
-      fatalError()
+    func numberOfComponents(in pickerView: UIPickerView) -> Int {
+        if pickerView == modelPickerView {
+            return 1
+        } else if pickerView == threadPickerView {
+            return 1
+        } else {
+            fatalError()
+        }
     }
-  }
-  
-  func pickerView(_ pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int {
-    if pickerView == modelPickerView {
-      return SupportModel.supportedModels().count
-    } else if pickerView == threadPickerView {
-      return platformSupport.count
-    } else {
-      fatalError()
+    
+    func pickerView(_ pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int {
+        if pickerView == modelPickerView {
+            return SupportModel.supportedModels().count
+        } else if pickerView == threadPickerView {
+            return platformSupport.count
+        } else {
+            fatalError()
+        }
     }
-  }
-  
-  public func pickerView(_ pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String? {
-    if pickerView == modelPickerView {
-      return SupportModel.supportedModels()[row].rawValue
-    } else if pickerView == threadPickerView {
-      return platformSupport[row].1
-    } else {
-      fatalError()
+    
+    public func pickerView(_ pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String? {
+        if pickerView == modelPickerView {
+            return SupportModel.supportedModels()[row].rawValue
+        } else if pickerView == threadPickerView {
+            return platformSupport[row].1
+        } else {
+            fatalError()
+        }
     }
-  }
-  
-  public func pickerView(_ pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {
-    if pickerView == modelPickerView {
-      self.modelType = SupportModel.supportedModels()[row]
-    } else if pickerView == threadPickerView {
-      platform = platformSupport[row].0
-    } else {
-      fatalError()
+    
+    public func pickerView(_ pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {
+        if pickerView == modelPickerView {
+            self.modelType = SupportModel.supportedModels()[row]
+        } else if pickerView == threadPickerView {
+            platform = platformSupport[row].0
+        } else {
+            fatalError()
+        }
     }
-  }
 }
 
 extension ViewController:  UIImagePickerControllerDelegate, UINavigationControllerDelegate {
-  func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [String : Any]) {
-    picker.dismiss(animated: true){[weak self] in
-      guard let sSelf = self, let image =  info["UIImagePickerControllerOriginalImage"] as? UIImage else{
-        fatalError("no image")
-      }
-      sSelf.selectImage = image
-      sSelf.selectImageView.image = image
-      sSelf.runner.getTexture(image: image.cgImage!, getTexture: { (texture) in
-        sSelf.toPredictTexture = texture
-      })
+    func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [String : Any]) {
+        picker.dismiss(animated: true){[weak self] in
+            guard let sSelf = self, let image =  info["UIImagePickerControllerOriginalImage"] as? UIImage else{
+                fatalError("no image")
+            }
+            sSelf.selectImage = image
+            sSelf.selectImageView.image = image
+            sSelf.runner.getTexture(image: image.cgImage!, getTexture: { (texture) in
+                sSelf.toPredictTexture = texture
+            })
+        }
     }
-  }
 }
 
 var bool1 = false
 extension ViewController: VideoCaptureDelegate{
-  func predictTexture(texture: MTLTexture){
-    runner.scaleTexture(input: texture) { (scaledTexture) in
-      self.runner.predict(texture: scaledTexture, completion: { (success, resultHolder) in
-        //        print(resultHolder!.result![0])
-        resultHolder?.releasePointer()
-      })
+    func predictTexture(texture: MTLTexture){
+        runner.scaleTexture(input: texture) { (scaledTexture) in
+            self.runner.predict(texture: scaledTexture, completion: { (success, resultHolder) in
+                resultHolder?.first?.releasePointer()
+            })
+        }
     }
-  }
-
+    
 }
 
 

metal/paddle-mobile-metallib/paddle-mobile-metallib.xcodeproj/project.xcworkspace/contents.xcworkspacedata

+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:paddle-mobile-metallib.xcodeproj">
+   </FileRef>
+</Workspace>

metal/paddle-mobile-metallib/paddle-mobile-metallib.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

metal/paddle-mobile-metallib/paddle-mobile-metallib.xcodeproj/xcshareddata/xcschemes/paddle-mobile-metallib.xcscheme

+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1010"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "FCC15D5F221E66DE00DC3CB2"
+               BuildableName = "paddle-mobile-metallib.metallib"
+               BlueprintName = "paddle-mobile-metallib"
+               ReferencedContainer = "container:paddle-mobile-metallib.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Release"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "FCC15D5F221E66DE00DC3CB2"
+            BuildableName = "paddle-mobile-metallib.metallib"
+            BlueprintName = "paddle-mobile-metallib"
+            ReferencedContainer = "container:paddle-mobile-metallib.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "FCC15D5F221E66DE00DC3CB2"
+            BuildableName = "paddle-mobile-metallib.metallib"
+            BlueprintName = "paddle-mobile-metallib"
+            ReferencedContainer = "container:paddle-mobile-metallib.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

metal/paddle-mobile/paddle-mobile/Src/Operators/Kernels/metal/BatchNormKernel.metal → metal/paddle-mobile-metallib/paddle-mobile-metallib/BatchNormKernel.metal

@@ -20,23 +20,23 @@ kernel void batchnorm(texture2d_array<float, access::read> inTexture [[texture(0
                       const device float4 * nscale [[buffer(0)]],
                       const device float4 * nbias [[buffer(1)]],
                       uint3 gid [[thread_position_in_grid]]) {
-  if (gid.x >= outTexture.get_width() ||
-      gid.y >= outTexture.get_height() ||
-      gid.z >= outTexture.get_array_size()) return;
-  const float4 input = inTexture.read(gid.xy, gid.z);
-  float4 output = input * nscale[gid.z] + nbias[gid.z];
-  outTexture.write(output, gid.xy, gid.z);
+    if (gid.x >= outTexture.get_width() ||
+        gid.y >= outTexture.get_height() ||
+        gid.z >= outTexture.get_array_size()) return;
+    const float4 input = inTexture.read(gid.xy, gid.z);
+    float4 output = input * nscale[gid.z] + nbias[gid.z];
+    outTexture.write(output, gid.xy, gid.z);
 }
 
 kernel void batchnorm_half(texture2d_array<half, access::read> inTexture [[texture(0)]],
-                      texture2d_array<half, access::write> outTexture [[texture(1)]],
-                      const device half4 * newScale [[buffer(0)]],
-                      const device half4 * newBias [[buffer(1)]],
-                      uint3 gid [[thread_position_in_grid]]) {
-  if (gid.x >= outTexture.get_width() ||
-      gid.y >= outTexture.get_height() ||
-      gid.z >= outTexture.get_array_size()) return;
-  const half4 input = inTexture.read(gid.xy, gid.z);
-  half4 output = input * newScale[gid.z] + newBias[gid.z];
-  outTexture.write(output, gid.xy, gid.z);
+                           texture2d_array<half, access::write> outTexture [[texture(1)]],
+                           const device half4 * newScale [[buffer(0)]],
+                           const device half4 * newBias [[buffer(1)]],
+                           uint3 gid [[thread_position_in_grid]]) {
+    if (gid.x >= outTexture.get_width() ||
+        gid.y >= outTexture.get_height() ||
+        gid.z >= outTexture.get_array_size()) return;
+    const half4 input = inTexture.read(gid.xy, gid.z);
+    half4 output = input * newScale[gid.z] + newBias[gid.z];
+    outTexture.write(output, gid.xy, gid.z);
 }

metal/paddle-mobile-metallib/paddle-mobile-metallib/BatchNormRelu.metal

+//
+//  BatchNormRelu.metal
+//  paddle-mobile
+//
+
+#include <metal_stdlib>
+using namespace metal;
+
+struct MetalConvParam {
+    short offsetX;
+    short offsetY;
+    short offsetZ;
+    ushort strideX;
+    ushort strideY;
+};
+
+kernel void batch_norm_relu_3x3(texture2d_array<float, access::sample> inTexture [[texture(0)]],
+                                texture2d_array<float, access::write> outTexture [[texture(1)]],
+                                const device float4 *new_scale [[buffer(0)]],
+                                const device float4 *new_biase [[buffer(1)]],
+                                uint3 gid [[thread_position_in_grid]]) {
+    
+    if (gid.x >= outTexture.get_width() ||
+        gid.y >= outTexture.get_height() ||
+        gid.z >= outTexture.get_array_size()) {
+        return;
+    }
+    
+    float4 input;
+    float4 output;
+    constexpr sampler sample(coord::pixel, filter::nearest, address::clamp_to_zero);
+    input = inTexture.sample(sample, gid.x, gid.y, gid.z);
+    output = fmax(input * new_scale[gid.z] + new_biase[gid.z], 0.0);
+    outTexture.write(output, gid.xy, gid.z);
+    
+}

metal/paddle-mobile/paddle-mobile/Src/Operators/Kernels/metal/BilinearInterp.inc.metal → metal/paddle-mobile-metallib/paddle-mobile-metallib/BilinearInterp.inc.metal

@@ -21,29 +21,29 @@
 #define VECTOR(p, n) CONCAT2(p, n)
 
 kernel void FUNC(bilinear_interp, P)(texture2d_array<P, access::read> input [[texture(0)]],
-                     texture2d_array<P, access::write> output [[texture(1)]],
-                     constant bilinear_interp_param & pm [[buffer(0)]],
-                     uint3 gid [[thread_position_in_grid]]) {
-  VECTOR(P, 4) r;
-  if ((input.get_width() == output.get_width()) && (input.get_height() == output.get_height())) {
-    r = input.read(gid.xy, gid.z);
-  } else {
-    P w = gid.x * pm.ratio_w;
-    P h = gid.y * pm.ratio_h;
-    uint w0 = w, h0 = h;
-    uint w1 = w0 + 1, h1 = h0 + 1;
-    P w1lambda = w - w0, h1lambda = h - h0;
-    P w2lambda = 1.0 - w1lambda, h2lambda = 1.0 - h1lambda;
-    if (w1 >= input.get_width()) w1 = w0;
-    if (h1 >= input.get_height()) h1 = h0;
-    VECTOR(P, 4) r0 = input.read(uint2(w0, h0), gid.z);
-    VECTOR(P, 4) r1 = input.read(uint2(w1, h0), gid.z);
-    VECTOR(P, 4) r2 = input.read(uint2(w0, h1), gid.z);
-    VECTOR(P, 4) r3 = input.read(uint2(w1, h1), gid.z);
-    r = h2lambda * (w2lambda * r0 + w1lambda * r1)
-      + h1lambda * (w2lambda * r2 + w1lambda * r3);
-  }
-  output.write(r, gid.xy, gid.z);
+                                     texture2d_array<P, access::write> output [[texture(1)]],
+                                     constant bilinear_interp_param & pm [[buffer(0)]],
+                                     uint3 gid [[thread_position_in_grid]]) {
+    VECTOR(P, 4) r;
+    if ((input.get_width() == output.get_width()) && (input.get_height() == output.get_height())) {
+        r = input.read(gid.xy, gid.z);
+    } else {
+        P w = gid.x * pm.ratio_w;
+        P h = gid.y * pm.ratio_h;
+        uint w0 = w, h0 = h;
+        uint w1 = w0 + 1, h1 = h0 + 1;
+        P w1lambda = w - w0, h1lambda = h - h0;
+        P w2lambda = 1.0 - w1lambda, h2lambda = 1.0 - h1lambda;
+        if (w1 >= input.get_width()) w1 = w0;
+            if (h1 >= input.get_height()) h1 = h0;
+                VECTOR(P, 4) r0 = input.read(uint2(w0, h0), gid.z);
+                VECTOR(P, 4) r1 = input.read(uint2(w1, h0), gid.z);
+                VECTOR(P, 4) r2 = input.read(uint2(w0, h1), gid.z);
+                VECTOR(P, 4) r3 = input.read(uint2(w1, h1), gid.z);
+                r = h2lambda * (w2lambda * r0 + w1lambda * r1)
+                + h1lambda * (w2lambda * r2 + w1lambda * r3);
+                }
+    output.write(r, gid.xy, gid.z);
 }
 
 #endif

metal/paddle-mobile/paddle-mobile/Src/Operators/Kernels/metal/BilinearInterp.metal → metal/paddle-mobile-metallib/paddle-mobile-metallib/BilinearInterp.metal

@@ -16,8 +16,8 @@
 using namespace metal;
 
 struct bilinear_interp_param {
-  float ratio_h;
-  float ratio_w;
+    float ratio_h;
+    float ratio_w;
 };
 
 #define P float

metal/paddle-mobile/paddle-mobile/Src/Operators/Kernels/metal/BoxCoder.inc.metal → metal/paddle-mobile-metallib/paddle-mobile-metallib/BoxCoder.inc.metal

@@ -20,35 +20,35 @@
 #define FUNC(f, p) CONCAT2_(f, p)
 #define VECTOR(p, n) CONCAT2(p, n)
 kernel void FUNC(boxcoder, P)(texture2d_array<P, access::read> priorBox [[texture(0)]],
-                     texture2d_array<P, access::read> priorBoxVar [[texture(1)]],
-                     texture2d_array<P, access::read> targetBox [[texture(2)]],
-                     texture2d_array<P, access::write> output[[texture(3)]],
-                     uint3 gid [[thread_position_in_grid]]) {
-  VECTOR(P, 4) p = priorBox.read(uint2(0, gid.x), gid.z);
-  VECTOR(P, 4) pv = priorBoxVar.read(uint2(0, gid.x), gid.z);
-  VECTOR(P, 4) t;
-  t[0] = targetBox.read(uint2(0, gid.x), gid.z)[0];
-  t[1] = targetBox.read(uint2(1, gid.x), gid.z)[0];
-  t[2] = targetBox.read(uint2(2, gid.x), gid.z)[0];
-  t[3] = targetBox.read(uint2(3, gid.x), gid.z)[0];
-  
-  P px = (p.x + p.z) / 2;
-  P py = (p.y + p.w) / 2;
-  P pw = p.z - p.x;
-  P ph = p.w - p.y;
-  
-  P tx = pv.x * t.x * pw + px;
-  P ty = pv.y * t.y * ph + py;
-  P tw = exp(pv.z * t.z) * pw;
-  P th = exp(pv.w * t.w) * ph;
-  
-  VECTOR(P, 4) r;
-  r.x = tx - tw / 2;
-  r.y = ty - th / 2;
-  r.z = tx + tw / 2;
-  r.w = ty + th / 2;
-
-  output.write(r, gid.xy, gid.z);
+                              texture2d_array<P, access::read> priorBoxVar [[texture(1)]],
+                              texture2d_array<P, access::read> targetBox [[texture(2)]],
+                              texture2d_array<P, access::write> output[[texture(3)]],
+                              uint3 gid [[thread_position_in_grid]]) {
+    VECTOR(P, 4) p = priorBox.read(uint2(0, gid.x), gid.z);
+    VECTOR(P, 4) pv = priorBoxVar.read(uint2(0, gid.x), gid.z);
+    VECTOR(P, 4) t;
+    t[0] = targetBox.read(uint2(0, gid.x), gid.z)[0];
+    t[1] = targetBox.read(uint2(1, gid.x), gid.z)[0];
+    t[2] = targetBox.read(uint2(2, gid.x), gid.z)[0];
+    t[3] = targetBox.read(uint2(3, gid.x), gid.z)[0];
+    
+    P px = (p.x + p.z) / 2;
+    P py = (p.y + p.w) / 2;
+    P pw = p.z - p.x;
+    P ph = p.w - p.y;
+    
+    P tx = pv.x * t.x * pw + px;
+    P ty = pv.y * t.y * ph + py;
+    P tw = exp(pv.z * t.z) * pw;
+    P th = exp(pv.w * t.w) * ph;
+    
+    VECTOR(P, 4) r;
+    r.x = tx - tw / 2;
+    r.y = ty - th / 2;
+    r.z = tx + tw / 2;
+    r.w = ty + th / 2;
+    
+    output.write(r, gid.xy, gid.z);
 }
 
 #endif

metal/paddle-mobile/paddle-mobile/Src/Operators/Kernels/metal/BufferToTexture.metal → metal/paddle-mobile-metallib/paddle-mobile-metallib/BufferToTexture.metal

@@ -13,24 +13,24 @@ kernel void buffer_to_texture_kernel(
                                      const device float *input [[buffer(0)]],
                                      texture2d<float, access::write> outTexture [[texture(0)]],
                                      uint2 gid [[thread_position_in_grid]]){
-  if (gid.x >= outTexture.get_width() ||
-      gid.y >= outTexture.get_height()) {
-    return;
-  }
-  
-  float y = input[outTexture.get_width() * gid.y + gid.x];
-  outTexture.write(float4(y, 0.0f, 0.0f, 0.0f), gid);
+    if (gid.x >= outTexture.get_width() ||
+        gid.y >= outTexture.get_height()) {
+        return;
+    }
+    
+    float y = input[outTexture.get_width() * gid.y + gid.x];
+    outTexture.write(float4(y, 0.0f, 0.0f, 0.0f), gid);
 }
 
 kernel void buffer_to_texture_kernel_half(const device float *input [[buffer(0)]],
                                           texture2d<half, access::write> outTexture [[texture(0)]],
                                           uint2 gid [[thread_position_in_grid]]){
-  if (gid.x >= outTexture.get_width() ||
-      gid.y >= outTexture.get_height()) {
-    return;
-  }
-  
-  float y = input[outTexture.get_width() * gid.y + gid.x];
-  outTexture.write(half4(y, 0.0f, 0.0f, 0.0f), gid);
+    if (gid.x >= outTexture.get_width() ||
+        gid.y >= outTexture.get_height()) {
+        return;
+    }
+    
+    float y = input[outTexture.get_width() * gid.y + gid.x];
+    outTexture.write(half4(y, 0.0f, 0.0f, 0.0f), gid);
 }
 

metal/paddle-mobile/paddle-mobile/Src/Operators/Kernels/metal/Common.metal → metal/paddle-mobile-metallib/paddle-mobile-metallib/Common.metal

@@ -17,104 +17,104 @@ using namespace metal;
 
 
 inline void xyzn2abcd_1(int xyzn[4], int abcd[4]) {
-  abcd[0] = abcd[1] = abcd[2] = 0;
-  abcd[3] = xyzn[0] * 4 + xyzn[3];
+    abcd[0] = abcd[1] = abcd[2] = 0;
+    abcd[3] = xyzn[0] * 4 + xyzn[3];
 }
 inline void xyzn2abcd_2(int xyzn[4], int abcd[4]) {
-  abcd[0] = abcd[1] = 0;
-  abcd[2] = xyzn[1];
-  abcd[3] = xyzn[0] * 4 + xyzn[3];
+    abcd[0] = abcd[1] = 0;
+    abcd[2] = xyzn[1];
+    abcd[3] = xyzn[0] * 4 + xyzn[3];
 }
 inline void xyzn2abcd_3(int xyzn[4], int abcd[4]) {
-  abcd[0] = 0;
-  abcd[3] = xyzn[0];
-  abcd[2] = xyzn[1];
-  abcd[1] = xyzn[2] * 4 + xyzn[3];
+    abcd[0] = 0;
+    abcd[3] = xyzn[0];
+    abcd[2] = xyzn[1];
+    abcd[1] = xyzn[2] * 4 + xyzn[3];
 }
 inline void xyzn2abcd_4(int C, int xyzn[4], int abcd[4]) {
-  abcd[2] = xyzn[0];
-  abcd[1] = xyzn[1];
-  uint t = xyzn[2] * 4 + xyzn[3];
-  abcd[0] = t / C;
-  abcd[3] = t % C;
+    abcd[2] = xyzn[0];
+    abcd[1] = xyzn[1];
+    uint t = xyzn[2] * 4 + xyzn[3];
+    abcd[0] = t / C;
+    abcd[3] = t % C;
 }
 
 inline void abcd2xyzn_1(int abcd[4], int xyzn[4]) {
-  xyzn[1] = xyzn[2] = 0;
-  xyzn[0] = abcd[3] / 4;
-  xyzn[1] = abcd[3] % 4;
+    xyzn[1] = xyzn[2] = 0;
+    xyzn[0] = abcd[3] / 4;
+    xyzn[1] = abcd[3] % 4;
 }
 inline void abcd2xyzn_2(int abcd[4], int xyzn[4]) {
-  xyzn[2] = 0;
-  xyzn[1] = abcd[2];
-  xyzn[0] = abcd[3] / 4;
-  xyzn[3] = abcd[3] % 4;
+    xyzn[2] = 0;
+    xyzn[1] = abcd[2];
+    xyzn[0] = abcd[3] / 4;
+    xyzn[3] = abcd[3] % 4;
 }
 inline void abcd2xyzn_3(int abcd[4], int xyzn[4]) {
-  xyzn[0] = abcd[3];
-  xyzn[1] = abcd[2];
-  xyzn[2] = abcd[1] / 4;
-  xyzn[3] = abcd[1] % 4;
+    xyzn[0] = abcd[3];
+    xyzn[1] = abcd[2];
+    xyzn[2] = abcd[1] / 4;
+    xyzn[3] = abcd[1] % 4;
 }
 inline void abcd2xyzn_4(int C, int abcd[4], int xyzn[4]) {
-  xyzn[0] = abcd[2];
-  xyzn[1] = abcd[1];
-  uint t = abcd[0] * C + abcd[3];
-  xyzn[2] = t / 4;
-  xyzn[3] = t % 4;
+    xyzn[0] = abcd[2];
+    xyzn[1] = abcd[1];
+    uint t = abcd[0] * C + abcd[3];
+    xyzn[2] = t / 4;
+    xyzn[3] = t % 4;
 }
 
 inline void xyzn2abcd(int C, int xyzn[4], int abcd[4]) {
-  abcd[2] = xyzn[0];
-  abcd[1] = xyzn[1];
-  uint t = xyzn[2] * 4 + xyzn[3];
-  abcd[0] = t / C;
-  abcd[3] = t % C;
+    abcd[2] = xyzn[0];
+    abcd[1] = xyzn[1];
+    uint t = xyzn[2] * 4 + xyzn[3];
+    abcd[0] = t / C;
+    abcd[3] = t % C;
 }
 
 inline void abcd2xyzn(int C, int abcd[4], int xyzn[4]) {
-  xyzn[0] = abcd[2];
-  xyzn[1] = abcd[1];
-  uint t = abcd[0] * C + abcd[3];
-  xyzn[2] = t / 4;
-  xyzn[3] = t % 4;
+    xyzn[0] = abcd[2];
+    xyzn[1] = abcd[1];
+    uint t = abcd[0] * C + abcd[3];
+    xyzn[2] = t / 4;
+    xyzn[3] = t % 4;
 }
 
 inline int32_t abcd2index(int32_t dim[4], int32_t abcd[4]) {
-  int32_t r = abcd[0];
-  r = r * dim[1] + abcd[1];
-  r = r * dim[2] + abcd[2];
-  r = r * dim[3] + abcd[3];
-  return r;
+    int32_t r = abcd[0];
+    r = r * dim[1] + abcd[1];
+    r = r * dim[2] + abcd[2];
+    r = r * dim[3] + abcd[3];
+    return r;
 }
 
 inline void index2abcd(int32_t dim[4], int32_t ind, int32_t abcd[4]) {
-  abcd[3] = ind % dim[3]; ind /= dim[3];
-  abcd[2] = ind % dim[2]; ind /= dim[2];
-  abcd[1] = ind % dim[1]; ind /= dim[1];
-  abcd[0] = ind;
+    abcd[3] = ind % dim[3]; ind /= dim[3];
+    abcd[2] = ind % dim[2]; ind /= dim[2];
+    abcd[1] = ind % dim[1]; ind /= dim[1];
+    abcd[0] = ind;
 }
 
 inline void trans(int32_t trans[4], int32_t ipos[4], int32_t opos[4]) {
-  for (int i = 0; i < 4; i++) {
-    opos[i] = ipos[trans[i]];
-  }
+    for (int i = 0; i < 4; i++) {
+        opos[i] = ipos[trans[i]];
+    }
 }
 
 inline void invtrans(int32_t trans[4], int32_t ipos[4], int32_t opos[4]) {
-  for (int i = 0; i < 4; i++) {
-    opos[trans[i]] = ipos[i];
-  }
+    for (int i = 0; i < 4; i++) {
+        opos[trans[i]] = ipos[i];
+    }
 }
 
 
 struct MetalConvParam {
-  short offsetX;
-  short offsetY;
-  short offsetZ;
-  ushort strideX;
-  ushort strideY;
-  ushort dilationX;
-  ushort dilationY;
+    short offsetX;
+    short offsetY;
+    short offsetZ;
+    ushort strideX;
+    ushort strideY;
+    ushort dilationX;
+    ushort dilationY;
 };
 

metal/paddle-mobile/paddle-mobile/Src/Operators/Kernels/metal/ConcatKernel.inc.metal → metal/paddle-mobile-metallib/paddle-mobile-metallib/ConcatKernel.inc.metal

@@ -42,73 +42,73 @@
 //                                     uint3 gid [[thread_position_in_grid]]) {
 //}
 kernel void FUNC(concat, R, N, VV, P)(texture2d_array<P, access::read> in0 [[texture(0)]],
-                                          texture2d_array<P, access::read> in1 [[texture(1)]],
+                                      texture2d_array<P, access::read> in1 [[texture(1)]],
 #if N >= 3
-                                          texture2d_array<P, access::read> in2 [[texture(2)]],
+                                      texture2d_array<P, access::read> in2 [[texture(2)]],
 #endif
 #if N >= 4
-                                          texture2d_array<P, access::read> in3 [[texture(3)]],
+                                      texture2d_array<P, access::read> in3 [[texture(3)]],
 #endif
 #if N >= 5
-                                          texture2d_array<P, access::read> in4 [[texture(4)]],
+                                      texture2d_array<P, access::read> in4 [[texture(4)]],
 #endif
 #if N >= 6
-                                          texture2d_array<P, access::read> in5 [[texture(5)]],
+                                      texture2d_array<P, access::read> in5 [[texture(5)]],
 #endif
-                                          texture2d_array<P, access::read> inx [[texture(N)]],
-                                          texture2d_array<P, access::write> out [[texture(N+1)]],
-                                          constant ConcatParam & pm [[buffer(0)]],
-                                          uint3 gid [[thread_position_in_grid]]) {
-
-   ConcatParam cp = pm;
-   int xyzn[4] = {int(gid.x), int(gid.y), int(gid.z), 0}, abcd[4], oxyzn[4];
-   VECTOR(P, 4) r = inx.read(gid.xy, gid.z);
-   for (int i = 0; i < 4; i++) {
-     xyzn[3] = i;
+                                      texture2d_array<P, access::read> inx [[texture(N)]],
+                                      texture2d_array<P, access::write> out [[texture(N+1)]],
+                                      constant ConcatParam & pm [[buffer(0)]],
+                                      uint3 gid [[thread_position_in_grid]]) {
+    
+    ConcatParam cp = pm;
+    int xyzn[4] = {int(gid.x), int(gid.y), int(gid.z), 0}, abcd[4], oxyzn[4];
+    VECTOR(P, 4) r = inx.read(gid.xy, gid.z);
+    for (int i = 0; i < 4; i++) {
+        xyzn[3] = i;
 #if R == 4
-     xyzn2abcd_4(cp.odim[3], xyzn, abcd);
+        xyzn2abcd_4(cp.odim[3], xyzn, abcd);
 #else
-     FUNC_R(xyzn2abcd, R)(xyzn, abcd);
+        FUNC_R(xyzn2abcd, R)(xyzn, abcd);
 #endif
-     int k = abcd[cp.axis] - cp.offset;
-     if (k < 0) continue;
-     int j = 0;
-     for (; j < N; j++) {
-       if (k < cp.vdim[j]) {
-         break;
-       }
-       k -= cp.vdim[j];
-     }
-     if (j == N) {
-       continue;
-     }
-     int ta = cp.odim[cp.axis];
-     abcd[cp.axis] = k;
-     cp.odim[cp.axis] = cp.vdim[j];
+        int k = abcd[cp.axis] - cp.offset;
+        if (k < 0) continue;
+        int j = 0;
+        for (; j < N; j++) {
+            if (k < cp.vdim[j]) {
+                break;
+            }
+            k -= cp.vdim[j];
+        }
+        if (j == N) {
+            continue;
+        }
+        int ta = cp.odim[cp.axis];
+        abcd[cp.axis] = k;
+        cp.odim[cp.axis] = cp.vdim[j];
 #if R == 4
-     abcd2xyzn_4(cp.odim[3], abcd, oxyzn);
+        abcd2xyzn_4(cp.odim[3], abcd, oxyzn);
 #else
-     FUNC_R(abcd2xyzn, R)(abcd, oxyzn);
+        FUNC_R(abcd2xyzn, R)(abcd, oxyzn);
 #endif
-     cp.odim[cp.axis] = ta;
-     switch (j) {
-       case 0: r[i] = in0.read(uint2(oxyzn[0], oxyzn[1]), oxyzn[2])[oxyzn[3]]; break;
-       case 1: r[i] = in1.read(uint2(oxyzn[0], oxyzn[1]), oxyzn[2])[oxyzn[3]]; break;
+        cp.odim[cp.axis] = ta;
+        switch (j) {
+            case 0: r[i] = in0.read(uint2(oxyzn[0], oxyzn[1]), oxyzn[2])[oxyzn[3]]; break;
+            case 1: r[i] = in1.read(uint2(oxyzn[0], oxyzn[1]), oxyzn[2])[oxyzn[3]]; break;
 #if N >= 3
-       case 2: r[i] = in2.read(uint2(oxyzn[0], oxyzn[1]), oxyzn[2])[oxyzn[3]]; break;
+            case 2: r[i] = in2.read(uint2(oxyzn[0], oxyzn[1]), oxyzn[2])[oxyzn[3]]; break;
 #endif
 #if N >= 4
-       case 3: r[i] = in3.read(uint2(oxyzn[0], oxyzn[1]), oxyzn[2])[oxyzn[3]]; break;
+            case 3: r[i] = in3.read(uint2(oxyzn[0], oxyzn[1]), oxyzn[2])[oxyzn[3]]; break;
 #endif
 #if N >= 5
-       case 4: r[i] = in4.read(uint2(oxyzn[0], oxyzn[1]), oxyzn[2])[oxyzn[3]]; break;
+            case 4: r[i] = in4.read(uint2(oxyzn[0], oxyzn[1]), oxyzn[2])[oxyzn[3]]; break;
 #endif
 #if N >= 6
-       case 5: r[i] = in5.read(uint2(oxyzn[0], oxyzn[1]), oxyzn[2])[oxyzn[3]]; break;
+            case 5: r[i] = in5.read(uint2(oxyzn[0], oxyzn[1]), oxyzn[2])[oxyzn[3]]; break;
 #endif
-     }
-   }
-   out.write(r, gid.xy, gid.z);
+        }
+    }
+    out.write(r, gid.xy, gid.z);
 }
 
 #endif // V == NORMAL
@@ -117,66 +117,66 @@ kernel void FUNC(concat, R, N, VV, P)(texture2d_array<P, access::read> in0 [[tex
 
 #if V == VX
 kernel void FUNC(concat, R, N, VV, P)(texture2d_array<P, access::read> in0 [[texture(0)]],
-                                          texture2d_array<P, access::read> in1 [[texture(1)]],
+                                      texture2d_array<P, access::read> in1 [[texture(1)]],
 #if N >= 3
-                                          texture2d_array<P, access::read> in2 [[texture(2)]],
+                                      texture2d_array<P, access::read> in2 [[texture(2)]],
 #endif // N >= 3
 #if N >= 4
-                                          texture2d_array<P, access::read> in3 [[texture(3)]],
+                                      texture2d_array<P, access::read> in3 [[texture(3)]],
 #endif // N >= 4
 #if N >= 5
-                                          texture2d_array<P, access::read> in4 [[texture(4)]],
+                                      texture2d_array<P, access::read> in4 [[texture(4)]],
 #endif // N >= 5
 #if N >= 6
-                                          texture2d_array<P, access::read> in5 [[texture(5)]],
+                                      texture2d_array<P, access::read> in5 [[texture(5)]],
 #endif // N >= 6
-                                          texture2d_array<P, access::write> out [[texture(N)]],
-                                          constant ConcatParam & pm [[buffer(0)]],
-                                          uint3 gid [[thread_position_in_grid]]) {
-  int x = gid.x - pm.offset;
-  if (x < 0) return;
-  if (x < pm.vdim[0]) {
-    VECTOR(P, 4) r = in0.read(gid.xy, gid.z);
-    out.write(r, gid.xy, gid.z);
-    return;
-  }
-  x -= pm.vdim[0];
-  if (x < pm.vdim[1]) {
-    VECTOR(P, 4) r = in1.read(uint2(x, gid.y), gid.z);
-    out.write(r, gid.xy, gid.z);
-    return;
-  }
+                                      texture2d_array<P, access::write> out [[texture(N)]],
+                                      constant ConcatParam & pm [[buffer(0)]],
+                                      uint3 gid [[thread_position_in_grid]]) {
+    int x = gid.x - pm.offset;
+    if (x < 0) return;
+    if (x < pm.vdim[0]) {
+        VECTOR(P, 4) r = in0.read(gid.xy, gid.z);
+        out.write(r, gid.xy, gid.z);
+        return;
+    }
+    x -= pm.vdim[0];
+    if (x < pm.vdim[1]) {
+        VECTOR(P, 4) r = in1.read(uint2(x, gid.y), gid.z);
+        out.write(r, gid.xy, gid.z);
+        return;
+    }
 #if N >= 3
-  x -= pm.vdim[1];
-  if (x < pm.vdim[2]) {
-    VECTOR(P, 4) r = in2.read(uint2(x, gid.y), gid.z);
-    out.write(r, gid.xy, gid.z);
-    return;
-  }
+    x -= pm.vdim[1];
+    if (x < pm.vdim[2]) {
+        VECTOR(P, 4) r = in2.read(uint2(x, gid.y), gid.z);
+        out.write(r, gid.xy, gid.z);
+        return;
+    }
 #endif // N >= 3
 #if N >= 4
-  x -= pm.vdim[2];
-  if (x < pm.vdim[3]) {
-    VECTOR(P, 4) r = in3.read(uint2(x, gid.y), gid.z);
-    out.write(r, gid.xy, gid.z);
-    return;
-  }
+    x -= pm.vdim[2];
+    if (x < pm.vdim[3]) {
+        VECTOR(P, 4) r = in3.read(uint2(x, gid.y), gid.z);
+        out.write(r, gid.xy, gid.z);
+        return;
+    }
 #endif // N >= 4
 #if N >= 5
-  x -= pm.vdim[3];
-  if (x < pm.vdim[4]) {
-    VECTOR(P, 4) r = in4.read(uint2(x, gid.y), gid.z);
-    out.write(r, gid.xy, gid.z);
-    return;
-  }
+    x -= pm.vdim[3];
+    if (x < pm.vdim[4]) {
+        VECTOR(P, 4) r = in4.read(uint2(x, gid.y), gid.z);
+        out.write(r, gid.xy, gid.z);
+        return;
+    }
 #endif // N >= 5
 #if N >= 6
-  x -= pm.vdim[4];
-  if (x < pm.vdim[5]) {
-    VECTOR(P, 4) r = in5.read(uint2(x, gid.y), gid.z);
-    out.write(r, gid.xy, gid.z);
-    return;
-  }
+    x -= pm.vdim[4];
+    if (x < pm.vdim[5]) {
+        VECTOR(P, 4) r = in5.read(uint2(x, gid.y), gid.z);
+        out.write(r, gid.xy, gid.z);
+        return;
+    }
 #endif // N >= 6
 }
 #endif // V == VX
@@ -199,50 +199,50 @@ kernel void FUNC(concat, R, N, VV, P)(texture2d_array<P, access::read> in0 [[tex
                                       texture2d_array<P, access::write> out [[texture(N)]],
                                       constant ConcatParam & pm [[buffer(0)]],
                                       uint3 gid [[thread_position_in_grid]]) {
-  int y = gid.y - pm.offset;
-  if (y < 0) return;
-  if (y < pm.vdim[0]) {
-    VECTOR(P, 4)  r = in0.read(gid.xy, gid.z);
-    out.write(r, gid.xy, gid.z);
-    return;
-  }
-  y -= pm.vdim[0];
-  if (y < pm.vdim[1]) {
-    VECTOR(P, 4)  r = in1.read(uint2(gid.x, y), gid.z);
-    out.write(r, gid.xy, gid.z);
-    return;
-  }
+    int y = gid.y - pm.offset;
+    if (y < 0) return;
+    if (y < pm.vdim[0]) {
+        VECTOR(P, 4)  r = in0.read(gid.xy, gid.z);
+        out.write(r, gid.xy, gid.z);
+        return;
+    }
+    y -= pm.vdim[0];
+    if (y < pm.vdim[1]) {
+        VECTOR(P, 4)  r = in1.read(uint2(gid.x, y), gid.z);
+        out.write(r, gid.xy, gid.z);
+        return;
+    }
 #if N >= 3
-  y -= pm.vdim[1];
-  if (y < pm.vdim[2]) {
-    VECTOR(P, 4)  r = in2.read(uint2(gid.x, y), gid.z);
-    out.write(r, gid.xy, gid.z);
-    return;
-  }
+    y -= pm.vdim[1];
+    if (y < pm.vdim[2]) {
+        VECTOR(P, 4)  r = in2.read(uint2(gid.x, y), gid.z);
+        out.write(r, gid.xy, gid.z);
+        return;
+    }
 #endif // N >= 3
 #if N >= 4
-  y -= pm.vdim[2];
-  if (y < pm.vdim[3]) {
-    VECTOR(P, 4)  r = in3.read(uint2(gid.x, y), gid.z);
-    out.write(r, gid.xy, gid.z);
-    return;
-  }
+    y -= pm.vdim[2];
+    if (y < pm.vdim[3]) {
+        VECTOR(P, 4)  r = in3.read(uint2(gid.x, y), gid.z);
+        out.write(r, gid.xy, gid.z);
+        return;
+    }
 #endif // N >= 4
 #if N >= 5
-  y -= pm.vdim[3];
-  if (y < pm.vdim[4]) {
-    VECTOR(P, 4)  r = in4.read(uint2(gid.x, y), gid.z);
-    out.write(r, gid.xy, gid.z);
-    return;
-  }
+    y -= pm.vdim[3];
+    if (y < pm.vdim[4]) {
+        VECTOR(P, 4)  r = in4.read(uint2(gid.x, y), gid.z);
+        out.write(r, gid.xy, gid.z);
+        return;
+    }
 #endif // N >= 5
 #if N >= 6
-  y -= pm.vdim[4];
-  if (y < pm.vdim[5]) {
-    VECTOR(P, 4)  r = in5.read(uint2(gid.x, y), gid.z);
-    out.write(r, gid.xy, gid.z);
-    return;
-  }
+    y -= pm.vdim[4];
+    if (y < pm.vdim[5]) {
+        VECTOR(P, 4)  r = in5.read(uint2(gid.x, y), gid.z);
+        out.write(r, gid.xy, gid.z);
+        return;
+    }
 #endif // N >= 6
 }
 #endif // V == VY
@@ -265,50 +265,50 @@ kernel void FUNC(concat, R, N, VV, P)(texture2d_array<P, access::read> in0 [[tex
                                       texture2d_array<P, access::write> out [[texture(N)]],
                                       constant ConcatParam & pm [[buffer(0)]],
                                       uint3 gid [[thread_position_in_grid]]) {
-  int z = gid.z - pm.offset;
-  if (z < 0) return;
-  if (z < pm.vdim[0]) {
-    VECTOR(P, 4) r = in0.read(gid.xy, gid.z);
-    out.write(r, gid.xy, gid.z);
-    return;
-  }
-  z -= pm.vdim[0];
-  if (z < pm.vdim[1]) {
-    VECTOR(P, 4)  r = in1.read(gid.xy, z);
-    out.write(r, gid.xy, gid.z);
-    return;
-  }
+    int z = gid.z - pm.offset;
+    if (z < 0) return;
+    if (z < pm.vdim[0]) {
+        VECTOR(P, 4) r = in0.read(gid.xy, gid.z);
+        out.write(r, gid.xy, gid.z);
+        return;
+    }
+    z -= pm.vdim[0];
+    if (z < pm.vdim[1]) {
+        VECTOR(P, 4)  r = in1.read(gid.xy, z);
+        out.write(r, gid.xy, gid.z);
+        return;
+    }
 #if N >= 3
-  z -= pm.vdim[1];
-  if (z < pm.vdim[2]) {
-    VECTOR(P, 4)  r = in2.read(gid.xy, z);
-    out.write(r, gid.xy, gid.z);
-    return;
-  }
+    z -= pm.vdim[1];
+    if (z < pm.vdim[2]) {
+        VECTOR(P, 4)  r = in2.read(gid.xy, z);
+        out.write(r, gid.xy, gid.z);
+        return;
+    }
 #endif // N >= 3
 #if N >= 4
-  z -= pm.vdim[2];
-  if (z < pm.vdim[3]) {
-    VECTOR(P, 4)  r = in3.read(gid.xy, z);
-    out.write(r, gid.xy, gid.z);
-    return;
-  }
+    z -= pm.vdim[2];
+    if (z < pm.vdim[3]) {
+        VECTOR(P, 4)  r = in3.read(gid.xy, z);
+        out.write(r, gid.xy, gid.z);
+        return;
+    }
 #endif // N >= 4
 #if N >= 5
-  z -= pm.vdim[3];
-  if (z < pm.vdim[4]) {
-    VECTOR(P, 4)  r = in4.read(gid.xy, z);
-    out.write(r, gid.xy, gid.z);
-    return;
-  }
+    z -= pm.vdim[3];
+    if (z < pm.vdim[4]) {
+        VECTOR(P, 4)  r = in4.read(gid.xy, z);
+        out.write(r, gid.xy, gid.z);
+        return;
+    }
 #endif // N >= 5
 #if N >= 6
-  z -= pm.vdim[4];
-  if (z < pm.vdim[5]) {
-    VECTOR(P, 4)  r = in5.read(gid.xy, z);
-    out.write(r, gid.xy, gid.z);
-    return;
-  }
+    z -= pm.vdim[4];
+    if (z < pm.vdim[5]) {
+        VECTOR(P, 4)  r = in5.read(gid.xy, z);
+        out.write(r, gid.xy, gid.z);
+        return;
+    }
 #endif // N >= 6
 }
 #endif // V == VZ

metal/paddle-mobile/paddle-mobile/Src/Operators/Kernels/metal/ConcatKernel.metal → metal/paddle-mobile-metallib/paddle-mobile-metallib/ConcatKernel.metal

@@ -18,11 +18,11 @@
 using namespace metal;
 
 struct ConcatParam {
-  int32_t odim[4];
-  int32_t axis;
-  int32_t offset;
-  int32_t trans[4];
-  int32_t vdim[6];
+    int32_t odim[4];
+    int32_t axis;
+    int32_t offset;
+    int32_t trans[4];
+    int32_t vdim[6];
 };
 
 #define VNORMAL 1
@@ -41,129 +41,129 @@ struct ConcatParam {
 
 // ssd-ar: (R=3, N=5, V=x)
 #define V VX
-  #define R 3
-    #define N 5
-      #define P float
-        #include "ConcatKernel.inc.metal"
-      #undef P
-      #define P half
-        #include "ConcatKernel.inc.metal"
-      #undef P
-    #undef N
-  #undef R
+#define R 3
+#define N 5
+#define P float
+#include "ConcatKernel.inc.metal"
+#undef P
+#define P half
+#include "ConcatKernel.inc.metal"
+#undef P
+#undef N
+#undef R
 #undef V
 
 // ssd-ar: (R=2, N=5, V=x)
 #define V VX
-  #define R 2
-    #define N 5
-      #define P float
-        #include "ConcatKernel.inc.metal"
-      #undef P
-      #define P half
-        #include "ConcatKernel.inc.metal"
-      #undef P
-    #undef N
-  #undef R
+#define R 2
+#define N 5
+#define P float
+#include "ConcatKernel.inc.metal"
+#undef P
+#define P half
+#include "ConcatKernel.inc.metal"
+#undef P
+#undef N
+#undef R
 #undef V
 
 
 // ssd-ar: (R=3, N=2, V=y)
 #define V VY
-  #define R 3
-    #define N 2
-      #define P float
-        #include "ConcatKernel.inc.metal"
-      #undef P
-      #define P half
-        #include "ConcatKernel.inc.metal"
-      #undef P
-    #undef N
-  #undef R
+#define R 3
+#define N 2
+#define P float
+#include "ConcatKernel.inc.metal"
+#undef P
+#define P half
+#include "ConcatKernel.inc.metal"
+#undef P
+#undef N
+#undef R
 #undef V
 
 // ssd-ar: (R=4, N=3, V=z)
 #define V VZ
-  #define R 4
-    #define N 3
-      #define P float
-        #include "ConcatKernel.inc.metal"
-      #undef P
-      #define P half
-        #include "ConcatKernel.inc.metal"
-      #undef P
-    #undef N
-  #undef R
+#define R 4
+#define N 3
+#define P float
+#include "ConcatKernel.inc.metal"
+#undef P
+#define P half
+#include "ConcatKernel.inc.metal"
+#undef P
+#undef N
+#undef R
 #undef V
 
 
 // ssd: (R=2, N=6, V=y)
 #define V VY
-  #define R 2
-    #define N 6
-      #define P float
-        #include "ConcatKernel.inc.metal"
-      #undef P
-      #define P half
-        #include "ConcatKernel.inc.metal"
-      #undef P
-    #undef N
-  #undef R
+#define R 2
+#define N 6
+#define P float
+#include "ConcatKernel.inc.metal"
+#undef P
+#define P half
+#include "ConcatKernel.inc.metal"
+#undef P
+#undef N
+#undef R
 #undef V
 
 // ssd: (R=3, N=6, V=y)
 #define V VY
-  #define R 3
-    #define N 6
-      #define P float
-        #include "ConcatKernel.inc.metal"
-      #undef P
-      #define P half
-        #include "ConcatKernel.inc.metal"
-      #undef P
-    #undef N
-  #undef R
+#define R 3
+#define N 6
+#define P float
+#include "ConcatKernel.inc.metal"
+#undef P
+#define P half
+#include "ConcatKernel.inc.metal"
+#undef P
+#undef N
+#undef R
 #undef V
 
 #define V VNORMAL
-  #define R 4
-    #define N 2
-      #define P float
-        #include "ConcatKernel.inc.metal"
-      #undef P
-      #define P half
-        #include "ConcatKernel.inc.metal"
-      #undef P
-    #undef N
-  #undef R
+#define R 4
+#define N 2
+#define P float
+#include "ConcatKernel.inc.metal"
+#undef P
+#define P half
+#include "ConcatKernel.inc.metal"
+#undef P
+#undef N
+#undef R
 #undef V
 
 
 #define V VY
-  #define R 2
-    #define N 2
-      #define P float
-        #include "ConcatKernel.inc.metal"
-      #undef P
-      #define P half
-        #include "ConcatKernel.inc.metal"
-      #undef P
-    #undef N
-  #undef R
+#define R 2
+#define N 2
+#define P float
+#include "ConcatKernel.inc.metal"
+#undef P
+#define P half
+#include "ConcatKernel.inc.metal"
+#undef P
+#undef N
+#undef R
 #undef V
 
 
 #define V VY
-  #define R 2
-    #define N 5
-      #define P float
-        #include "ConcatKernel.inc.metal"
-      #undef P
-      #define P half
-        #include "ConcatKernel.inc.metal"
-      #undef P
-    #undef N
-  #undef R
+#define R 2
+#define N 5
+#define P float
+#include "ConcatKernel.inc.metal"
+#undef P
+#define P half
+#include "ConcatKernel.inc.metal"
+#undef P
+#undef N
+#undef R
 #undef V
 
 

metal/paddle-mobile/paddle-mobile/Src/Operators/Kernels/metal/ConvAddPreluKernel.metal → metal/paddle-mobile-metallib/paddle-mobile-metallib/ConvAddPreluKernel.metal

@@ -18,45 +18,45 @@ using namespace metal;
 
 #define P float
 
-  #define PRELU_CHANNEL prelu_channel
-  #define PRELU_TYPE prelu_channel
-    #include "ConvAddPrelu.inc.metal"
-  #undef  PRELU_TYPE
-  #undef  PRELU_CHANNEL
+#define PRELU_CHANNEL prelu_channel
+#define PRELU_TYPE prelu_channel
+#include "ConvAddPrelu.inc.metal"
+#undef  PRELU_TYPE
+#undef  PRELU_CHANNEL
 
-  #define PRELU_ELEMENT prelu_element
-  #define PRELU_TYPE prelu_element
-    #include "ConvAddPrelu.inc.metal"
-  #undef  PRELU_TYPE
-  #undef  PRELU_ELEMENT
+#define PRELU_ELEMENT prelu_element
+#define PRELU_TYPE prelu_element
+#include "ConvAddPrelu.inc.metal"
+#undef  PRELU_TYPE
+#undef  PRELU_ELEMENT
 
-  #define PRELU_OTHER   prelu_other
-  #define PRELU_TYPE prelu_other
-    #include "ConvAddPrelu.inc.metal"
-  #undef  PRELU_TYPE
-  #undef  PRELU_OTHER
+#define PRELU_OTHER   prelu_other
+#define PRELU_TYPE prelu_other
+#include "ConvAddPrelu.inc.metal"
+#undef  PRELU_TYPE
+#undef  PRELU_OTHER
 
 #undef P
 
 #define P half
 
-  #define PRELU_CHANNEL prelu_channel
-  #define PRELU_TYPE prelu_channel
-    #include "ConvAddPrelu.inc.metal"
-  #undef  PRELU_TYPE
-  #undef  PRELU_CHANNEL
+#define PRELU_CHANNEL prelu_channel
+#define PRELU_TYPE prelu_channel
+#include "ConvAddPrelu.inc.metal"
+#undef  PRELU_TYPE
+#undef  PRELU_CHANNEL
 
-  #define PRELU_ELEMENT prelu_element
-  #define PRELU_TYPE prelu_element
-    #include "ConvAddPrelu.inc.metal"
-  #undef  PRELU_TYPE
-  #undef  PRELU_ELEMENT
+#define PRELU_ELEMENT prelu_element
+#define PRELU_TYPE prelu_element
+#include "ConvAddPrelu.inc.metal"
+#undef  PRELU_TYPE
+#undef  PRELU_ELEMENT
 
-  #define PRELU_OTHER   prelu_other
-  #define PRELU_TYPE prelu_other
-    #include "ConvAddPrelu.inc.metal"
-  #undef  PRELU_TYPE
-  #undef  PRELU_OTHER
+#define PRELU_OTHER   prelu_other
+#define PRELU_TYPE prelu_other
+#include "ConvAddPrelu.inc.metal"
+#undef  PRELU_TYPE
+#undef  PRELU_OTHER
 
 #undef P
 

metal/paddle-mobile-metallib/paddle-mobile-metallib/Elementwise.metal

+/* Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. */
+
+#include <metal_stdlib>
+#include "Common.metal"
+
+using namespace metal;
+
+struct ElementwiseAddParam {
+    int32_t fast;
+    int32_t axis;
+    int32_t ylen;
+    int32_t xdim[4];
+    int32_t xtrans[4];
+    int32_t ydim[4];
+    int32_t ytrans[4];
+};
+
+kernel void elementwise_add(texture2d_array<float, access::read> inputX [[texture(0)]],
+                            texture2d_array<float, access::read> inputY [[texture(1)]],
+                            texture2d_array<float, access::write> outTexture [[texture(2)]],
+                            constant ElementwiseAddParam &pm [[buffer(0)]],
+                            uint3 gid [[thread_position_in_grid]]) {
+    if (gid.x >= outTexture.get_width() ||
+        gid.y >= outTexture.get_height() ||
+        gid.z >= outTexture.get_array_size()) return;
+    float4 rx, ry;
+    
+    if (pm.fast == 1) {
+        rx = inputX.read(gid.xy, gid.z);
+        ry = inputY.read(gid.xy, gid.z);
+    } else {
+        rx = inputX.read(gid.xy, gid.z);
+        int32_t x_xyzn[4] = {int32_t(gid.x), int32_t(gid.y), int32_t(gid.z), 0}, x_abcd[4], t_abcd[4];
+        int32_t y_abcd[4] = {0, 0, 0, 0}, y_xyzn[4];
+        int32_t xtrans[4] = {pm.xtrans[0], pm.xtrans[1], pm.xtrans[2], pm.xtrans[3]};
+        int32_t ytrans[4] = {pm.ytrans[0], pm.ytrans[1], pm.ytrans[2], pm.ytrans[3]};
+        int32_t yshift = 4 - pm.ylen - pm.axis;
+        for (int n = 0; n < 4; n++) {
+            x_xyzn[3] = n;
+            xyzn2abcd(pm.xdim[3], x_xyzn, x_abcd);
+            invtrans(xtrans, x_abcd, t_abcd);
+            for (int k = pm.axis; k < (pm.axis + pm.ylen); k++) {
+                y_abcd[yshift+k] = t_abcd[k];
+            }
+            trans(ytrans, y_abcd, t_abcd);
+            abcd2xyzn(pm.ydim[3], t_abcd, y_xyzn);
+            ry[n] = inputY.read(uint2(y_xyzn[0], y_xyzn[1]), y_xyzn[2])[y_xyzn[3]];
+        }
+    }
+    float4 r = rx + ry;
+    outTexture.write(r, gid.xy, gid.z);
+}
+
+kernel void elementwise_add_half(texture2d_array<half, access::read> inputX [[texture(0)]],
+                                 texture2d_array<half, access::read> inputY [[texture(1)]],
+                                 texture2d_array<half, access::write> outTexture [[texture(2)]],
+                                 constant ElementwiseAddParam &pm [[buffer(0)]],
+                                 uint3 gid [[thread_position_in_grid]]) {
+    if (gid.x >= outTexture.get_width() ||
+        gid.y >= outTexture.get_height() ||
+        gid.z >= outTexture.get_array_size()) return;
+    half4 rx, ry;
+    
+    if (pm.fast == 1) {
+        rx = inputX.read(gid.xy, gid.z);
+        ry = inputY.read(gid.xy, gid.z);
+    } else {
+        rx = inputX.read(gid.xy, gid.z);
+        int32_t x_xyzn[4] = {int32_t(gid.x), int32_t(gid.y), int32_t(gid.z), 0}, x_abcd[4], t_abcd[4];
+        int32_t y_abcd[4] = {0, 0, 0, 0}, y_xyzn[4];
+        int32_t xtrans[4] = {pm.xtrans[0], pm.xtrans[1], pm.xtrans[2], pm.xtrans[3]};
+        int32_t ytrans[4] = {pm.ytrans[0], pm.ytrans[1], pm.ytrans[2], pm.ytrans[3]};
+        int32_t yshift = 4 - pm.ylen - pm.axis;
+        for (int n = 0; n < 4; n++) {
+            x_xyzn[3] = n;
+            xyzn2abcd(pm.xdim[3], x_xyzn, x_abcd);
+            invtrans(xtrans, x_abcd, t_abcd);
+            for (int k = pm.axis; k < (pm.axis + pm.ylen); k++) {
+                y_abcd[yshift+k] = t_abcd[k];
+            }
+            trans(ytrans, y_abcd, t_abcd);
+            abcd2xyzn(pm.ydim[3], t_abcd, y_xyzn);
+            ry[n] = inputY.read(uint2(y_xyzn[0], y_xyzn[1]), y_xyzn[2])[y_xyzn[3]];
+        }
+    }
+    half4 r = rx + ry;
+    outTexture.write(r, gid.xy, gid.z);
+}

metal/paddle-mobile/paddle-mobile/Src/Operators/Kernels/metal/FetchKernel.metal → metal/paddle-mobile-metallib/paddle-mobile-metallib/FetchKernel.metal

@@ -31,7 +31,7 @@ using namespace metal;
 kernel void fetch_placeholder(texture2d_array<float, access::read> inTexture [[texture(0)]],
                               device float *output [[buffer(0)]],
                               uint3 gid [[thread_position_in_grid]]) {
-  
+    
 }
 
 kernel void fetch_placeholder_half(texture2d_array<half, access::read> inTexture [[texture(0)]],