From 475caf22f9556b8e39af25135f8e5120ffbe2d14 Mon Sep 17 00:00:00 2001 From: Fangjun Kuang Date: Sat, 25 Feb 2023 21:56:25 +0800 Subject: [PATCH] Add iOS support (#65) --- .gitignore | 12 + .../.idea/deploymentTargetDropDown.xml | 17 - android/SherpaOnnx/.idea/gradle.xml | 1 + build-ios.sh | 158 +++ build-swift-macos.sh | 29 + cmake/onnxruntime.cmake | 7 +- ffmpeg-examples/Makefile | 3 +- .../SherpaOnnx.xcodeproj/project.pbxproj | 635 ++++++++++++ .../contents.xcworkspacedata | 7 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../UserInterfaceState.xcuserstate | Bin 0 -> 36312 bytes .../xcschemes/xcschememanagement.plist | 14 + .../SherpaOnnx/SherpaOnnx/AppDelegate.swift | 36 + .../AccentColor.colorset/Contents.json | 11 + .../AppIcon.appiconset/Contents.json | 14 + .../AppIcon.appiconset/k2-1024x1024.png | Bin 0 -> 421090 bytes .../SherpaOnnx/Assets.xcassets/Contents.json | 6 + .../Base.lproj/LaunchScreen.storyboard | 25 + .../SherpaOnnx/Base.lproj/Main.storyboard | 60 ++ ios-swift/SherpaOnnx/SherpaOnnx/Info.plist | 27 + ios-swift/SherpaOnnx/SherpaOnnx/Model.swift | 35 + .../SherpaOnnx/SherpaOnnx/SceneDelegate.swift | 52 + .../SherpaOnnx/ViewController.swift | 197 ++++ .../SherpaOnnx/SherpaOnnx/k2-1024x1024.png | Bin 0 -> 421090 bytes .../SherpaOnnxTests/SherpaOnnxTests.swift | 36 + .../SherpaOnnxUITests/SherpaOnnxUITests.swift | 41 + .../SherpaOnnxUITestsLaunchTests.swift | 32 + sherpa-onnx/csrc/online-recognizer.cc | 7 +- sherpa-onnx/csrc/online-stream.cc | 5 +- .../SherpaOnnx-Bridging-Header.h | 9 + swift-api-examples/SherpaOnnx.swift | 171 ++++ swift-api-examples/decode-file.swift | 74 ++ swift-api-examples/run-decode-file.sh | 36 + toolchains/ios.toolchain.cmake | 927 ++++++++++++++++++ 34 files changed, 2669 insertions(+), 23 deletions(-) delete mode 100644 android/SherpaOnnx/.idea/deploymentTargetDropDown.xml create mode 100755 build-ios.sh create mode 100755 build-swift-macos.sh create mode 100644 ios-swift/SherpaOnnx/SherpaOnnx.xcodeproj/project.pbxproj create mode 100644 ios-swift/SherpaOnnx/SherpaOnnx.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 ios-swift/SherpaOnnx/SherpaOnnx.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 ios-swift/SherpaOnnx/SherpaOnnx.xcodeproj/project.xcworkspace/xcuserdata/fangjun.xcuserdatad/UserInterfaceState.xcuserstate create mode 100644 ios-swift/SherpaOnnx/SherpaOnnx.xcodeproj/xcuserdata/fangjun.xcuserdatad/xcschemes/xcschememanagement.plist create mode 100644 ios-swift/SherpaOnnx/SherpaOnnx/AppDelegate.swift create mode 100644 ios-swift/SherpaOnnx/SherpaOnnx/Assets.xcassets/AccentColor.colorset/Contents.json create mode 100644 ios-swift/SherpaOnnx/SherpaOnnx/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 ios-swift/SherpaOnnx/SherpaOnnx/Assets.xcassets/AppIcon.appiconset/k2-1024x1024.png create mode 100644 ios-swift/SherpaOnnx/SherpaOnnx/Assets.xcassets/Contents.json create mode 100644 ios-swift/SherpaOnnx/SherpaOnnx/Base.lproj/LaunchScreen.storyboard create mode 100644 ios-swift/SherpaOnnx/SherpaOnnx/Base.lproj/Main.storyboard create mode 100644 ios-swift/SherpaOnnx/SherpaOnnx/Info.plist create mode 100644 ios-swift/SherpaOnnx/SherpaOnnx/Model.swift create mode 100644 ios-swift/SherpaOnnx/SherpaOnnx/SceneDelegate.swift create mode 100644 ios-swift/SherpaOnnx/SherpaOnnx/ViewController.swift create mode 100644 ios-swift/SherpaOnnx/SherpaOnnx/k2-1024x1024.png create mode 100644 ios-swift/SherpaOnnx/SherpaOnnxTests/SherpaOnnxTests.swift create mode 100644 ios-swift/SherpaOnnx/SherpaOnnxUITests/SherpaOnnxUITests.swift create mode 100644 ios-swift/SherpaOnnx/SherpaOnnxUITests/SherpaOnnxUITestsLaunchTests.swift create mode 100644 swift-api-examples/SherpaOnnx-Bridging-Header.h create mode 100644 swift-api-examples/SherpaOnnx.swift create mode 100644 swift-api-examples/decode-file.swift create mode 100755 swift-api-examples/run-decode-file.sh create mode 100644 toolchains/ios.toolchain.cmake diff --git a/.gitignore b/.gitignore index 4e781377..2f7060e9 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,15 @@ run-zh.sh decode-file-c-api run-decode-file-c-api.sh sherpa-onnx-ffmpeg +build-ios +build-swift-macos +aa.sh +client-2.sh +ffmpeg-examples/run-3.sh +python-api-examples/decode-file-multiple-bak-2.py +run-en-zipformer-microphone* +run-websocket-server* +decode-file +*.dylib +tokens.txt +*.onnx diff --git a/android/SherpaOnnx/.idea/deploymentTargetDropDown.xml b/android/SherpaOnnx/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index 8f6b4f14..00000000 --- a/android/SherpaOnnx/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/android/SherpaOnnx/.idea/gradle.xml b/android/SherpaOnnx/.idea/gradle.xml index a9f4e522..a2d7c213 100644 --- a/android/SherpaOnnx/.idea/gradle.xml +++ b/android/SherpaOnnx/.idea/gradle.xml @@ -1,5 +1,6 @@ +