izackp/onnxruntime-swift-package-manager
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Update for ORT 1.19.0 release (#21)

Browse Source
This commit is contained in:
Scott McKay
2024-08-28 15:46:43 +10:00
committed by GitHub
parent 11c7dd6dd4 6ede16e8fe
commit 6493bb55b6
5 changed files with 34 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.pipelines/mac-ios-spm-dev-validation-pipeline.yml
+1 -4
View File
@@ -6,15 +6,12 @@
vmImage: "macOS-13" vmImage: "macOS-13"
variables: variables:
xcodeVersion: "14.3"
artifactsName: "ios_packaging_artifacts_full" artifactsName: "ios_packaging_artifacts_full"
timeoutInMinutes: 60 timeoutInMinutes: 60
steps: steps:
- template: templates/use-xcode-version.yml - template: templates/use-xcode-version.yml
parameters:
xcodeVersion: ${{ variables.xcodeVersion }}
# Download artifacts from a specific pipeline # Download artifacts from a specific pipeline
# It consumes a latest dev version ORT iOS Pod which should match with the source code # It consumes a latest dev version ORT iOS Pod which should match with the source code
@@ -52,7 +49,7 @@
cd "$(Build.SourcesDirectory)" cd "$(Build.SourcesDirectory)"
cp "$(Build.ArtifactStagingDirectory)/$(artifactsName)/${POD_ARCHIVE}" swift/ cp "$(Build.ArtifactStagingDirectory)/$(artifactsName)/${POD_ARCHIVE}" swift/
export ORT_IOS_POD_LOCAL_PATH="swift/${POD_ARCHIVE}" export ORT_POD_LOCAL_PATH="swift/${POD_ARCHIVE}"
xcodebuild test -scheme onnxruntime-Package -destination 'platform=iOS Simulator,name=iPhone 14' xcodebuild test -scheme onnxruntime-Package -destination 'platform=iOS Simulator,name=iPhone 14'
xcodebuild test -scheme onnxruntime-Package -destination 'platform=macosx' xcodebuild test -scheme onnxruntime-Package -destination 'platform=macosx'
.pipelines/mac-ios-spm-extensions-validation-pipeline.yml
+2 -5
View File
@@ -6,7 +6,6 @@
vmImage: "macOS-13" vmImage: "macOS-13"
variables: variables:
xcodeVersion: "14.3"
artifactsName: "ios_packaging_artifacts_full" artifactsName: "ios_packaging_artifacts_full"
artifactsNameForExt: "ios_packaging_artifacts" artifactsNameForExt: "ios_packaging_artifacts"
@@ -14,8 +13,6 @@
steps: steps:
- template: templates/use-xcode-version.yml - template: templates/use-xcode-version.yml
parameters:
xcodeVersion: ${{ variables.xcodeVersion }}
- script: | - script: |
mkdir tmp mkdir tmp
@@ -86,9 +83,9 @@
cp -r "$(Build.SourcesDirectory)/extensions" . cp -r "$(Build.SourcesDirectory)/extensions" .
cp "$(Build.ArtifactStagingDirectory)/$(artifactsName)/${POD_ARCHIVE}" swift/ cp "$(Build.ArtifactStagingDirectory)/$(artifactsName)/${POD_ARCHIVE}" swift/
export ORT_IOS_POD_LOCAL_PATH="swift/${POD_ARCHIVE}" export ORT_POD_LOCAL_PATH="swift/${POD_ARCHIVE}"
cp "$(Build.ArtifactStagingDirectory)/$(artifactsNameForExt)/${POD_ARCHIVE_EXT}" swift/ cp "$(Build.ArtifactStagingDirectory)/$(artifactsNameForExt)/${POD_ARCHIVE_EXT}" swift/
export ORT_EXTENSIONS_IOS_POD_LOCAL_PATH="swift/${POD_ARCHIVE_EXT}" export ORT_EXTENSIONS_POD_LOCAL_PATH="swift/${POD_ARCHIVE_EXT}"
xcodebuild test -scheme onnxruntime-Package -destination 'platform=iOS Simulator,name=iPhone 14' xcodebuild test -scheme onnxruntime-Package -destination 'platform=iOS Simulator,name=iPhone 14'
.pipelines/mac-ios-spm-release-validation-pipeline.yml
-5
View File
@@ -5,15 +5,10 @@
pool: pool:
vmImage: "macOS-13" vmImage: "macOS-13"
variables:
xcodeVersion: "14.3"
timeoutInMinutes: 60 timeoutInMinutes: 60
steps: steps:
- template: templates/use-xcode-version.yml - template: templates/use-xcode-version.yml
parameters:
xcodeVersion: ${{ variables.xcodeVersion }}
# Note: Running xcodebuild test on `onnxruntime-Package` scheme will perform swift tests for both OnnxRuntimeBindings # Note: Running xcodebuild test on `onnxruntime-Package` scheme will perform swift tests for both OnnxRuntimeBindings
# and OnnxRuntimeExtensions targets. # and OnnxRuntimeExtensions targets.
.pipelines/templates/use-xcode-version.yml
+1 -1
View File
@@ -3,7 +3,7 @@
parameters: parameters:
- name: xcodeVersion - name: xcodeVersion
type: string type: string
default: "14.3" default: "14.3.1"
steps: steps:
- bash: | - bash: |
Package.swift
+30 -29
View File
@@ -6,13 +6,14 @@
// Licensed under the MIT License. // Licensed under the MIT License.
// //
// A user of the Swift Package Manager (SPM) package will consume this file directly from the ORT SPM github repository. // A user of the Swift Package Manager (SPM) package will consume this file directly from the ORT SPM github repository.
// For context, the end user's config will look something like: // For example, the end user's config will look something like:
// //
// dependencies: [ // dependencies: [
// .package(url: "https://github.com/microsoft/onnxruntime-swift-package-manager", from: "1.16.0"), // .package(url: "https://github.com/microsoft/onnxruntime-swift-package-manager", from: "1.16.0"),
// ... // ...
// ], // ],
// NOTE: For specifying valid and latest release version above, please refer to this page: //
// NOTE: For valid version numbers, please refer to this page:
// https://github.com/microsoft/onnxruntime-swift-package-manager/releases // https://github.com/microsoft/onnxruntime-swift-package-manager/releases
import PackageDescription import PackageDescription
@@ -20,7 +21,7 @@ import class Foundation.ProcessInfo
let package = Package( let package = Package(
name: "onnxruntime", name: "onnxruntime",
platforms: [.iOS(.v12), platforms: [.iOS(.v13),
.macOS(.v11)], .macOS(.v11)],
products: [ products: [
.library(name: "onnxruntime", .library(name: "onnxruntime",
@@ -68,49 +69,49 @@ let package = Package(
cxxLanguageStandard: .cxx17 cxxLanguageStandard: .cxx17
) )
// Add the ORT iOS Pod archive as a binary target. // Add the ORT CocoaPods C/C++ pod archive as a binary target.
// //
// There are 2 scenarios: // There are 2 scenarios:
// - Target will be set to a released pod archive and its checksum.
// //
// Release version of ORT SPM github repo: // - Target will be set to a local pod archive.
// Target will be set to the latest released ORT iOS pod archive and its checksum. // This can be used to test with the latest (not yet released) ORT Objective-C source code.
//
// Current main of ORT SPM github repo:
// Target will be set to the pod archive built in sync with the current main objective-c source code.
// CI or local testing where you have built/obtained the iOS Pod archive matching the current source code. // CI or local testing where you have built/obtained the pod archive matching the current source code.
// Requires the ORT_IOS_POD_LOCAL_PATH environment variable to be set to specify the location of the pod. // Requires the ORT_POD_LOCAL_PATH environment variable to be set to specify the location of the pod.
if let pod_archive_path = ProcessInfo.processInfo.environment["ORT_IOS_POD_LOCAL_PATH"] { if let pod_archive_path = ProcessInfo.processInfo.environment["ORT_POD_LOCAL_PATH"] {
// ORT_IOS_POD_LOCAL_PATH MUST be a path that is relative to Package.swift. // ORT_POD_LOCAL_PATH MUST be a path that is relative to Package.swift.
// //
// To build locally, tools/ci_build/github/apple/build_and_assemble_ios_pods.py can be used // To build locally, tools/ci_build/github/apple/build_and_assemble_apple_pods.py can be used
// See https://onnxruntime.ai/docs/build/custom.html#ios // See https://onnxruntime.ai/docs/build/custom.html#ios
// Example command: // Example command:
// python3 tools/ci_build/github/apple/build_and_assemble_ios_pods.py \ // python3 tools/ci_build/github/apple/build_and_assemble_apple_pods.py \
// --variant Full \ // --variant Full \
// --build-settings-file tools/ci_build/github/apple/default_full_ios_framework_build_settings.json // --build-settings-file tools/ci_build/github/apple/default_full_apple_framework_build_settings.json
// //
// This should produce the pod archive in build/ios_pod_staging, and ORT_IOS_POD_LOCAL_PATH can be set to // This should produce the pod archive in build/apple_pod_staging, and ORT_POD_LOCAL_PATH can be set to
// "build/ios_pod_staging/pod-archive-onnxruntime-c-???.zip" where '???' is replaced by the version info in the // "build/apple_pod_staging/pod-archive-onnxruntime-c-???.zip" where '???' is replaced by the version info in the
// actual filename. // actual filename.
package.targets.append(Target.binaryTarget(name: "onnxruntime", path: pod_archive_path)) package.targets.append(Target.binaryTarget(name: "onnxruntime", path: pod_archive_path))
} else { } else {
// ORT 1.18.0 release // ORT release
package.targets.append( package.targets.append(
Target.binaryTarget(name: "onnxruntime", Target.binaryTarget(name: "onnxruntime",
url: "https://download.onnxruntime.ai/pod-archive-onnxruntime-c-1.18.0.zip", url: "https://download.onnxruntime.ai/pod-archive-onnxruntime-c-1.19.0.zip",
checksum: "9f196b7d09129177f529be63a91e18731ab1ccc830828e29edcbe95bd652fa5c") // SHA256 checksum
checksum: "d1e052ad20a323b74d1ea233e6ee6b5a58789c7025778861cdc7a08cb6b3181a")
) )
} }
if let ext_pod_archive_path = ProcessInfo.processInfo.environment["ORT_EXTENSIONS_IOS_POD_LOCAL_PATH"] { if let ext_pod_archive_path = ProcessInfo.processInfo.environment["ORT_EXTENSIONS_POD_LOCAL_PATH"] {
package.targets.append(Target.binaryTarget(name: "onnxruntime_extensions", path: ext_pod_archive_path)) package.targets.append(Target.binaryTarget(name: "onnxruntime_extensions", path: ext_pod_archive_path))
} else { } else {
// ORT Extensions 0.11.0 release // ORT Extensions release
package.targets.append( package.targets.append(
Target.binaryTarget(name: "onnxruntime_extensions", Target.binaryTarget(name: "onnxruntime_extensions",
url: "https://download.onnxruntime.ai/pod-archive-onnxruntime-extensions-c-0.11.0.zip", url: "https://download.onnxruntime.ai/pod-archive-onnxruntime-extensions-c-0.12.0.zip",
checksum: "289e8b7847116744946003ed21e1ac9ee4897c3aca48e261238e329634c27c0a") // SHA256 checksum
) checksum: "542be5904cf2cc93db6b8afcd11b023b001333e3151bea8bff1c7b1cf8959fab")
} )
}