ggerganov commited on
Commit
e1b5e01
·
1 Parent(s): 40f0325

objc : fix build, tmp remove GPU support, use C++17

Browse files
examples/whisper.objc/whisper.objc.xcodeproj/project.pbxproj CHANGED
@@ -8,7 +8,6 @@
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 */; };
13
  18627C7E29052BDF00BD2A04 /* SceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 18627C7D29052BDF00BD2A04 /* SceneDelegate.m */; };
14
  18627C8129052BDF00BD2A04 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 18627C8029052BDF00BD2A04 /* ViewController.m */; };
@@ -19,8 +18,6 @@
19
  18627C9429052C4900BD2A04 /* whisper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18627C9329052C4900BD2A04 /* whisper.cpp */; settings = {COMPILER_FLAGS = "-DWHISPER_USE_COREML -DWHISPER_COREML_ALLOW_FALLBACK -DGGML_USE_METAL"; }; };
20
  18627C9629052C5800BD2A04 /* ggml.c in Sources */ = {isa = PBXBuildFile; fileRef = 18627C9529052C5800BD2A04 /* ggml.c */; settings = {COMPILER_FLAGS = "-DGGML_USE_ACCELERATE -DGGML_USE_METAL"; }; };
21
  18627C9B29052CFF00BD2A04 /* ggml-base.en.bin in Resources */ = {isa = PBXBuildFile; fileRef = 18627C9A29052CFF00BD2A04 /* ggml-base.en.bin */; };
22
- 18A276062C2A98A5001C8D37 /* ggml-metal.metal in Copy Files */ = {isa = PBXBuildFile; fileRef = 1844471D2AB2195F007D6BFE /* ggml-metal.metal */; };
23
- 18A2760B2C2A9B43001C8D37 /* ggml-metal.metal in Resources */ = {isa = PBXBuildFile; fileRef = 1844471D2AB2195F007D6BFE /* ggml-metal.metal */; };
24
  18ABE15A2AF556340044A204 /* ggml-backend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18ABE1572AF556340044A204 /* ggml-backend.cpp */; };
25
  18ABE15B2AF556340044A204 /* ggml-quants.c in Sources */ = {isa = PBXBuildFile; fileRef = 18ABE1592AF556340044A204 /* ggml-quants.c */; };
26
  18E864A92CE73C1E0094B8B3 /* ggml-cpu.c in Sources */ = {isa = PBXBuildFile; fileRef = 18E864A82CE73C1E0094B8B3 /* ggml-cpu.c */; };
@@ -44,7 +41,6 @@
44
  dstPath = "";
45
  dstSubfolderSpec = 7;
46
  files = (
47
- 18A276062C2A98A5001C8D37 /* ggml-metal.metal in Copy Files */,
48
  );
49
  name = "Copy Files";
50
  runOnlyForDeploymentPostprocessing = 0;
@@ -54,8 +50,6 @@
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>"; };
58
- 1844471D2AB2195F007D6BFE /* ggml-metal.metal */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.metal; name = "ggml-metal.metal"; path = "../../../ggml/src/ggml-metal/ggml-metal.metal"; sourceTree = "<group>"; };
59
  18627C7629052BDF00BD2A04 /* whisper.objc.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = whisper.objc.app; sourceTree = BUILT_PRODUCTS_DIR; };
60
  18627C7929052BDF00BD2A04 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
61
  18627C7A29052BDF00BD2A04 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
@@ -73,7 +67,6 @@
73
  18627C9529052C5800BD2A04 /* ggml.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ggml.c; path = ../../../ggml/src/ggml.c; sourceTree = "<group>"; };
74
  18627C9729052C6600BD2A04 /* ggml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ggml.h; path = ../../../ggml/include/ggml.h; sourceTree = "<group>"; };
75
  18627C9A29052CFF00BD2A04 /* ggml-base.en.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = "ggml-base.en.bin"; path = "../../../models/ggml-base.en.bin"; sourceTree = "<group>"; };
76
- 18A275FE2C2A94DE001C8D37 /* ggml-metal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "ggml-metal.h"; path = "../../../ggml/include/ggml-metal.h"; sourceTree = "<group>"; };
77
  18A275FF2C2A9563001C8D37 /* ggml-common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "ggml-common.h"; path = "../../../ggml/src/ggml-common.h"; sourceTree = "<group>"; };
78
  18ABE1542AF556340044A204 /* ggml-quants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "ggml-quants.h"; path = "../../../ggml/src/ggml-quants.h"; sourceTree = "<group>"; };
79
  18ABE1552AF556340044A204 /* ggml-backend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "ggml-backend.h"; path = "../../../ggml/include/ggml-backend.h"; sourceTree = "<group>"; };
@@ -153,15 +146,12 @@
153
  18E864AA2CE73C580094B8B3 /* ggml-cpu.h */,
154
  18E864A82CE73C1E0094B8B3 /* ggml-cpu.c */,
155
  18A275FF2C2A9563001C8D37 /* ggml-common.h */,
156
- 18A275FE2C2A94DE001C8D37 /* ggml-metal.h */,
157
  18ABE1562AF556340044A204 /* ggml-backend-impl.h */,
158
  18ABE1572AF556340044A204 /* ggml-backend.cpp */,
159
  18ABE1552AF556340044A204 /* ggml-backend.h */,
160
  18ABE1582AF556340044A204 /* ggml-impl.h */,
161
  18ABE1592AF556340044A204 /* ggml-quants.c */,
162
  18ABE1542AF556340044A204 /* ggml-quants.h */,
163
- 1844471D2AB2195F007D6BFE /* ggml-metal.metal */,
164
- 1844471B2AB21655007D6BFE /* ggml-metal.m */,
165
  184447182AB211A2007D6BFE /* ggml-alloc.c */,
166
  184447192AB211A2007D6BFE /* ggml-alloc.h */,
167
  7FE3424E2A0C418A0015A058 /* ggml-base.en-encoder.mlmodelc */,
@@ -258,7 +248,6 @@
258
  isa = PBXResourcesBuildPhase;
259
  buildActionMask = 2147483647;
260
  files = (
261
- 18A2760B2C2A9B43001C8D37 /* ggml-metal.metal in Resources */,
262
  18627C8929052BE000BD2A04 /* LaunchScreen.storyboard in Resources */,
263
  7FE3424F2A0C418A0015A058 /* ggml-base.en-encoder.mlmodelc in Resources */,
264
  18627C8629052BE000BD2A04 /* Assets.xcassets in Resources */,
@@ -293,7 +282,6 @@
293
  18627C7E29052BDF00BD2A04 /* SceneDelegate.m in Sources */,
294
  433188B82D3A187C00E3FE79 /* gguf.cpp in Sources */,
295
  18F8C0BC2CEDF4DC00CAD607 /* ggml-threading.cpp in Sources */,
296
- 1844471C2AB21655007D6BFE /* ggml-metal.m in Sources */,
297
  7FE3424B2A0C3FA20015A058 /* whisper-encoder-impl.m in Sources */,
298
  );
299
  runOnlyForDeploymentPostprocessing = 0;
@@ -443,6 +431,7 @@
443
  buildSettings = {
444
  ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
445
  ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 
446
  CODE_SIGN_STYLE = Automatic;
447
  CURRENT_PROJECT_VERSION = 1;
448
  DEVELOPMENT_TEAM = P8JZH34X63;
@@ -473,6 +462,7 @@
473
  buildSettings = {
474
  ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
475
  ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 
476
  CODE_SIGN_STYLE = Automatic;
477
  CURRENT_PROJECT_VERSION = 1;
478
  DEVELOPMENT_TEAM = P8JZH34X63;
 
8
 
9
  /* Begin PBXBuildFile section */
10
  1844471A2AB211A2007D6BFE /* ggml-alloc.c in Sources */ = {isa = PBXBuildFile; fileRef = 184447182AB211A2007D6BFE /* ggml-alloc.c */; };
 
11
  18627C7B29052BDF00BD2A04 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 18627C7A29052BDF00BD2A04 /* AppDelegate.m */; };
12
  18627C7E29052BDF00BD2A04 /* SceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 18627C7D29052BDF00BD2A04 /* SceneDelegate.m */; };
13
  18627C8129052BDF00BD2A04 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 18627C8029052BDF00BD2A04 /* ViewController.m */; };
 
18
  18627C9429052C4900BD2A04 /* whisper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18627C9329052C4900BD2A04 /* whisper.cpp */; settings = {COMPILER_FLAGS = "-DWHISPER_USE_COREML -DWHISPER_COREML_ALLOW_FALLBACK -DGGML_USE_METAL"; }; };
19
  18627C9629052C5800BD2A04 /* ggml.c in Sources */ = {isa = PBXBuildFile; fileRef = 18627C9529052C5800BD2A04 /* ggml.c */; settings = {COMPILER_FLAGS = "-DGGML_USE_ACCELERATE -DGGML_USE_METAL"; }; };
20
  18627C9B29052CFF00BD2A04 /* ggml-base.en.bin in Resources */ = {isa = PBXBuildFile; fileRef = 18627C9A29052CFF00BD2A04 /* ggml-base.en.bin */; };
 
 
21
  18ABE15A2AF556340044A204 /* ggml-backend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18ABE1572AF556340044A204 /* ggml-backend.cpp */; };
22
  18ABE15B2AF556340044A204 /* ggml-quants.c in Sources */ = {isa = PBXBuildFile; fileRef = 18ABE1592AF556340044A204 /* ggml-quants.c */; };
23
  18E864A92CE73C1E0094B8B3 /* ggml-cpu.c in Sources */ = {isa = PBXBuildFile; fileRef = 18E864A82CE73C1E0094B8B3 /* ggml-cpu.c */; };
 
41
  dstPath = "";
42
  dstSubfolderSpec = 7;
43
  files = (
 
44
  );
45
  name = "Copy Files";
46
  runOnlyForDeploymentPostprocessing = 0;
 
50
  /* Begin PBXFileReference section */
51
  184447182AB211A2007D6BFE /* ggml-alloc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "ggml-alloc.c"; path = "../../../ggml/src/ggml-alloc.c"; sourceTree = "<group>"; };
52
  184447192AB211A2007D6BFE /* ggml-alloc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "ggml-alloc.h"; path = "../../../ggml/include/ggml-alloc.h"; sourceTree = "<group>"; };
 
 
53
  18627C7629052BDF00BD2A04 /* whisper.objc.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = whisper.objc.app; sourceTree = BUILT_PRODUCTS_DIR; };
54
  18627C7929052BDF00BD2A04 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
55
  18627C7A29052BDF00BD2A04 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
 
67
  18627C9529052C5800BD2A04 /* ggml.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ggml.c; path = ../../../ggml/src/ggml.c; sourceTree = "<group>"; };
68
  18627C9729052C6600BD2A04 /* ggml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ggml.h; path = ../../../ggml/include/ggml.h; sourceTree = "<group>"; };
69
  18627C9A29052CFF00BD2A04 /* ggml-base.en.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = "ggml-base.en.bin"; path = "../../../models/ggml-base.en.bin"; sourceTree = "<group>"; };
 
70
  18A275FF2C2A9563001C8D37 /* ggml-common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "ggml-common.h"; path = "../../../ggml/src/ggml-common.h"; sourceTree = "<group>"; };
71
  18ABE1542AF556340044A204 /* ggml-quants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "ggml-quants.h"; path = "../../../ggml/src/ggml-quants.h"; sourceTree = "<group>"; };
72
  18ABE1552AF556340044A204 /* ggml-backend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "ggml-backend.h"; path = "../../../ggml/include/ggml-backend.h"; sourceTree = "<group>"; };
 
146
  18E864AA2CE73C580094B8B3 /* ggml-cpu.h */,
147
  18E864A82CE73C1E0094B8B3 /* ggml-cpu.c */,
148
  18A275FF2C2A9563001C8D37 /* ggml-common.h */,
 
149
  18ABE1562AF556340044A204 /* ggml-backend-impl.h */,
150
  18ABE1572AF556340044A204 /* ggml-backend.cpp */,
151
  18ABE1552AF556340044A204 /* ggml-backend.h */,
152
  18ABE1582AF556340044A204 /* ggml-impl.h */,
153
  18ABE1592AF556340044A204 /* ggml-quants.c */,
154
  18ABE1542AF556340044A204 /* ggml-quants.h */,
 
 
155
  184447182AB211A2007D6BFE /* ggml-alloc.c */,
156
  184447192AB211A2007D6BFE /* ggml-alloc.h */,
157
  7FE3424E2A0C418A0015A058 /* ggml-base.en-encoder.mlmodelc */,
 
248
  isa = PBXResourcesBuildPhase;
249
  buildActionMask = 2147483647;
250
  files = (
 
251
  18627C8929052BE000BD2A04 /* LaunchScreen.storyboard in Resources */,
252
  7FE3424F2A0C418A0015A058 /* ggml-base.en-encoder.mlmodelc in Resources */,
253
  18627C8629052BE000BD2A04 /* Assets.xcassets in Resources */,
 
282
  18627C7E29052BDF00BD2A04 /* SceneDelegate.m in Sources */,
283
  433188B82D3A187C00E3FE79 /* gguf.cpp in Sources */,
284
  18F8C0BC2CEDF4DC00CAD607 /* ggml-threading.cpp in Sources */,
 
285
  7FE3424B2A0C3FA20015A058 /* whisper-encoder-impl.m in Sources */,
286
  );
287
  runOnlyForDeploymentPostprocessing = 0;
 
431
  buildSettings = {
432
  ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
433
  ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
434
+ CLANG_CXX_LANGUAGE_STANDARD = "c++17";
435
  CODE_SIGN_STYLE = Automatic;
436
  CURRENT_PROJECT_VERSION = 1;
437
  DEVELOPMENT_TEAM = P8JZH34X63;
 
462
  buildSettings = {
463
  ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
464
  ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
465
+ CLANG_CXX_LANGUAGE_STANDARD = "c++17";
466
  CODE_SIGN_STYLE = Automatic;
467
  CURRENT_PROJECT_VERSION = 1;
468
  DEVELOPMENT_TEAM = P8JZH34X63;