Adds CocoaPods support to the Swift test app.

PiperOrigin-RevId: 246527296
This commit is contained in:
A. Unique TensorFlower 2019-05-03 10:04:25 -07:00 committed by TensorFlower Gardener
parent 2c8a1827df
commit 69bd23af10
7 changed files with 31 additions and 12 deletions

8
.gitignore vendored
View File

@ -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

View File

@ -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

View File

@ -42,7 +42,7 @@ ios_application(
sdk_frameworks = [
"CoreGraphics",
],
tags = TFL_DEFAULT_TAGS + ["manual"],
tags = TFL_DEFAULT_TAGS,
deps = [
":AppLib",
],

View File

@ -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

View File

@ -0,0 +1,6 @@
platform :ios, '9.0'
target 'TensorFlowLiteApp' do
use_frameworks!
pod 'TensorFlowLiteSwift'
end

View File

@ -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 = "<group>"; };
4A1E2B9E227C8B52006C23E2 /* add_quantized.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = add_quantized.bin; path = ../../../../../testdata/add_quantized.bin; sourceTree = "<group>"; };
4A1E2B9F227C8B52006C23E2 /* add.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = add.bin; path = ../../../../../testdata/add.bin; sourceTree = "<group>"; };
4A7304B321500B8300C90B21 /* Data+TensorFlowLite.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Data+TensorFlowLite.swift"; sourceTree = "<group>"; };
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 = "<group>"; };
@ -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 = "<group>";
@ -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;

View File

@ -1,17 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="tne-QT-ifu">
<objects>
<viewController storyboardIdentifier="viewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="BYZ-38-t0r" customClass="ViewController" customModule="AppLib" sceneMemberID="viewController">
<viewController storyboardIdentifier="viewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="BYZ-38-t0r" customClass="ViewController" customModule="TensorFlowLiteApp" customModuleProvider="target" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
<viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>