From 2eba19843f2a0361045cad81a83b515760600e0b Mon Sep 17 00:00:00 2001 From: liuruilong Date: Mon, 17 Sep 2018 21:08:34 +0800 Subject: [PATCH] remove mobilent ssd --- .../paddle-mobile-demo/ViewController.swift | 10 ++++++---- .../paddle-mobile/paddle-mobile/MobilenetSSD_AR.swift | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/metal/paddle-mobile-demo/paddle-mobile-demo/ViewController.swift b/metal/paddle-mobile-demo/paddle-mobile-demo/ViewController.swift index 02a8400e27..14b4920899 100644 --- a/metal/paddle-mobile-demo/paddle-mobile-demo/ViewController.swift +++ b/metal/paddle-mobile-demo/paddle-mobile-demo/ViewController.swift @@ -21,7 +21,8 @@ import MetalPerformanceShaders let platform: Platform = .GPU let threadSupport = [1] -let modelHelperMap: [SupportModel : Runner] = [.mobilenet_ssd : Runner.init(inNet: MobileNet_ssd_hand.init(device: MetalHelper.shared.device), commandQueue: MetalHelper.shared.queue, inPlatform: platform), +//.mobilenet_ssd : Runner.init(inNet: MobileNet_ssd_hand.init(device: MetalHelper.shared.device), commandQueue: MetalHelper.shared.queue, inPlatform: platform), +let modelHelperMap: [SupportModel : Runner] = [ .genet : Runner.init(inNet: Genet.init(device: MetalHelper.shared.device), commandQueue: MetalHelper.shared.queue, inPlatform: platform), .mobilenet_ssd_ar : Runner.init(inNet: MobileNet_ssd_AR.init(device: MetalHelper.shared.device), commandQueue: MetalHelper.shared.queue, inPlatform: platform)] //, .genet : Genet.init() @@ -29,13 +30,14 @@ let modelHelperMap: [SupportModel : Runner] = [.mobilenet_ssd : Runner.init(inNe enum SupportModel: String{ // case mobilenet = "mobilenet" - case mobilenet_ssd = "mobilenetssd" +// case mobilenet_ssd = "mobilenetssd" case genet = "genet" case mobilenet_ssd_ar = "mobilenetssd_ar" static func supportedModels() -> [SupportModel] { - //.mobilenet, - return [.genet, .mobilenet_ssd, .mobilenet_ssd_ar] + // .mobilenet, + // .mobilenet_ssd, + return [.genet, .mobilenet_ssd_ar] } } diff --git a/metal/paddle-mobile/paddle-mobile/MobilenetSSD_AR.swift b/metal/paddle-mobile/paddle-mobile/MobilenetSSD_AR.swift index 6073815339..f90ba88d15 100644 --- a/metal/paddle-mobile/paddle-mobile/MobilenetSSD_AR.swift +++ b/metal/paddle-mobile/paddle-mobile/MobilenetSSD_AR.swift @@ -51,7 +51,7 @@ public class MobileNet_ssd_AR: Net{ fatalError() } -// let startDate = Date.init() + let startDate = Date.init() // print("scoreFormatArr: ") //print((0..