diff --git a/metal/PreluKernel/PreluKernel.xcodeproj/project.pbxproj b/metal/PreluKernel/PreluKernel.xcodeproj/project.pbxproj deleted file mode 100644 index 76f0abb36b0129ce1553816def0548fb514f2876..0000000000000000000000000000000000000000 --- a/metal/PreluKernel/PreluKernel.xcodeproj/project.pbxproj +++ /dev/null @@ -1,164 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 50; - objects = { - -/* Begin PBXBuildFile section */ - FCEB6843212F00CC00D2448E /* PreluKernel.metal in Sources */ = {isa = PBXBuildFile; fileRef = FCEB6842212F00CC00D2448E /* PreluKernel.metal */; }; -/* End PBXBuildFile section */ - -/* Begin PBXFileReference section */ - FCEB683F212F00CC00D2448E /* PreluKernel.metallib */ = {isa = PBXFileReference; explicitFileType = "archive.metal-library"; includeInIndex = 0; path = PreluKernel.metallib; sourceTree = BUILT_PRODUCTS_DIR; }; - FCEB6842212F00CC00D2448E /* PreluKernel.metal */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.metal; path = PreluKernel.metal; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXGroup section */ - FCEB6838212F00CC00D2448E = { - isa = PBXGroup; - children = ( - FCEB6841212F00CC00D2448E /* PreluKernel */, - FCEB6840212F00CC00D2448E /* Products */, - ); - sourceTree = ""; - }; - FCEB6840212F00CC00D2448E /* Products */ = { - isa = PBXGroup; - children = ( - FCEB683F212F00CC00D2448E /* PreluKernel.metallib */, - ); - name = Products; - sourceTree = ""; - }; - FCEB6841212F00CC00D2448E /* PreluKernel */ = { - isa = PBXGroup; - children = ( - FCEB6842212F00CC00D2448E /* PreluKernel.metal */, - ); - path = PreluKernel; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - FCEB683E212F00CC00D2448E /* PreluKernel */ = { - isa = PBXNativeTarget; - buildConfigurationList = FCEB6846212F00CC00D2448E /* Build configuration list for PBXNativeTarget "PreluKernel" */; - buildPhases = ( - FCEB683D212F00CC00D2448E /* Sources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = PreluKernel; - productName = PreluKernel; - productReference = FCEB683F212F00CC00D2448E /* PreluKernel.metallib */; - productType = "com.apple.product-type.metal-library"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - FCEB6839212F00CC00D2448E /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 0940; - ORGANIZATIONNAME = orange; - TargetAttributes = { - FCEB683E212F00CC00D2448E = { - CreatedOnToolsVersion = 9.4.1; - }; - }; - }; - buildConfigurationList = FCEB683C212F00CC00D2448E /* Build configuration list for PBXProject "PreluKernel" */; - compatibilityVersion = "Xcode 9.3"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - ); - mainGroup = FCEB6838212F00CC00D2448E; - productRefGroup = FCEB6840212F00CC00D2448E /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - FCEB683E212F00CC00D2448E /* PreluKernel */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXSourcesBuildPhase section */ - FCEB683D212F00CC00D2448E /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - FCEB6843212F00CC00D2448E /* PreluKernel.metal in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - FCEB6844212F00CC00D2448E /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - IPHONEOS_DEPLOYMENT_TARGET = 11.4; - MTL_ENABLE_DEBUG_INFO = YES; - SDKROOT = iphoneos; - }; - name = Debug; - }; - FCEB6845212F00CC00D2448E /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - IPHONEOS_DEPLOYMENT_TARGET = 11.4; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = iphoneos; - }; - name = Release; - }; - FCEB6847212F00CC00D2448E /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = Z5M2UUN5YV; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - FCEB6848212F00CC00D2448E /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = Z5M2UUN5YV; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - FCEB683C212F00CC00D2448E /* Build configuration list for PBXProject "PreluKernel" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - FCEB6844212F00CC00D2448E /* Debug */, - FCEB6845212F00CC00D2448E /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - FCEB6846212F00CC00D2448E /* Build configuration list for PBXNativeTarget "PreluKernel" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - FCEB6847212F00CC00D2448E /* Debug */, - FCEB6848212F00CC00D2448E /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = FCEB6839212F00CC00D2448E /* Project object */; -} diff --git a/metal/PreluKernel/PreluKernel.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/metal/PreluKernel/PreluKernel.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index bb481babbf9c954edbc2d32efb8eb41c70beb21c..0000000000000000000000000000000000000000 --- a/metal/PreluKernel/PreluKernel.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/metal/PreluKernel/PreluKernel.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/metal/PreluKernel/PreluKernel.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d981003d68d0546c4804ac2ff47dd97c6e7921..0000000000000000000000000000000000000000 --- a/metal/PreluKernel/PreluKernel.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/metal/PreluKernel/PreluKernel.xcodeproj/xcuserdata/liuruilong.xcuserdatad/xcschemes/xcschememanagement.plist b/metal/PreluKernel/PreluKernel.xcodeproj/xcuserdata/liuruilong.xcuserdatad/xcschemes/xcschememanagement.plist deleted file mode 100644 index 803d380b4d56c2270f2370cc5a1670b428d73793..0000000000000000000000000000000000000000 --- a/metal/PreluKernel/PreluKernel.xcodeproj/xcuserdata/liuruilong.xcuserdatad/xcschemes/xcschememanagement.plist +++ /dev/null @@ -1,14 +0,0 @@ - - - - - SchemeUserState - - PreluKernel.xcscheme - - orderHint - 0 - - - - diff --git a/metal/PreluKernel/PreluKernel/PreluKernel.metal b/metal/PreluKernel/PreluKernel/PreluKernel.metal deleted file mode 100644 index 7aa5e72ba9249ffe19152a9583ff103837d83f0b..0000000000000000000000000000000000000000 --- a/metal/PreluKernel/PreluKernel/PreluKernel.metal +++ /dev/null @@ -1,12 +0,0 @@ -// -// PreluKernel.metal -// PreluKernel -// -// Created by liuRuiLong on 2018/8/23. -// Copyright © 2018年 orange. All rights reserved. -// - -#include -using namespace metal; - - diff --git a/metal/paddle-mobile-demo/paddle-mobile-demo.xcodeproj/xcuserdata/liuruilong.xcuserdatad/xcschemes/paddle-mobile-demo.xcscheme b/metal/paddle-mobile-demo/paddle-mobile-demo.xcodeproj/xcuserdata/liuruilong.xcuserdatad/xcschemes/paddle-mobile-demo.xcscheme index 46c65bd36a9ab7027b1cb7a81533dcd553ccb62e..de579675e07b8ffb8869464bebe203b591fa7778 100644 --- a/metal/paddle-mobile-demo/paddle-mobile-demo.xcodeproj/xcuserdata/liuruilong.xcuserdatad/xcschemes/paddle-mobile-demo.xcscheme +++ b/metal/paddle-mobile-demo/paddle-mobile-demo.xcodeproj/xcuserdata/liuruilong.xcuserdatad/xcschemes/paddle-mobile-demo.xcscheme @@ -42,7 +42,7 @@ String { - fatalError() -// return " \(Array(res.suffix(10))) ... " +// fatalError() + return " \(res.result![0]) ... " } } diff --git a/metal/paddle-mobile/paddle-mobile/MobilenetSSD_AR.swift b/metal/paddle-mobile/paddle-mobile/MobilenetSSD_AR.swift index f90ba88d158538b473938cfee57bca89eec208ae..c3878688b95e15e79276762b8aef1ee03b5c1af5 100644 --- a/metal/paddle-mobile/paddle-mobile/MobilenetSSD_AR.swift +++ b/metal/paddle-mobile/paddle-mobile/MobilenetSSD_AR.swift @@ -35,7 +35,7 @@ public class MobileNet_ssd_AR: Net{ } override public func resultStr(res: ResultHolder) -> String { - return " \(res)" + return " \(res.result![0])" } override func fetchResult(paddleMobileRes: GPUResultHolder) -> ResultHolder { @@ -51,7 +51,7 @@ public class MobileNet_ssd_AR: Net{ fatalError() } - let startDate = Date.init() +// let startDate = Date.init() // print("scoreFormatArr: ") //print((0..