Skip to content

Commit 4d2b60a

Browse files
YUNQIUGUOrachguorachguo
authored
Update to latest 1.16.0 ORT release (#7)
* update to latest 1.16.0 ort release * minor update * update to ext-c 0.9.0 release pod * update * update comments --------- Co-authored-by: rachguo <rachguo@rachguos-Mini.attlocal.net> Co-authored-by: rachguo <rachguo@rachguos-Mac-mini.local>
1 parent c76787f commit 4d2b60a

File tree

3 files changed

+13
-42
lines changed

3 files changed

+13
-42
lines changed

.pipelines/mac-ios-spm-dev-validation-pipeline.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@
3232
displayName: "List sparse checkout repo contents"
3333
3434
# Download artifacts from a specific pipeline
35-
# For now, it consumes rel-1.15.0 version ORT iOS Pod which matches the current source code
36-
# TODO: Update branch to latest main of ORT github repo when syncing changes to ORT SPM repo here.
35+
# It consumes a latest dev version ORT iOS Pod which should match with the source code
3736
- task: DownloadPipelineArtifact@2
3837
inputs:
3938
buildType: 'specific'

.pipelines/mac-ios-spm-release-validation-pipeline.yml

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -14,37 +14,12 @@
1414
- template: templates/use-xcode-version.yml
1515
parameters:
1616
xcodeVersion: ${{ variables.xcodeVersion }}
17-
18-
# Note: Currently it requires a dev version extensions c pod for testing
19-
- task: DownloadPipelineArtifact@2
20-
inputs:
21-
buildType: 'specific'
22-
project: 'Lotus'
23-
definition: 1206 #'definitionid' is obtained from `System.DefinitionId` of extensions CI: extensions.ios_packaging
24-
buildVersionToDownload: 'latest'
25-
branchName: 'main'
26-
targetPath: '$(Build.ArtifactStagingDirectory)'
27-
28-
- script: |
29-
set -e -x
30-
ls
31-
workingDirectory: "$(Build.ArtifactStagingDirectory)/ios_packaging_artifacts"
32-
displayName: "List staged artifacts for ORT Ext C Pod"
3317

3418
# Note: Running xcodebuild test on `onnxruntime-Package` scheme will perform swift tests for both OnnxRuntimeBindings
3519
# and OnnxRuntimeExtensions targets.
3620
- script: |
3721
set -e -x
38-
39-
cd "$(Build.ArtifactStagingDirectory)/ios_packaging_artifacts"
40-
POD_ARCHIVE=$(find . -name "pod-archive-onnxruntime-extensions-c-*.zip")
41-
42-
cd "$(Build.SourcesDirectory)"
43-
cp "$(Build.ArtifactStagingDirectory)/ios_packaging_artifacts/${POD_ARCHIVE}" swift/
44-
export ORT_EXTENSIONS_IOS_POD_LOCAL_PATH="swift/${POD_ARCHIVE}"
45-
4622
xcodebuild test -scheme onnxruntime-Package -destination 'platform=iOS Simulator,name=iPhone 14'
47-
rm swift/pod-archive-onnxruntime-extensions-c-*.zip
4823
workingDirectory: "$(Build.SourcesDirectory)"
4924
displayName: "Test Package.swift usage"
5025

Package.swift

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// A user of the Swift Package Manager (SPM) package will consume this file directly from the ORT SPM github repository.
99
// For context, the end user's config will look something like:
1010
//
11+
// TODO: UPDATE VERSION NUMBER HERE ONCE A 1.16.0 RELEASE IS CONDUCTED ON THE SPM REPO
1112
// dependencies: [
1213
// .package(url: "https://github.com/microsoft/onnxruntime-swift-package-manager", from: "1.15.0"),
1314
// ...
@@ -19,7 +20,7 @@ import class Foundation.ProcessInfo
1920

2021
let package = Package(
2122
name: "onnxruntime",
22-
platforms: [.iOS(.v11)],
23+
platforms: [.iOS(.v12)],
2324
products: [
2425
.library(name: "onnxruntime",
2526
type: .static,
@@ -103,25 +104,21 @@ if let pod_archive_path = ProcessInfo.processInfo.environment["ORT_IOS_POD_LOCAL
103104
package.targets.append(Target.binaryTarget(name: "onnxruntime", path: pod_archive_path))
104105

105106
} else {
106-
// ORT 1.15.0 release
107+
// ORT 1.16.0 release
107108
package.targets.append(
108109
Target.binaryTarget(name: "onnxruntime",
109-
url: "https://onnxruntimepackages.z14.web.core.windows.net/pod-archive-onnxruntime-c-1.15.0.zip",
110-
checksum: "9b41412329a73d7d298b1d94ab40ae9adb65cb84f132054073bc82515b4f5f82")
110+
url: "https://onnxruntimepackages.z14.web.core.windows.net/pod-archive-onnxruntime-c-1.16.0.zip",
111+
checksum: "684f317081d6795e5fd619972bc5dd9a648156ba9d3e0fb2292314582a216d8e")
111112
)
112113
}
113114

114115
if let ext_pod_archive_path = ProcessInfo.processInfo.environment["ORT_EXTENSIONS_IOS_POD_LOCAL_PATH"] {
115116
package.targets.append(Target.binaryTarget(name: "onnxruntime_extensions", path: ext_pod_archive_path))
116-
}
117-
// Note: ORT Extensions 0.8.0 release version pod (Currently not working - it gives a header path not found error.)
118-
else {
119-
// package.targets.append(
120-
// Target.binaryTarget(name: "onnxruntime_extensions",
121-
// url: "https://onnxruntimepackages.z14.web.core.windows.net/pod-archive-onnxruntime-extensions-c-0.8.0.zip",
122-
// checksum: "1d003770c9a6d0ead92c04ed40d5083e8f4f55ea985750c3efab91489be15512")
123-
// )
124-
fatalError("It is not valid to use a release version extensions c pod for now.\n" +
125-
"Please set ORT_EXTENSIONS_IOS_POD_LOCAL_PATH environment variable to specify a location for local dev version pod.\n" +
126-
"See Package.swift for more information on using a local pod archive.")
117+
} else {
118+
// ORT Extensions 0.9.0 release
119+
package.targets.append(
120+
Target.binaryTarget(name: "onnxruntime_extensions",
121+
url: "https://onnxruntimepackages.z14.web.core.windows.net/pod-archive-onnxruntime-extensions-c-0.9.0.zip",
122+
checksum: "2549ae80482a1de285aa54cc07440b7daf8a93f91043eff6ba56b6e73274d6cf")
123+
)
127124
}

0 commit comments

Comments
 (0)