Merge branch 'develop' into develop

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

@@ -50,6 +50,7 @@
 		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 */
@@ -118,6 +119,7 @@
 		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>"; };
+		FCFADE33222F63CB0037DCE8 /* test_big.JPG */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = test_big.JPG; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -196,6 +198,7 @@
 		FC203FA821CBFDBA00B37166 /* images */ = {
 			isa = PBXGroup;
 			children = (
+				FCFADE33222F63CB0037DCE8 /* test_big.JPG */,
 				FC2BFCBF21DF279900C262B2 /* classify-img-output.png */,
 				FC2BFCBD21DF15D900C262B2 /* 123.jpg */,
 				FC2BFCBB21DF0A8600C262B2 /* 00001.jpg */,
@@ -389,6 +392,7 @@
 				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 */,

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"/>
@@ -320,6 +320,6 @@
         </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/ViewController.swift

@@ -105,7 +105,10 @@ class ViewController: UIViewController {
                 //          self?.toPredictTexture = texture
                 //        }
                 
+                let beforeDate = Date.init()
                 runner.getTexture(image: selectImage!.cgImage!) { [weak self] (texture) in
+                    let timeUse = Date.init().timeIntervalSince(beforeDate)
+                    print("get texture time use: \(timeUse)")
                     self?.toPredictTexture = texture
                 }
             }
@@ -178,7 +181,7 @@ class ViewController: UIViewController {
         modelPickerView.dataSource = self
         threadPickerView.delegate = self
         threadPickerView.dataSource = self
-        if let image = UIImage.init(named: "00001.jpg") {
+        if let image = UIImage.init(named: "test.jpg") {
             selectImage = image
             selectImageView.image = image
         } else {
@@ -249,7 +252,6 @@ 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?.first?.releasePointer()
             })
         }

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

@@ -758,7 +758,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/paddle-mobile/CPU",
 				);
-				MACH_O_TYPE = mh_dylib;
+				MACH_O_TYPE = staticlib;
 				MTL_LANGUAGE_REVISION = UseDeploymentTarget;
 				PRODUCT_BUNDLE_IDENTIFIER = "orange.paddle-mobile";
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
@@ -795,7 +795,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/paddle-mobile/CPU",
 				);
-				MACH_O_TYPE = mh_dylib;
+				MACH_O_TYPE = staticlib;
 				MTL_LANGUAGE_REVISION = UseDeploymentTarget;
 				PRODUCT_BUNDLE_IDENTIFIER = "orange.paddle-mobile";
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";

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

@@ -120,8 +120,6 @@ public class Executor<P: PrecisionType> {
              return
              */
             
-            
-            
             //输出 op 计算结果
             if GlobalConfig.shared.debug {
                 for i in 0..<SSelf.ops.count {