Spaces:
Running
Running
Corey Earwood
commited on
whisper.objc : fix build and CI
Browse files
.github/workflows/build.yml
CHANGED
|
@@ -677,8 +677,8 @@ jobs:
|
|
| 677 |
run: |
|
| 678 |
xcodebuild -scheme whisper-Package -destination 'generic/platform=iOS'
|
| 679 |
|
| 680 |
-
|
| 681 |
-
|
| 682 |
|
| 683 |
- name: Build swiftui example
|
| 684 |
run: xcodebuild -project examples/whisper.swiftui/whisper.swiftui.xcodeproj -scheme WhisperCppDemo -configuration ${{ matrix.build }} -sdk iphoneos CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY= -destination 'generic/platform=iOS' build
|
|
|
|
| 677 |
run: |
|
| 678 |
xcodebuild -scheme whisper-Package -destination 'generic/platform=iOS'
|
| 679 |
|
| 680 |
+
- name: Build objc example
|
| 681 |
+
run: xcodebuild -project examples/whisper.objc/whisper.objc.xcodeproj -scheme whisper.objc -configuration ${{ matrix.build }} -sdk iphoneos CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO build
|
| 682 |
|
| 683 |
- name: Build swiftui example
|
| 684 |
run: xcodebuild -project examples/whisper.swiftui/whisper.swiftui.xcodeproj -scheme WhisperCppDemo -configuration ${{ matrix.build }} -sdk iphoneos CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY= -destination 'generic/platform=iOS' build
|
examples/whisper.objc/whisper.objc.xcodeproj/project.pbxproj
CHANGED
|
@@ -7,7 +7,6 @@
|
|
| 7 |
objects = {
|
| 8 |
|
| 9 |
/* Begin PBXBuildFile section */
|
| 10 |
-
18133C802C64E342005CEAAC /* ggml-aarch64.c in Sources */ = {isa = PBXBuildFile; fileRef = 18133C7F2C64E342005CEAAC /* ggml-aarch64.c */; };
|
| 11 |
1844471A2AB211A2007D6BFE /* ggml-alloc.c in Sources */ = {isa = PBXBuildFile; fileRef = 184447182AB211A2007D6BFE /* ggml-alloc.c */; };
|
| 12 |
1844471C2AB21655007D6BFE /* ggml-metal.m in Sources */ = {isa = PBXBuildFile; fileRef = 1844471B2AB21655007D6BFE /* ggml-metal.m */; settings = {COMPILER_FLAGS = "-framework Foundation -framework Metal -framework MetalKit -fno-objc-arc"; }; };
|
| 13 |
18627C7B29052BDF00BD2A04 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 18627C7A29052BDF00BD2A04 /* AppDelegate.m */; };
|
|
@@ -27,9 +26,11 @@
|
|
| 27 |
18E864A92CE73C1E0094B8B3 /* ggml-cpu.c in Sources */ = {isa = PBXBuildFile; fileRef = 18E864A82CE73C1E0094B8B3 /* ggml-cpu.c */; };
|
| 28 |
18F8C0BC2CEDF4DC00CAD607 /* ggml-threading.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18F8C0BB2CEDF4DC00CAD607 /* ggml-threading.cpp */; };
|
| 29 |
18F8C0BE2CEDF50700CAD607 /* ggml-cpu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18F8C0BD2CEDF50700CAD607 /* ggml-cpu.cpp */; };
|
| 30 |
-
18F8C0C42CEDF52700CAD607 /* ggml-cpu-aarch64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18F8C0C02CEDF52700CAD607 /* ggml-cpu-aarch64.cpp */; };
|
| 31 |
18F8C0C52CEDF52700CAD607 /* ggml-cpu-quants.c in Sources */ = {isa = PBXBuildFile; fileRef = 18F8C0C32CEDF52700CAD607 /* ggml-cpu-quants.c */; };
|
| 32 |
18F8C0C72CEDF7AB00CAD607 /* ggml-backend-reg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18F8C0C62CEDF7AB00CAD607 /* ggml-backend-reg.cpp */; };
|
|
|
|
|
|
|
| 33 |
7FE3424B2A0C3FA20015A058 /* whisper-encoder-impl.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FE342452A0C3FA20015A058 /* whisper-encoder-impl.m */; };
|
| 34 |
7FE3424C2A0C3FA20015A058 /* whisper-encoder.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7FE342472A0C3FA20015A058 /* whisper-encoder.mm */; };
|
| 35 |
7FE3424D2A0C3FA20015A058 /* whisper-decoder-impl.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FE3424A2A0C3FA20015A058 /* whisper-decoder-impl.m */; };
|
|
@@ -51,8 +52,6 @@
|
|
| 51 |
/* End PBXCopyFilesBuildPhase section */
|
| 52 |
|
| 53 |
/* Begin PBXFileReference section */
|
| 54 |
-
18133C7E2C64E342005CEAAC /* ggml-aarch64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "ggml-aarch64.h"; path = "../../../ggml/src/ggml-aarch64.h"; sourceTree = "<group>"; };
|
| 55 |
-
18133C7F2C64E342005CEAAC /* ggml-aarch64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "ggml-aarch64.c"; path = "../../../ggml/src/ggml-aarch64.c"; sourceTree = "<group>"; };
|
| 56 |
184447182AB211A2007D6BFE /* ggml-alloc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "ggml-alloc.c"; path = "../../../ggml/src/ggml-alloc.c"; sourceTree = "<group>"; };
|
| 57 |
184447192AB211A2007D6BFE /* ggml-alloc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "ggml-alloc.h"; path = "../../../ggml/include/ggml-alloc.h"; sourceTree = "<group>"; };
|
| 58 |
1844471B2AB21655007D6BFE /* ggml-metal.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "ggml-metal.m"; path = "../../../ggml/src/ggml-metal/ggml-metal.m"; sourceTree = "<group>"; };
|
|
@@ -93,6 +92,10 @@
|
|
| 93 |
18F8C0C22CEDF52700CAD607 /* ggml-cpu-quants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "ggml-cpu-quants.h"; path = "../../../ggml/src/ggml-cpu/ggml-cpu-quants.h"; sourceTree = "<group>"; };
|
| 94 |
18F8C0C32CEDF52700CAD607 /* ggml-cpu-quants.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "ggml-cpu-quants.c"; path = "../../../ggml/src/ggml-cpu/ggml-cpu-quants.c"; sourceTree = "<group>"; };
|
| 95 |
18F8C0C62CEDF7AB00CAD607 /* ggml-backend-reg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "ggml-backend-reg.cpp"; path = "../../../ggml/src/ggml-backend-reg.cpp"; sourceTree = "<group>"; };
|
|
|
|
|
|
|
|
|
|
|
|
|
| 96 |
7FE342452A0C3FA20015A058 /* whisper-encoder-impl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "whisper-encoder-impl.m"; sourceTree = "<group>"; };
|
| 97 |
7FE342462A0C3FA20015A058 /* whisper-encoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "whisper-encoder.h"; sourceTree = "<group>"; };
|
| 98 |
7FE342472A0C3FA20015A058 /* whisper-encoder.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "whisper-encoder.mm"; sourceTree = "<group>"; };
|
|
@@ -132,10 +135,14 @@
|
|
| 132 |
18627C7829052BDF00BD2A04 /* whisper.objc */ = {
|
| 133 |
isa = PBXGroup;
|
| 134 |
children = (
|
|
|
|
|
|
|
| 135 |
18F8C0C62CEDF7AB00CAD607 /* ggml-backend-reg.cpp */,
|
| 136 |
18F8C0BF2CEDF52700CAD607 /* ggml-cpu-aarch64.h */,
|
| 137 |
18F8C0C02CEDF52700CAD607 /* ggml-cpu-aarch64.cpp */,
|
| 138 |
18F8C0C12CEDF52700CAD607 /* ggml-cpu-impl.h */,
|
|
|
|
|
|
|
| 139 |
18F8C0C22CEDF52700CAD607 /* ggml-cpu-quants.h */,
|
| 140 |
18F8C0C32CEDF52700CAD607 /* ggml-cpu-quants.c */,
|
| 141 |
18F8C0BD2CEDF50700CAD607 /* ggml-cpu.cpp */,
|
|
@@ -143,8 +150,6 @@
|
|
| 143 |
18F8C0BB2CEDF4DC00CAD607 /* ggml-threading.cpp */,
|
| 144 |
18E864AA2CE73C580094B8B3 /* ggml-cpu.h */,
|
| 145 |
18E864A82CE73C1E0094B8B3 /* ggml-cpu.c */,
|
| 146 |
-
18133C7F2C64E342005CEAAC /* ggml-aarch64.c */,
|
| 147 |
-
18133C7E2C64E342005CEAAC /* ggml-aarch64.h */,
|
| 148 |
18A275FF2C2A9563001C8D37 /* ggml-common.h */,
|
| 149 |
18A275FE2C2A94DE001C8D37 /* ggml-metal.h */,
|
| 150 |
18ABE1562AF556340044A204 /* ggml-backend-impl.h */,
|
|
@@ -269,9 +274,9 @@
|
|
| 269 |
files = (
|
| 270 |
18627C8129052BDF00BD2A04 /* ViewController.m in Sources */,
|
| 271 |
18ABE15B2AF556340044A204 /* ggml-quants.c in Sources */,
|
| 272 |
-
18133C802C64E342005CEAAC /* ggml-aarch64.c in Sources */,
|
| 273 |
7FE3424C2A0C3FA20015A058 /* whisper-encoder.mm in Sources */,
|
| 274 |
18627C9429052C4900BD2A04 /* whisper.cpp in Sources */,
|
|
|
|
| 275 |
18627C9629052C5800BD2A04 /* ggml.c in Sources */,
|
| 276 |
18627C7B29052BDF00BD2A04 /* AppDelegate.m in Sources */,
|
| 277 |
7FE3424D2A0C3FA20015A058 /* whisper-decoder-impl.m in Sources */,
|
|
@@ -284,6 +289,7 @@
|
|
| 284 |
18ABE15A2AF556340044A204 /* ggml-backend.cpp in Sources */,
|
| 285 |
18627C8C29052BE000BD2A04 /* main.m in Sources */,
|
| 286 |
18627C7E29052BDF00BD2A04 /* SceneDelegate.m in Sources */,
|
|
|
|
| 287 |
18F8C0BC2CEDF4DC00CAD607 /* ggml-threading.cpp in Sources */,
|
| 288 |
1844471C2AB21655007D6BFE /* ggml-metal.m in Sources */,
|
| 289 |
7FE3424B2A0C3FA20015A058 /* whisper-encoder-impl.m in Sources */,
|
|
|
|
| 7 |
objects = {
|
| 8 |
|
| 9 |
/* Begin PBXBuildFile section */
|
|
|
|
| 10 |
1844471A2AB211A2007D6BFE /* ggml-alloc.c in Sources */ = {isa = PBXBuildFile; fileRef = 184447182AB211A2007D6BFE /* ggml-alloc.c */; };
|
| 11 |
1844471C2AB21655007D6BFE /* ggml-metal.m in Sources */ = {isa = PBXBuildFile; fileRef = 1844471B2AB21655007D6BFE /* ggml-metal.m */; settings = {COMPILER_FLAGS = "-framework Foundation -framework Metal -framework MetalKit -fno-objc-arc"; }; };
|
| 12 |
18627C7B29052BDF00BD2A04 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 18627C7A29052BDF00BD2A04 /* AppDelegate.m */; };
|
|
|
|
| 26 |
18E864A92CE73C1E0094B8B3 /* ggml-cpu.c in Sources */ = {isa = PBXBuildFile; fileRef = 18E864A82CE73C1E0094B8B3 /* ggml-cpu.c */; };
|
| 27 |
18F8C0BC2CEDF4DC00CAD607 /* ggml-threading.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18F8C0BB2CEDF4DC00CAD607 /* ggml-threading.cpp */; };
|
| 28 |
18F8C0BE2CEDF50700CAD607 /* ggml-cpu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18F8C0BD2CEDF50700CAD607 /* ggml-cpu.cpp */; };
|
| 29 |
+
18F8C0C42CEDF52700CAD607 /* ggml-cpu-aarch64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18F8C0C02CEDF52700CAD607 /* ggml-cpu-aarch64.cpp */; settings = {COMPILER_FLAGS = "-x c++"; }; };
|
| 30 |
18F8C0C52CEDF52700CAD607 /* ggml-cpu-quants.c in Sources */ = {isa = PBXBuildFile; fileRef = 18F8C0C32CEDF52700CAD607 /* ggml-cpu-quants.c */; };
|
| 31 |
18F8C0C72CEDF7AB00CAD607 /* ggml-backend-reg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18F8C0C62CEDF7AB00CAD607 /* ggml-backend-reg.cpp */; };
|
| 32 |
+
433188B82D3A187C00E3FE79 /* gguf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 433188B72D3A187C00E3FE79 /* gguf.cpp */; };
|
| 33 |
+
437B63E22D36280C002A49EC /* ggml-cpu-traits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 437B63E12D36280C002A49EC /* ggml-cpu-traits.cpp */; };
|
| 34 |
7FE3424B2A0C3FA20015A058 /* whisper-encoder-impl.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FE342452A0C3FA20015A058 /* whisper-encoder-impl.m */; };
|
| 35 |
7FE3424C2A0C3FA20015A058 /* whisper-encoder.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7FE342472A0C3FA20015A058 /* whisper-encoder.mm */; };
|
| 36 |
7FE3424D2A0C3FA20015A058 /* whisper-decoder-impl.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FE3424A2A0C3FA20015A058 /* whisper-decoder-impl.m */; };
|
|
|
|
| 52 |
/* End PBXCopyFilesBuildPhase section */
|
| 53 |
|
| 54 |
/* Begin PBXFileReference section */
|
|
|
|
|
|
|
| 55 |
184447182AB211A2007D6BFE /* ggml-alloc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "ggml-alloc.c"; path = "../../../ggml/src/ggml-alloc.c"; sourceTree = "<group>"; };
|
| 56 |
184447192AB211A2007D6BFE /* ggml-alloc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "ggml-alloc.h"; path = "../../../ggml/include/ggml-alloc.h"; sourceTree = "<group>"; };
|
| 57 |
1844471B2AB21655007D6BFE /* ggml-metal.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "ggml-metal.m"; path = "../../../ggml/src/ggml-metal/ggml-metal.m"; sourceTree = "<group>"; };
|
|
|
|
| 92 |
18F8C0C22CEDF52700CAD607 /* ggml-cpu-quants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "ggml-cpu-quants.h"; path = "../../../ggml/src/ggml-cpu/ggml-cpu-quants.h"; sourceTree = "<group>"; };
|
| 93 |
18F8C0C32CEDF52700CAD607 /* ggml-cpu-quants.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "ggml-cpu-quants.c"; path = "../../../ggml/src/ggml-cpu/ggml-cpu-quants.c"; sourceTree = "<group>"; };
|
| 94 |
18F8C0C62CEDF7AB00CAD607 /* ggml-backend-reg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "ggml-backend-reg.cpp"; path = "../../../ggml/src/ggml-backend-reg.cpp"; sourceTree = "<group>"; };
|
| 95 |
+
433188B72D3A187C00E3FE79 /* gguf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gguf.cpp; path = ../../../ggml/src/gguf.cpp; sourceTree = "<group>"; };
|
| 96 |
+
433188B92D3A18A400E3FE79 /* gguf.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = gguf.h; path = ../../../ggml/include/gguf.h; sourceTree = "<group>"; };
|
| 97 |
+
437B63E02D36280C002A49EC /* ggml-cpu-traits.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "ggml-cpu-traits.h"; path = "../../../ggml/src/ggml-cpu/ggml-cpu-traits.h"; sourceTree = "<group>"; };
|
| 98 |
+
437B63E12D36280C002A49EC /* ggml-cpu-traits.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "ggml-cpu-traits.cpp"; path = "../../../ggml/src/ggml-cpu/ggml-cpu-traits.cpp"; sourceTree = "<group>"; };
|
| 99 |
7FE342452A0C3FA20015A058 /* whisper-encoder-impl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "whisper-encoder-impl.m"; sourceTree = "<group>"; };
|
| 100 |
7FE342462A0C3FA20015A058 /* whisper-encoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "whisper-encoder.h"; sourceTree = "<group>"; };
|
| 101 |
7FE342472A0C3FA20015A058 /* whisper-encoder.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "whisper-encoder.mm"; sourceTree = "<group>"; };
|
|
|
|
| 135 |
18627C7829052BDF00BD2A04 /* whisper.objc */ = {
|
| 136 |
isa = PBXGroup;
|
| 137 |
children = (
|
| 138 |
+
433188B92D3A18A400E3FE79 /* gguf.h */,
|
| 139 |
+
433188B72D3A187C00E3FE79 /* gguf.cpp */,
|
| 140 |
18F8C0C62CEDF7AB00CAD607 /* ggml-backend-reg.cpp */,
|
| 141 |
18F8C0BF2CEDF52700CAD607 /* ggml-cpu-aarch64.h */,
|
| 142 |
18F8C0C02CEDF52700CAD607 /* ggml-cpu-aarch64.cpp */,
|
| 143 |
18F8C0C12CEDF52700CAD607 /* ggml-cpu-impl.h */,
|
| 144 |
+
437B63E02D36280C002A49EC /* ggml-cpu-traits.h */,
|
| 145 |
+
437B63E12D36280C002A49EC /* ggml-cpu-traits.cpp */,
|
| 146 |
18F8C0C22CEDF52700CAD607 /* ggml-cpu-quants.h */,
|
| 147 |
18F8C0C32CEDF52700CAD607 /* ggml-cpu-quants.c */,
|
| 148 |
18F8C0BD2CEDF50700CAD607 /* ggml-cpu.cpp */,
|
|
|
|
| 150 |
18F8C0BB2CEDF4DC00CAD607 /* ggml-threading.cpp */,
|
| 151 |
18E864AA2CE73C580094B8B3 /* ggml-cpu.h */,
|
| 152 |
18E864A82CE73C1E0094B8B3 /* ggml-cpu.c */,
|
|
|
|
|
|
|
| 153 |
18A275FF2C2A9563001C8D37 /* ggml-common.h */,
|
| 154 |
18A275FE2C2A94DE001C8D37 /* ggml-metal.h */,
|
| 155 |
18ABE1562AF556340044A204 /* ggml-backend-impl.h */,
|
|
|
|
| 274 |
files = (
|
| 275 |
18627C8129052BDF00BD2A04 /* ViewController.m in Sources */,
|
| 276 |
18ABE15B2AF556340044A204 /* ggml-quants.c in Sources */,
|
|
|
|
| 277 |
7FE3424C2A0C3FA20015A058 /* whisper-encoder.mm in Sources */,
|
| 278 |
18627C9429052C4900BD2A04 /* whisper.cpp in Sources */,
|
| 279 |
+
437B63E22D36280C002A49EC /* ggml-cpu-traits.cpp in Sources */,
|
| 280 |
18627C9629052C5800BD2A04 /* ggml.c in Sources */,
|
| 281 |
18627C7B29052BDF00BD2A04 /* AppDelegate.m in Sources */,
|
| 282 |
7FE3424D2A0C3FA20015A058 /* whisper-decoder-impl.m in Sources */,
|
|
|
|
| 289 |
18ABE15A2AF556340044A204 /* ggml-backend.cpp in Sources */,
|
| 290 |
18627C8C29052BE000BD2A04 /* main.m in Sources */,
|
| 291 |
18627C7E29052BDF00BD2A04 /* SceneDelegate.m in Sources */,
|
| 292 |
+
433188B82D3A187C00E3FE79 /* gguf.cpp in Sources */,
|
| 293 |
18F8C0BC2CEDF4DC00CAD607 /* ggml-threading.cpp in Sources */,
|
| 294 |
1844471C2AB21655007D6BFE /* ggml-metal.m in Sources */,
|
| 295 |
7FE3424B2A0C3FA20015A058 /* whisper-encoder-impl.m in Sources */,
|