From 69bd23af10506b0adae9b9795a00d4dc05b8a7fd Mon Sep 17 00:00:00 2001 From: "A. Unique TensorFlower" Date: Fri, 3 May 2019 10:04:25 -0700 Subject: [PATCH] Adds CocoaPods support to the Swift test app. PiperOrigin-RevId: 246527296 --- .gitignore | 8 ++++---- .../experimental/ios/TensorFlowLiteC.podspec | 2 +- tensorflow/lite/experimental/swift/BUILD.apple | 2 +- .../swift/TensorFlowLiteSwift.podspec | 1 - .../swift/TestApps/TensorFlowLiteApp/Podfile | 6 ++++++ .../TensorFlowLiteApp.xcodeproj/project.pbxproj | 17 +++++++++++++++-- .../Base.lproj/Main.storyboard | 7 ++++--- 7 files changed, 31 insertions(+), 12 deletions(-) create mode 100644 tensorflow/lite/experimental/swift/TestApps/TensorFlowLiteApp/Podfile diff --git a/.gitignore b/.gitignore index 2c1d30b6e53..99ba9312a92 100644 --- a/.gitignore +++ b/.gitignore @@ -34,12 +34,12 @@ local.properties gradleBuild # iOS -Podfile.lock -Pods *.pbxproj -*.xcworkspacedata +*.xcworkspace /*.podspec /tensorflow/lite/**/[ios|objc|swift]*/BUILD /tensorflow/lite/examples/ios/simple/data/*.tflite /tensorflow/lite/examples/ios/simple/data/*.txt -xcuserdata/** +Podfile.lock +Pods +xcuserdata diff --git a/tensorflow/lite/experimental/ios/TensorFlowLiteC.podspec b/tensorflow/lite/experimental/ios/TensorFlowLiteC.podspec index aeb54804044..3bbe68c1361 100644 --- a/tensorflow/lite/experimental/ios/TensorFlowLiteC.podspec +++ b/tensorflow/lite/experimental/ios/TensorFlowLiteC.podspec @@ -6,7 +6,7 @@ Pod::Spec.new do |s| s.authors = 'Google Inc.' s.license = { :type => 'Apache' } s.homepage = 'https://github.com/tensorflow/tensorflow' - s.source = { :http => "https://dl.google.com/dl/cpdc/e3b0c44298fc1c14/TensorFlowLiteC-#{s.version}.tar.gz" } + s.source = { :http => "https://dl.google.com/dl/cpdc/9d0ec5e53f4ff34a/TensorFlowLiteC-#{s.version}.tar.gz" } s.summary = 'TensorFlow Lite' s.description = <<-DESC diff --git a/tensorflow/lite/experimental/swift/BUILD.apple b/tensorflow/lite/experimental/swift/BUILD.apple index 44e73bd365c..a5a0c94e5b4 100644 --- a/tensorflow/lite/experimental/swift/BUILD.apple +++ b/tensorflow/lite/experimental/swift/BUILD.apple @@ -42,7 +42,7 @@ ios_application( sdk_frameworks = [ "CoreGraphics", ], - tags = TFL_DEFAULT_TAGS + ["manual"], + tags = TFL_DEFAULT_TAGS, deps = [ ":AppLib", ], diff --git a/tensorflow/lite/experimental/swift/TensorFlowLiteSwift.podspec b/tensorflow/lite/experimental/swift/TensorFlowLiteSwift.podspec index 6e08c32ad6d..6e83da0e2ba 100644 --- a/tensorflow/lite/experimental/swift/TensorFlowLiteSwift.podspec +++ b/tensorflow/lite/experimental/swift/TensorFlowLiteSwift.podspec @@ -16,7 +16,6 @@ Pod::Spec.new do |s| DESC s.ios.deployment_target = '9.0' - s.swift_version = '4.2' s.module_name = 'TensorFlowLite' s.static_framework = true diff --git a/tensorflow/lite/experimental/swift/TestApps/TensorFlowLiteApp/Podfile b/tensorflow/lite/experimental/swift/TestApps/TensorFlowLiteApp/Podfile new file mode 100644 index 00000000000..9c9fe28ab08 --- /dev/null +++ b/tensorflow/lite/experimental/swift/TestApps/TensorFlowLiteApp/Podfile @@ -0,0 +1,6 @@ +platform :ios, '9.0' + +target 'TensorFlowLiteApp' do + use_frameworks! + pod 'TensorFlowLiteSwift' +end diff --git a/tensorflow/lite/experimental/swift/TestApps/TensorFlowLiteApp/TensorFlowLiteApp.xcodeproj/project.pbxproj b/tensorflow/lite/experimental/swift/TestApps/TensorFlowLiteApp/TensorFlowLiteApp.xcodeproj/project.pbxproj index fbbf9a1de2c..eb5d65a1f87 100644 --- a/tensorflow/lite/experimental/swift/TestApps/TensorFlowLiteApp/TensorFlowLiteApp.xcodeproj/project.pbxproj +++ b/tensorflow/lite/experimental/swift/TestApps/TensorFlowLiteApp/TensorFlowLiteApp.xcodeproj/project.pbxproj @@ -7,6 +7,9 @@ objects = { /* Begin PBXBuildFile section */ + 4A1E2BA0227C8B53006C23E2 /* multi_add.bin in Resources */ = {isa = PBXBuildFile; fileRef = 4A1E2B9D227C8B51006C23E2 /* multi_add.bin */; }; + 4A1E2BA1227C8B53006C23E2 /* add_quantized.bin in Resources */ = {isa = PBXBuildFile; fileRef = 4A1E2B9E227C8B52006C23E2 /* add_quantized.bin */; }; + 4A1E2BA2227C8B53006C23E2 /* add.bin in Resources */ = {isa = PBXBuildFile; fileRef = 4A1E2B9F227C8B52006C23E2 /* add.bin */; }; 4A7304B421500B8400C90B21 /* Data+TensorFlowLite.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A7304B321500B8300C90B21 /* Data+TensorFlowLite.swift */; }; 4AA72B732146ED64006C3AEF /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4AA72B722146ED64006C3AEF /* AppDelegate.swift */; }; 4AA72B752146ED64006C3AEF /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4AA72B742146ED64006C3AEF /* ViewController.swift */; }; @@ -17,6 +20,9 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 4A1E2B9D227C8B51006C23E2 /* multi_add.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = multi_add.bin; path = ../../../../../testdata/multi_add.bin; sourceTree = ""; }; + 4A1E2B9E227C8B52006C23E2 /* add_quantized.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = add_quantized.bin; path = ../../../../../testdata/add_quantized.bin; sourceTree = ""; }; + 4A1E2B9F227C8B52006C23E2 /* add.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = add.bin; path = ../../../../../testdata/add.bin; sourceTree = ""; }; 4A7304B321500B8300C90B21 /* Data+TensorFlowLite.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Data+TensorFlowLite.swift"; sourceTree = ""; }; 4AA72B6F2146ED64006C3AEF /* TensorFlowLiteApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TensorFlowLiteApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; 4AA72B722146ED64006C3AEF /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -66,6 +72,9 @@ 4AA72B792146ED66006C3AEF /* Assets.xcassets */, 4AA72B7B2146ED66006C3AEF /* LaunchScreen.storyboard */, 4AA72B7E2146ED66006C3AEF /* Info.plist */, + 4A1E2B9E227C8B52006C23E2 /* add_quantized.bin */, + 4A1E2B9F227C8B52006C23E2 /* add.bin */, + 4A1E2B9D227C8B51006C23E2 /* multi_add.bin */, ); path = TensorFlowLiteApp; sourceTree = ""; @@ -102,6 +111,7 @@ TargetAttributes = { 4AA72B6E2146ED64006C3AEF = { CreatedOnToolsVersion = 9.4.1; + LastSwiftMigration = 1020; }; }; }; @@ -128,9 +138,12 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 4A1E2BA1227C8B53006C23E2 /* add_quantized.bin in Resources */, 4AA72B7D2146ED66006C3AEF /* LaunchScreen.storyboard in Resources */, 4AA72B7A2146ED66006C3AEF /* Assets.xcassets in Resources */, + 4A1E2BA2227C8B53006C23E2 /* add.bin in Resources */, 4AA72B782146ED64006C3AEF /* Main.storyboard in Resources */, + 4A1E2BA0227C8B53006C23E2 /* multi_add.bin in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -296,7 +309,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.tensorflow.lite.swift.TensorFlowLite; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -313,7 +326,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.tensorflow.lite.swift.TensorFlowLite; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; diff --git a/tensorflow/lite/experimental/swift/TestApps/TensorFlowLiteApp/TensorFlowLiteApp/Base.lproj/Main.storyboard b/tensorflow/lite/experimental/swift/TestApps/TensorFlowLiteApp/TensorFlowLiteApp/Base.lproj/Main.storyboard index b9e8bfb822f..5eab6d71a0b 100644 --- a/tensorflow/lite/experimental/swift/TestApps/TensorFlowLiteApp/TensorFlowLiteApp/Base.lproj/Main.storyboard +++ b/tensorflow/lite/experimental/swift/TestApps/TensorFlowLiteApp/TensorFlowLiteApp/Base.lproj/Main.storyboard @@ -1,17 +1,18 @@ - + - + + - +