ggerganov commited on
Commit
55befbb
·
1 Parent(s): a40d0a7

build : fix aarch64 (#0)

Browse files
Package.swift CHANGED
@@ -32,6 +32,7 @@ let package = Package(
32
  sources: [
33
  "ggml/src/ggml.c",
34
  "src/whisper.cpp",
 
35
  "ggml/src/ggml-alloc.c",
36
  "ggml/src/ggml-backend.c",
37
  "ggml/src/ggml-quants.c",
 
32
  sources: [
33
  "ggml/src/ggml.c",
34
  "src/whisper.cpp",
35
+ "ggml/src/ggml-aarch64.c",
36
  "ggml/src/ggml-alloc.c",
37
  "ggml/src/ggml-backend.c",
38
  "ggml/src/ggml-quants.c",
bindings/ruby/ext/extconf.rb CHANGED
@@ -5,6 +5,8 @@ system("cp #{File.join(File.dirname(__FILE__),'..','..','..','whisper-mel.hpp')}
5
  system("cp #{File.join(File.dirname(__FILE__),'..','..','..','ggml.h')} .")
6
  system("cp #{File.join(File.dirname(__FILE__),'..','..','..','ggml.c')} .")
7
  system("cp #{File.join(File.dirname(__FILE__),'..','..','..','ggml-impl.h')} .")
 
 
8
  system("cp #{File.join(File.dirname(__FILE__),'..','..','..','ggml-alloc.h')} .")
9
  system("cp #{File.join(File.dirname(__FILE__),'..','..','..','ggml-alloc.c')} .")
10
  system("cp #{File.join(File.dirname(__FILE__),'..','..','..','ggml-backend-impl.h')} .")
 
5
  system("cp #{File.join(File.dirname(__FILE__),'..','..','..','ggml.h')} .")
6
  system("cp #{File.join(File.dirname(__FILE__),'..','..','..','ggml.c')} .")
7
  system("cp #{File.join(File.dirname(__FILE__),'..','..','..','ggml-impl.h')} .")
8
+ system("cp #{File.join(File.dirname(__FILE__),'..','..','..','ggml-aarch64.h')} .")
9
+ system("cp #{File.join(File.dirname(__FILE__),'..','..','..','ggml-aarch64.c')} .")
10
  system("cp #{File.join(File.dirname(__FILE__),'..','..','..','ggml-alloc.h')} .")
11
  system("cp #{File.join(File.dirname(__FILE__),'..','..','..','ggml-alloc.c')} .")
12
  system("cp #{File.join(File.dirname(__FILE__),'..','..','..','ggml-backend-impl.h')} .")
examples/whisper.android.java/app/src/main/jni/whisper/CMakeLists.txt CHANGED
@@ -7,6 +7,7 @@ set(WHISPER_LIB_DIR ${CMAKE_SOURCE_DIR}/../../../../../../../)
7
 
8
  set(SOURCE_FILES
9
  ${WHISPER_LIB_DIR}/ggml/src/ggml.c
 
10
  ${WHISPER_LIB_DIR}/ggml/src/ggml-alloc.c
11
  ${WHISPER_LIB_DIR}/ggml/src/ggml-backend.c
12
  ${WHISPER_LIB_DIR}/ggml/src/ggml-quants.c
 
7
 
8
  set(SOURCE_FILES
9
  ${WHISPER_LIB_DIR}/ggml/src/ggml.c
10
+ ${WHISPER_LIB_DIR}/ggml/src/ggml-aarch64.c
11
  ${WHISPER_LIB_DIR}/ggml/src/ggml-alloc.c
12
  ${WHISPER_LIB_DIR}/ggml/src/ggml-backend.c
13
  ${WHISPER_LIB_DIR}/ggml/src/ggml-quants.c
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-alloc.c
23
  ${WHISPER_LIB_DIR}/ggml/src/ggml-backend.c
24
  ${WHISPER_LIB_DIR}/ggml/src/ggml-quants.c
 
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.c
25
  ${WHISPER_LIB_DIR}/ggml/src/ggml-quants.c
examples/whisper.objc/whisper.objc.xcodeproj/project.pbxproj CHANGED
@@ -7,6 +7,7 @@
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 */; };
@@ -44,6 +45,8 @@
44
  /* End PBXCopyFilesBuildPhase section */
45
 
46
  /* Begin PBXFileReference section */
 
 
47
  184447182AB211A2007D6BFE /* ggml-alloc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "ggml-alloc.c"; path = "../../../ggml/src/ggml-alloc.c"; sourceTree = "<group>"; };
48
  184447192AB211A2007D6BFE /* ggml-alloc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "ggml-alloc.h"; path = "../../../ggml/include/ggml-alloc.h"; sourceTree = "<group>"; };
49
  1844471B2AB21655007D6BFE /* ggml-metal.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "ggml-metal.m"; path = "../../../ggml/src/ggml-metal.m"; sourceTree = "<group>"; };
@@ -112,6 +115,8 @@
112
  18627C7829052BDF00BD2A04 /* whisper.objc */ = {
113
  isa = PBXGroup;
114
  children = (
 
 
115
  18A275FF2C2A9563001C8D37 /* ggml-common.h */,
116
  18A275FE2C2A94DE001C8D37 /* ggml-metal.h */,
117
  18ABE1562AF556340044A204 /* ggml-backend-impl.h */,
@@ -236,6 +241,7 @@
236
  files = (
237
  18627C8129052BDF00BD2A04 /* ViewController.m in Sources */,
238
  18ABE15B2AF556340044A204 /* ggml-quants.c in Sources */,
 
239
  7FE3424C2A0C3FA20015A058 /* whisper-encoder.mm in Sources */,
240
  18627C9429052C4900BD2A04 /* whisper.cpp in Sources */,
241
  18627C9629052C5800BD2A04 /* ggml.c in Sources */,
 
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 */; };
 
45
  /* End PBXCopyFilesBuildPhase section */
46
 
47
  /* Begin PBXFileReference section */
48
+ 18133C7E2C64E342005CEAAC /* ggml-aarch64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "ggml-aarch64.h"; path = "../../../ggml/src/ggml-aarch64.h"; sourceTree = "<group>"; };
49
+ 18133C7F2C64E342005CEAAC /* ggml-aarch64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "ggml-aarch64.c"; path = "../../../ggml/src/ggml-aarch64.c"; sourceTree = "<group>"; };
50
  184447182AB211A2007D6BFE /* ggml-alloc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "ggml-alloc.c"; path = "../../../ggml/src/ggml-alloc.c"; sourceTree = "<group>"; };
51
  184447192AB211A2007D6BFE /* ggml-alloc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "ggml-alloc.h"; path = "../../../ggml/include/ggml-alloc.h"; sourceTree = "<group>"; };
52
  1844471B2AB21655007D6BFE /* ggml-metal.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "ggml-metal.m"; path = "../../../ggml/src/ggml-metal.m"; sourceTree = "<group>"; };
 
115
  18627C7829052BDF00BD2A04 /* whisper.objc */ = {
116
  isa = PBXGroup;
117
  children = (
118
+ 18133C7F2C64E342005CEAAC /* ggml-aarch64.c */,
119
+ 18133C7E2C64E342005CEAAC /* ggml-aarch64.h */,
120
  18A275FF2C2A9563001C8D37 /* ggml-common.h */,
121
  18A275FE2C2A94DE001C8D37 /* ggml-metal.h */,
122
  18ABE1562AF556340044A204 /* ggml-backend-impl.h */,
 
241
  files = (
242
  18627C8129052BDF00BD2A04 /* ViewController.m in Sources */,
243
  18ABE15B2AF556340044A204 /* ggml-quants.c in Sources */,
244
+ 18133C802C64E342005CEAAC /* ggml-aarch64.c in Sources */,
245
  7FE3424C2A0C3FA20015A058 /* whisper-encoder.mm in Sources */,
246
  18627C9429052C4900BD2A04 /* whisper.cpp in Sources */,
247
  18627C9629052C5800BD2A04 /* ggml.c in Sources */,