diff --git a/metal/paddle-mobile/paddle-mobile.xcodeproj/project.pbxproj b/metal/paddle-mobile/paddle-mobile.xcodeproj/project.pbxproj index 37b29b65bbdd48a89e1f3a16986817b0b341ba0d..29ea1ec64c724cfe3070a0599714f6f20453b9b5 100644 --- a/metal/paddle-mobile/paddle-mobile.xcodeproj/project.pbxproj +++ b/metal/paddle-mobile/paddle-mobile.xcodeproj/project.pbxproj @@ -46,6 +46,7 @@ FC292C81214255BD00CF622F /* CPUCompute.mm in Sources */ = {isa = PBXBuildFile; fileRef = FC292C7C214255BC00CF622F /* CPUCompute.mm */; }; FC292C82214255BD00CF622F /* MobileNetSSD.swift in Sources */ = {isa = PBXBuildFile; fileRef = FC292C7E214255BC00CF622F /* MobileNetSSD.swift */; }; FC292C85214257CB00CF622F /* CPUCompute.h in Headers */ = {isa = PBXBuildFile; fileRef = FC292C7D214255BC00CF622F /* CPUCompute.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FC292C872142624800CF622F /* Genet.swift in Sources */ = {isa = PBXBuildFile; fileRef = FC292C862142624800CF622F /* Genet.swift */; }; FC3602CC2108819F00FACB58 /* PaddleMobileUnitTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = FC3602CB2108819F00FACB58 /* PaddleMobileUnitTest.swift */; }; FC4CB74920F0B954007C0C6D /* ConvKernel.metal in Sources */ = {isa = PBXBuildFile; fileRef = FC4CB74820F0B954007C0C6D /* ConvKernel.metal */; }; FC4CB74B20F12C30007C0C6D /* ProgramOptimize.swift in Sources */ = {isa = PBXBuildFile; fileRef = FC4CB74A20F12C30007C0C6D /* ProgramOptimize.swift */; }; @@ -147,6 +148,7 @@ FC292C7C214255BC00CF622F /* CPUCompute.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = CPUCompute.mm; sourceTree = ""; }; FC292C7D214255BC00CF622F /* CPUCompute.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CPUCompute.h; sourceTree = ""; }; FC292C7E214255BC00CF622F /* MobileNetSSD.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MobileNetSSD.swift; sourceTree = ""; }; + FC292C862142624800CF622F /* Genet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Genet.swift; sourceTree = ""; }; FC3602CB2108819F00FACB58 /* PaddleMobileUnitTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaddleMobileUnitTest.swift; sourceTree = ""; }; FC4CB74820F0B954007C0C6D /* ConvKernel.metal */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.metal; path = ConvKernel.metal; sourceTree = ""; }; FC4CB74A20F12C30007C0C6D /* ProgramOptimize.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgramOptimize.swift; sourceTree = ""; }; @@ -256,6 +258,7 @@ FC039B6C20E11C3C0081E9F8 /* paddle-mobile */ = { isa = PBXGroup; children = ( + FC292C862142624800CF622F /* Genet.swift */, FC292C7E214255BC00CF622F /* MobileNetSSD.swift */, FC292C7C214255BC00CF622F /* CPUCompute.mm */, FC292C7D214255BC00CF622F /* CPUCompute.h */, @@ -581,6 +584,7 @@ FC039BAC20E11CBC0081E9F8 /* BatchNormOp.swift in Sources */, FCBCCC6F2123097100D94F7E /* MulticlassNMSOp.swift in Sources */, FC039BBC20E11CC20081E9F8 /* VarDesc.swift in Sources */, + FC292C872142624800CF622F /* Genet.swift in Sources */, 4AF928822135673D005B6C3A /* Concat.metal in Sources */, FCBCCC632122FCC000D94F7E /* TransposeKernel.swift in Sources */, FCBCCC71212309A700D94F7E /* MulticlassNMSKernel.swift in Sources */, diff --git a/metal/paddle-mobile/paddle-mobile/Genet.swift b/metal/paddle-mobile/paddle-mobile/Genet.swift index 8f9c909ad7f60e7121f22b6ce680d409ad9db153..2479cdf26ea09c933248c04ae99173ff0cfb7164 100644 --- a/metal/paddle-mobile/paddle-mobile/Genet.swift +++ b/metal/paddle-mobile/paddle-mobile/Genet.swift @@ -13,17 +13,20 @@ limitations under the License. */ import Foundation -import paddle_mobile class Genet: Net { - - -// var means: [Float] = [128.0, 128.0, 128.0] -// -// var scale: Float = 0.017 -// -// let except: Int = 0 -// + @objc override init(device: MTLDevice) { + super.init(device: device) + means = [128.0, 128.0, 128.0] + scale = 0.017 + except = 0 + modelPath = Bundle.main.path(forResource: "genet_model", ofType: nil) ?! "model null" + paramPath = Bundle.main.path(forResource: "genet_params", ofType: nil) ?! "para null" + modelDir = "" + preprocessKernel = GenetPreProccess.init(device: device) + dim = (n: 1, h: 128, w: 128, c: 3) + } + class GenetPreProccess: CusomKernel { init(device: MTLDevice) { let s = CusomKernel.Shape.init(inWidth: 128, inHeight: 128, inChannel: 3) @@ -32,21 +35,7 @@ class Genet: Net { } override func resultStr(res: [Float]) -> String { - return " \(Array(res.suffix(10))) ... " } -// var preprocessKernel: CusomKernel -// let dim = (n: 1, h: 128, w: 128, c: 3) -// let modelPath: String -// let paramPath: String -// let modelDir: String - - init(device: MTLDevice) { - modelPath = Bundle.main.path(forResource: "genet_model", ofType: nil) ?! "model null" - paramPath = Bundle.main.path(forResource: "genet_params", ofType: nil) ?! "para null" - modelDir = "" - preprocessKernel = GenetPreProccess.init(device: device) - } - } diff --git a/metal/paddle-mobile/paddle-mobile/MobileNetSSD.swift b/metal/paddle-mobile/paddle-mobile/MobileNetSSD.swift index 9213bea1256184a4564224f3e9593b8ebfae9875..a7901d05522aadac713a87ccb0861c13ea684ce4 100644 --- a/metal/paddle-mobile/paddle-mobile/MobileNetSSD.swift +++ b/metal/paddle-mobile/paddle-mobile/MobileNetSSD.swift @@ -13,12 +13,8 @@ limitations under the License. */ import Foundation -//import -//import pad - class MobileNet_ssd_hand: Net{ - @objc override init(device: MTLDevice) { super.init(device: device) means = [123.68, 116.78, 103.94]