Merge pull request #1444 from codeWorm2015/develop

use metal lib project manager metal files

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/MobileNet.swift

@@ -46,7 +46,7 @@ public class MobileNet: Net{
     let firstRes = res[0]
     let resPointer = firstRes.result
     var s: [String] = []
-    (0..<res.capacity).map { resPointer[$0] }.top(r: 5).enumerated().forEach{
+    (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")
@@ -59,6 +59,8 @@ public class MobileNet: Net{
     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")
   }
 }
 

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

@@ -45,6 +45,7 @@
 		FC9797C721D609FB00F2FD90 /* synset.txt in Resources */ = {isa = PBXBuildFile; fileRef = FC9797C621D609FB00F2FD90 /* synset.txt */; };
 		FC9797CF21D6506F00F2FD90 /* mingren.jpg in Resources */ = {isa = PBXBuildFile; fileRef = FC9797CE21D6506F00F2FD90 /* mingren.jpg */; };
 		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 */; };
 		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, ); }; };
@@ -113,6 +114,7 @@
 		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>"; };
 		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>"; };
 		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>"; };
@@ -153,6 +155,7 @@
 		FC039B7520E11C550081E9F8 = {
 			isa = PBXGroup;
 			children = (
+				FCC15E14221E716400DC3CB2 /* paddle-mobile-metallib.metallib */,
 				FCEBEC2B20E1391F00C0B14D /* paddle_mobile.framework */,
 				FC039B8020E11C550081E9F8 /* paddle-mobile-demo */,
 				FC039B7F20E11C550081E9F8 /* Products */,
@@ -392,6 +395,7 @@
 				FC9797C221D608E000F2FD90 /* mobilenet_model in Resources */,
 				FC2BFCC021DF279900C262B2 /* classify-img-output.png in Resources */,
 				FC203FB221CBFDBA00B37166 /* test.jpg in Resources */,
+				FCC15E15221E716500DC3CB2 /* paddle-mobile-metallib.metallib in Resources */,
 				FC704C2321D237FC00F98BAB /* combined_mobilenet_model in Resources */,
 				FC9797C321D608E000F2FD90 /* mobilenet_params in Resources */,
 				FC704C2421D237FC00F98BAB /* yolo_params in Resources */,

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

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="4MS-jc-i6A">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
@@ -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,17 +300,23 @@
                             <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>

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(){
+@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/Net/Genet.swift

@@ -22,14 +22,18 @@ public class Genet: Net {
     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, paramPointer: UnsafeMutableRawPointer, paramSize:Int, modePointer: UnsafeMutableRawPointer, modelSize: Int) {
+  @objc override public init(device: MTLDevice, inParamPointer: UnsafeMutableRawPointer, inParamSize:Int, inModelPointer: UnsafeMutableRawPointer, inModelSize: Int) {
     super.init(device: device,
-               paramPointer: paramPointer,
-               paramSize: paramSize,
-               modePointer: modePointer,
-               modelSize: modelSize)
+               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])
   }

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

@@ -46,7 +46,7 @@ public class MobileNet: Net{
   override public func resultStr(res: [ResultHolder]) -> String {
     let resPointer = res[0].result
     var s: [String] = []
-    (0..<res.capacity).map { resPointer[$0] }.top(r: 5).enumerated().forEach{
+    (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")
@@ -61,6 +61,8 @@ public class MobileNet: Net{
 //    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

@@ -22,8 +22,8 @@ public class MobileNetCombined: Net {
     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 "
+    metalLoadMode = .LoadMetalInCustomMetalLib
+    metalLibPath = Bundle.main.path(forResource: "paddle-mobile-metallib", ofType: "metallib")
   }
   
   override  public func resultStr(res: [ResultHolder]) -> String {

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

@@ -21,19 +21,19 @@ public class MobileNet_ssd_hand: Net {
     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 "
+    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])
   }
   
-  @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)
+  @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: "PaddleMobileMetal", ofType: "metallib") ?! " can't be nil "
+    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])
   }

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

@@ -23,13 +23,17 @@ public class MobileNet_ssd_AR: Net {
     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")
   }
   
-  @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)
+  @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")
   }
   
   class MobilenetssdPreProccess: CusomKernel {

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

@@ -23,8 +23,8 @@ public class YoloNet: Net {
     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 "
+    metalLoadMode = .LoadMetalInCustomMetalLib
+    metalLibPath = Bundle.main.path(forResource: "paddle-mobile-metallib", ofType: "metallib")
   }
 
   override  public func resultStr(res: [ResultHolder]) -> String {

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
@@ -33,17 +36,10 @@
 - (void)viewDidLoad {
   [super viewDidLoad];
   
+  self.imageView.image = [UIImage imageNamed:@"banana.jpeg"];
   
-  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;
+  NSString *modelPath = [[NSBundle mainBundle] URLForResource:@"super_model" withExtension:nil].path;
+  NSString *paramPath = [[NSBundle mainBundle] URLForResource:@"super_params" withExtension:nil].path;
 
   long fileSize;
   FILE *fp;
@@ -66,114 +62,55 @@
   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;
 }
 - (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;
+- (void)predict {
+  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;
   }
   
-  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;
-}
+  if (!self.loaded) {
+    NSLog(@" not load ");
+    return;
+  }
   
-- (void)predict {
-  _texture = [self createTextureFromImage:[UIImage imageNamed:@"hand.jpg"] device:self.device];
   NSTimeInterval startTime = [[NSDate date] timeIntervalSince1970];
-  NSInteger max = 428;
+  NSInteger max = 1;
   for (int i = 0;i < max; i ++) {
-    [_runner predict:_texture withCompletion:^(BOOL success , NSArray<NSNumber *> *result) {
+    [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);
         }
-//        for (int i = 0; i < result.count; i ++) {
-//          NSNumber *number = result[i];
-//          NSLog(@"result %d = %f:",i, [number floatValue]);
-//        }
       }
     }];
   }
 }
-
-- (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.m

@@ -53,9 +53,9 @@
   if (self) {
     Net *net = nil;
     if (netType == SuperResolutionNetType) {
-      net = [[SuperResolutionNet alloc] initWithDevice:queue.device];
+      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 paramPointer:config.paramPointer paramSize:config.paramSize modePointer:config.modelPointer modelSize:config.modelSize];
+      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];
   }

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

@@ -20,6 +20,18 @@ import paddle_mobile
     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
@@ -27,8 +39,8 @@ import paddle_mobile
     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 "
+    metalLoadMode = .LoadMetalInCustomMetalLib
+    metalLibPath = Bundle.main.path(forResource: "paddle-mobile-metallib", ofType: "metallib")
   }
   
   override public func updateProgram(program: Program) {

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-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-metallib/paddle-mobile-metallib/ResizeBilinear.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>
+using namespace metal;
+
+struct resize_bilinear_param {
+//  int32_t out_h;
+//  int32_t out_w;
+  float ratio_h;
+  float ratio_w;
+};
+
+kernel void resize_bilinear(texture2d_array<float, access::read> input [[texture(0)]],
+                     texture2d_array<float, access::write> output [[texture(2)]],
+                     constant resize_bilinear_param & pm [[buffer(0)]],
+                     uint3 gid [[thread_position_in_grid]]) {
+  float4 r;
+  if ((input.get_width() == output.get_width()) && (input.get_height() == output.get_height())) {
+    r = input.read(gid.xy, gid.z);
+  } else {
+    float w = gid.x * pm.ratio_w;
+    float h = gid.y * pm.ratio_h;
+    uint w0 = w, h0 = h;
+    uint w1 = w0 + 1, h1 = h0 + 1;
+    float w1lambda = w - w0, h1lambda = h - h0;
+    float w2lambda = 1.0 - w1lambda, h2lambda = 1.0 - h1lambda;
+    if (w1 >= input.get_width()) w1 = w0;
+    if (h1 >= input.get_height()) h1 = h0;
+    float4 r0 = input.read(uint2(w0, h0), gid.z);
+    float4 r1 = input.read(uint2(w1, h0), gid.z);
+    float4 r2 = input.read(uint2(w0, h1), gid.z);
+    float4 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);
+}
+
+kernel void resize_bilinear_half(texture2d_array<half, access::read> input [[texture(0)]],
+                            texture2d_array<half, access::write> output [[texture(2)]],
+                            constant resize_bilinear_param & pm [[buffer(0)]],
+                            uint3 gid [[thread_position_in_grid]]) {
+  
+  half4 r;
+  if ((input.get_width() == output.get_width()) && (input.get_height() == output.get_height())) {
+    r = input.read(gid.xy, gid.z);
+  } else {
+    half w = gid.x * pm.ratio_w;
+    half h = gid.y * pm.ratio_h;
+    uint w0 = w, h0 = h;
+    uint w1 = w0 + 1, h1 = h0 + 1;
+    half w1lambda = w - w0, h1lambda = h - h0;
+    half w2lambda = 1.0 - w1lambda, h2lambda = 1.0 - h1lambda;
+    if (w1 >= input.get_width()) w1 = w0;
+    if (h1 >= input.get_height()) h1 = h0;
+    half4 r0 = input.read(uint2(w0, h0), gid.z);
+    half4 r1 = input.read(uint2(w1, h0), gid.z);
+    half4 r2 = input.read(uint2(w0, h1), gid.z);
+    half4 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);
+  output.write(r, gid.xy, gid.z);
+}

metal/paddle-mobile/paddle-mobile/API/Net.swift

@@ -57,11 +57,11 @@ import Foundation
   @objc public var inputDim: Dim = Dim.init(inDim: [])
   
   
-  @objc public init(device: MTLDevice, paramPointer: UnsafeMutableRawPointer, paramSize:Int, modePointer: UnsafeMutableRawPointer, modelSize: Int) {
-    self.paramPointer = paramPointer
-    self.paramSize = paramSize
-    self.modelPointer = modePointer
-    self.modelSize = modelSize
+  @objc public init(device: MTLDevice, inParamPointer: UnsafeMutableRawPointer, inParamSize:Int, inModelPointer: UnsafeMutableRawPointer, inModelSize: Int) {
+    self.paramPointer = inParamPointer
+    self.paramSize = inParamSize
+    self.modelPointer = inModelPointer
+    self.modelSize = inModelSize
     self.device = device
     super.init()
   }
@@ -80,7 +80,7 @@ import Foundation
       guard let inResPointer = gpuRes.resultPointer else {
         fatalError()
       }
-      return ResultHolder.init(inResult: inResPointer, inCapacity: paddleMobileRes.capacity, inDim: gpuRes.dim)
+      return ResultHolder.init(inResult: inResPointer, inCapacity: gpuRes.capacity, inDim: gpuRes.dim)
     }
   }
   

src/framework/loader.cpp

@@ -241,6 +241,7 @@ const Program<Device, T> Loader<Device, T>::LoadProgram(
   FusionAndPrintInfos(optimize, can_add_split, &program, originProgramDesc);
 
   paddle_mobile__framework__proto__program_desc__free_unpacked(c_program, NULL);
+  free(buf);
   return program;
 }
 

src/io/ios_io/PaddleMobileCPU.mm

@@ -96,6 +96,7 @@ static std::mutex shared_mutex;
 - (void)dealloc {
   if (pam_) {
     delete pam_;
+    pam_ = nullptr;
   }
 }