Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

whisper : add context param for disable gpu #1293

Merged
merged 17 commits into from
Nov 6, 2023
Merged

whisper : add context param for disable gpu #1293

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
9398498
whisper : check state->ctx_metal not null
jhen0409 Sep 15, 2023
3d1369e
whisper : add whisper_context_params { use_gpu }
jhen0409 Sep 15, 2023
f924c41
whisper : new API with params & deprecate old API
jhen0409 Sep 18, 2023
f10db5f
Merge branch 'master' into gpu-param
jhen0409 Oct 5, 2023
378bdb2
examples : use no-gpu param && whisper_init_from_file_with_params
jhen0409 Oct 6, 2023
a0aba3e
whisper.objc : enable metal & disable on simulator
jhen0409 Oct 6, 2023
41bc044
whisper.swiftui, metal : enable metal & support load default.metallib
jhen0409 Oct 6, 2023
22ab809
whisper.android : use new API
jhen0409 Oct 6, 2023
e0ebea2
bindings : use new API
jhen0409 Oct 6, 2023
851b2ce
addon.node : fix build & test
jhen0409 Oct 6, 2023
0b0e368
bindings : updata java binding
jhen0409 Oct 6, 2023
883e04f
bindings : add missing whisper_context_default_params_by_ref WHISPER_…
jhen0409 Oct 6, 2023
8e49f2a
metal : use SWIFTPM_MODULE_BUNDLE for GGML_SWIFT and reuse library load
jhen0409 Oct 6, 2023
bda4b59
metal : move bundle var into block
jhen0409 Oct 7, 2023
52c3dd6
metal : use SWIFT_PACKAGE instead of GGML_SWIFT
jhen0409 Oct 7, 2023
aaf9649
Merge branch 'master' into gpu-param
jhen0409 Nov 5, 2023
d7b6b35
style : minor updates
ggerganov Nov 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
whisper.objc : enable metal & disable on simulator
  • Loading branch information
@jhen0409
jhen0409 committed Oct 6, 2023
commit a0aba3e5d9ed5761466dd0400fdb7b63d3ddedaa
4 changes: 2 additions & 2 deletions examples/whisper.objc/whisper.objc.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
18627C8629052BE000BD2A04 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 18627C8529052BE000BD2A04 /* Assets.xcassets */; };
18627C8929052BE000BD2A04 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 18627C8729052BE000BD2A04 /* LaunchScreen.storyboard */; };
18627C8C29052BE000BD2A04 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 18627C8B29052BE000BD2A04 /* main.m */; };
18627C9429052C4900BD2A04 /* whisper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18627C9329052C4900BD2A04 /* whisper.cpp */; settings = {COMPILER_FLAGS = "-DWHISPER_USE_COREML"; }; };
18627C9629052C5800BD2A04 /* ggml.c in Sources */ = {isa = PBXBuildFile; fileRef = 18627C9529052C5800BD2A04 /* ggml.c */; settings = {COMPILER_FLAGS = "-DGGML_USE_ACCELERATE"; }; };
18627C9429052C4900BD2A04 /* whisper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18627C9329052C4900BD2A04 /* whisper.cpp */; settings = {COMPILER_FLAGS = "-DWHISPER_USE_COREML -DWHISPER_COREML_ALLOW_FALLBACK -DGGML_USE_METAL"; }; };
18627C9629052C5800BD2A04 /* ggml.c in Sources */ = {isa = PBXBuildFile; fileRef = 18627C9529052C5800BD2A04 /* ggml.c */; settings = {COMPILER_FLAGS = "-DGGML_USE_ACCELERATE -DGGML_USE_METAL"; }; };
18627C9B29052CFF00BD2A04 /* ggml-base.en.bin in Resources */ = {isa = PBXBuildFile; fileRef = 18627C9A29052CFF00BD2A04 /* ggml-base.en.bin */; };
7FE3424B2A0C3FA20015A058 /* whisper-encoder-impl.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FE342452A0C3FA20015A058 /* whisper-encoder-impl.m */; };
7FE3424C2A0C3FA20015A058 /* whisper-encoder.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7FE342472A0C3FA20015A058 /* whisper-encoder.mm */; };
Expand Down
8 changes: 7 additions & 1 deletion examples/whisper.objc/whisper.objc/ViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,13 @@ - (void)viewDidLoad {
NSLog(@"Loading model from %@", modelPath);

// create ggml context
stateInp.ctx = whisper_init_from_file([modelPath UTF8String]);

struct whisper_context_params cparams = whisper_context_default_params();
#if TARGET_OS_SIMULATOR
cparams.use_gpu = false;
NSLog(@"Running on simulator, using CPU");
#endif
stateInp.ctx = whisper_init_from_file_with_params([modelPath UTF8String], cparams);

// check if the model was loaded successfully
if (stateInp.ctx == NULL) {
Expand Down