ggerganov commited on
Commit
11d19cb
·
1 Parent(s): 6bb34fb

build : fixes

Browse files
Package.swift CHANGED
@@ -36,6 +36,7 @@ let package = Package(
36
  "ggml/src/ggml-aarch64.c",
37
  "ggml/src/ggml-alloc.c",
38
  "ggml/src/ggml-backend.cpp",
 
39
  "ggml/src/ggml-quants.c",
40
  "ggml/src/ggml-metal.m"
41
  ],
 
36
  "ggml/src/ggml-aarch64.c",
37
  "ggml/src/ggml-alloc.c",
38
  "ggml/src/ggml-backend.cpp",
39
+ "ggml/src/ggml-cpu.c",
40
  "ggml/src/ggml-quants.c",
41
  "ggml/src/ggml-metal.m"
42
  ],
bindings/ruby/ext/extconf.rb CHANGED
@@ -162,6 +162,7 @@ end
162
 
163
  $OBJ_GGML <<
164
  'ggml.o' <<
 
165
  'ggml-alloc.o' <<
166
  'ggml-backend.o' <<
167
  'ggml-quants.o' <<
 
162
 
163
  $OBJ_GGML <<
164
  'ggml.o' <<
165
+ 'ggml-cpu.o' <<
166
  'ggml-alloc.o' <<
167
  'ggml-backend.o' <<
168
  'ggml-quants.o' <<
bindings/ruby/extsources.yaml CHANGED
@@ -2,6 +2,7 @@
2
  - ../../src/whisper.cpp
3
  - ../../include/whisper.h
4
  - ../../ggml/src/ggml.c
 
5
  - ../../ggml/src/ggml-impl.h
6
  - ../../ggml/src/ggml-aarch64.h
7
  - ../../ggml/src/ggml-aarch64.c
@@ -18,6 +19,7 @@
18
  - ../../ggml/include/ggml.h
19
  - ../../ggml/include/ggml-alloc.h
20
  - ../../ggml/include/ggml-backend.h
 
21
  - ../../ggml/include/ggml-cuda.h
22
  - ../../ggml/include/ggml-kompute.h
23
  - ../../ggml/include/ggml-metal.h
 
2
  - ../../src/whisper.cpp
3
  - ../../include/whisper.h
4
  - ../../ggml/src/ggml.c
5
+ - ../../ggml/src/ggml-cpu.c
6
  - ../../ggml/src/ggml-impl.h
7
  - ../../ggml/src/ggml-aarch64.h
8
  - ../../ggml/src/ggml-aarch64.c
 
19
  - ../../ggml/include/ggml.h
20
  - ../../ggml/include/ggml-alloc.h
21
  - ../../ggml/include/ggml-backend.h
22
+ - ../../ggml/include/ggml-cpu.h
23
  - ../../ggml/include/ggml-cuda.h
24
  - ../../ggml/include/ggml-kompute.h
25
  - ../../ggml/include/ggml-metal.h
examples/whisper.android/lib/src/main/jni/whisper/CMakeLists.txt CHANGED
@@ -19,6 +19,7 @@ if (NOT GGML_HOME)
19
  SOURCE_FILES
20
  ${SOURCE_FILES}
21
  ${WHISPER_LIB_DIR}/ggml/src/ggml.c
 
22
  ${WHISPER_LIB_DIR}/ggml/src/ggml-aarch64.c
23
  ${WHISPER_LIB_DIR}/ggml/src/ggml-alloc.c
24
  ${WHISPER_LIB_DIR}/ggml/src/ggml-backend.cpp
 
19
  SOURCE_FILES
20
  ${SOURCE_FILES}
21
  ${WHISPER_LIB_DIR}/ggml/src/ggml.c
22
+ ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu.c
23
  ${WHISPER_LIB_DIR}/ggml/src/ggml-aarch64.c
24
  ${WHISPER_LIB_DIR}/ggml/src/ggml-alloc.c
25
  ${WHISPER_LIB_DIR}/ggml/src/ggml-backend.cpp
examples/whisper.objc/whisper.objc.xcodeproj/project.pbxproj CHANGED
@@ -24,6 +24,7 @@
24
  18A2760B2C2A9B43001C8D37 /* ggml-metal.metal in Resources */ = {isa = PBXBuildFile; fileRef = 1844471D2AB2195F007D6BFE /* ggml-metal.metal */; };
25
  18ABE15A2AF556340044A204 /* ggml-backend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18ABE1572AF556340044A204 /* ggml-backend.cpp */; };
26
  18ABE15B2AF556340044A204 /* ggml-quants.c in Sources */ = {isa = PBXBuildFile; fileRef = 18ABE1592AF556340044A204 /* ggml-quants.c */; };
 
27
  7FE3424B2A0C3FA20015A058 /* whisper-encoder-impl.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FE342452A0C3FA20015A058 /* whisper-encoder-impl.m */; };
28
  7FE3424C2A0C3FA20015A058 /* whisper-encoder.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7FE342472A0C3FA20015A058 /* whisper-encoder.mm */; };
29
  7FE3424D2A0C3FA20015A058 /* whisper-decoder-impl.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FE3424A2A0C3FA20015A058 /* whisper-decoder-impl.m */; };
@@ -76,6 +77,8 @@
76
  18ABE1572AF556340044A204 /* ggml-backend.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = "ggml-backend.cpp"; path = "../../../ggml/src/ggml-backend.cpp"; sourceTree = "<group>"; };
77
  18ABE1582AF556340044A204 /* ggml-impl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "ggml-impl.h"; path = "../../../ggml/src/ggml-impl.h"; sourceTree = "<group>"; };
78
  18ABE1592AF556340044A204 /* ggml-quants.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "ggml-quants.c"; path = "../../../ggml/src/ggml-quants.c"; sourceTree = "<group>"; };
 
 
79
  7FE342452A0C3FA20015A058 /* whisper-encoder-impl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "whisper-encoder-impl.m"; sourceTree = "<group>"; };
80
  7FE342462A0C3FA20015A058 /* whisper-encoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "whisper-encoder.h"; sourceTree = "<group>"; };
81
  7FE342472A0C3FA20015A058 /* whisper-encoder.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "whisper-encoder.mm"; sourceTree = "<group>"; };
@@ -115,6 +118,8 @@
115
  18627C7829052BDF00BD2A04 /* whisper.objc */ = {
116
  isa = PBXGroup;
117
  children = (
 
 
118
  18133C7F2C64E342005CEAAC /* ggml-aarch64.c */,
119
  18133C7E2C64E342005CEAAC /* ggml-aarch64.h */,
120
  18A275FF2C2A9563001C8D37 /* ggml-common.h */,
@@ -248,6 +253,7 @@
248
  18627C7B29052BDF00BD2A04 /* AppDelegate.m in Sources */,
249
  7FE3424D2A0C3FA20015A058 /* whisper-decoder-impl.m in Sources */,
250
  1844471A2AB211A2007D6BFE /* ggml-alloc.c in Sources */,
 
251
  18ABE15A2AF556340044A204 /* ggml-backend.cpp in Sources */,
252
  18627C8C29052BE000BD2A04 /* main.m in Sources */,
253
  18627C7E29052BDF00BD2A04 /* SceneDelegate.m in Sources */,
 
24
  18A2760B2C2A9B43001C8D37 /* ggml-metal.metal in Resources */ = {isa = PBXBuildFile; fileRef = 1844471D2AB2195F007D6BFE /* ggml-metal.metal */; };
25
  18ABE15A2AF556340044A204 /* ggml-backend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18ABE1572AF556340044A204 /* ggml-backend.cpp */; };
26
  18ABE15B2AF556340044A204 /* ggml-quants.c in Sources */ = {isa = PBXBuildFile; fileRef = 18ABE1592AF556340044A204 /* ggml-quants.c */; };
27
+ 18E864A92CE73C1E0094B8B3 /* ggml-cpu.c in Sources */ = {isa = PBXBuildFile; fileRef = 18E864A82CE73C1E0094B8B3 /* ggml-cpu.c */; };
28
  7FE3424B2A0C3FA20015A058 /* whisper-encoder-impl.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FE342452A0C3FA20015A058 /* whisper-encoder-impl.m */; };
29
  7FE3424C2A0C3FA20015A058 /* whisper-encoder.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7FE342472A0C3FA20015A058 /* whisper-encoder.mm */; };
30
  7FE3424D2A0C3FA20015A058 /* whisper-decoder-impl.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FE3424A2A0C3FA20015A058 /* whisper-decoder-impl.m */; };
 
77
  18ABE1572AF556340044A204 /* ggml-backend.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = "ggml-backend.cpp"; path = "../../../ggml/src/ggml-backend.cpp"; sourceTree = "<group>"; };
78
  18ABE1582AF556340044A204 /* ggml-impl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "ggml-impl.h"; path = "../../../ggml/src/ggml-impl.h"; sourceTree = "<group>"; };
79
  18ABE1592AF556340044A204 /* ggml-quants.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "ggml-quants.c"; path = "../../../ggml/src/ggml-quants.c"; sourceTree = "<group>"; };
80
+ 18E864A82CE73C1E0094B8B3 /* ggml-cpu.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "ggml-cpu.c"; path = "../../../ggml/src/ggml-cpu.c"; sourceTree = "<group>"; };
81
+ 18E864AA2CE73C580094B8B3 /* ggml-cpu.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "ggml-cpu.h"; path = "../../../ggml/include/ggml-cpu.h"; sourceTree = "<group>"; };
82
  7FE342452A0C3FA20015A058 /* whisper-encoder-impl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "whisper-encoder-impl.m"; sourceTree = "<group>"; };
83
  7FE342462A0C3FA20015A058 /* whisper-encoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "whisper-encoder.h"; sourceTree = "<group>"; };
84
  7FE342472A0C3FA20015A058 /* whisper-encoder.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "whisper-encoder.mm"; sourceTree = "<group>"; };
 
118
  18627C7829052BDF00BD2A04 /* whisper.objc */ = {
119
  isa = PBXGroup;
120
  children = (
121
+ 18E864AA2CE73C580094B8B3 /* ggml-cpu.h */,
122
+ 18E864A82CE73C1E0094B8B3 /* ggml-cpu.c */,
123
  18133C7F2C64E342005CEAAC /* ggml-aarch64.c */,
124
  18133C7E2C64E342005CEAAC /* ggml-aarch64.h */,
125
  18A275FF2C2A9563001C8D37 /* ggml-common.h */,
 
253
  18627C7B29052BDF00BD2A04 /* AppDelegate.m in Sources */,
254
  7FE3424D2A0C3FA20015A058 /* whisper-decoder-impl.m in Sources */,
255
  1844471A2AB211A2007D6BFE /* ggml-alloc.c in Sources */,
256
+ 18E864A92CE73C1E0094B8B3 /* ggml-cpu.c in Sources */,
257
  18ABE15A2AF556340044A204 /* ggml-backend.cpp in Sources */,
258
  18627C8C29052BE000BD2A04 /* main.m in Sources */,
259
  18627C7E29052BDF00BD2A04 /* SceneDelegate.m in Sources */,
spm-headers/ggml-cpp.h ADDED
@@ -0,0 +1 @@
 
 
1
+ ../ggml/include/ggml-cpp.h
spm-headers/ggml-cpu.h ADDED
@@ -0,0 +1 @@
 
 
1
+ ../ggml/include/ggml-cpu.h