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

Jump to bottom

Support MLX in WhisperAX #200

Open
wants to merge 17 commits into
base: mlx-support
Choose a base branch
from
Open

Support MLX in WhisperAX #200

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
d7cf7a6
Use fixed mlx-swift version
ZachNagengast Jul 15, 2024
c93d613
Fix language logits filter
ZachNagengast Jul 16, 2024
37007ef
Make additional initializers, functions, members public for extensibi…
bpkeene Aug 7, 2024
1f40552
Look for MLPackages and constituent .mlmodel protobufs for associated…
bpkeene Aug 10, 2024
c268c8d
Fix start time logic for file loading (#195)
ZachNagengast Aug 10, 2024
59aaa4e
Change `static var` stored properties to `static let`. (#190)
fumoboy007 Aug 11, 2024
4c495d2
Merge branch 'mlx-support' of ssh://github.com/argmaxinc/WhisperKit i…
ZachNagengast Sep 3, 2024
6023f74
Refactor protocols for app support
ZachNagengast Sep 4, 2024
cc10a23
WIP perf improvements
ZachNagengast Sep 4, 2024
c03017f
Add VoiceActivityDetector base class (#199)
Sep 5, 2024
76d14db
Restructure package.swift
ZachNagengast Sep 7, 2024
292cb16
Complete MLXTokenSampling impl
ZachNagengast Sep 7, 2024
649d139
Fix tests
ZachNagengast Sep 7, 2024
e09cc32
Formatting
ZachNagengast Sep 7, 2024
f7a6c09
Merge branch 'main' into mlx-app-support
ZachNagengast Sep 7, 2024
9fff900
Code review
ZachNagengast Sep 10, 2024
ce11d9b
Update to latest mlx version
ZachNagengast Sep 20, 2024
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
6 changes: 6 additions & 0 deletions .swiftpm/configuration/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"pins" : [
{
<<<<<<< HEAD
"identity" : "mlx-swift",
"kind" : "remoteSourceControl",
"location" : "https://github.com/ml-explore/mlx-swift",
Expand All @@ -10,6 +11,8 @@
}
},
{
=======
>>>>>>> main
"identity" : "swift-argument-parser",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-argument-parser.git",
Expand All @@ -19,6 +22,7 @@
}
},
{
<<<<<<< HEAD
"identity" : "swift-numerics",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-numerics",
Expand All @@ -28,6 +32,8 @@
}
},
{
=======
>>>>>>> main
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

git conflict markers

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah good catch 👍

"identity" : "swift-transformers",
"kind" : "remoteSourceControl",
"location" : "https://github.com/huggingface/swift-transformers.git",
Expand Down
42 changes: 19 additions & 23 deletions Examples/WhisperAX/WhisperAX.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
objects = {

/* Begin PBXBuildFile section */
161136102B3F6C68003C20F6 /* WhisperKit in Frameworks */ = {isa = PBXBuildFile; productRef = 1611360F2B3F6C68003C20F6 /* WhisperKit */; };
1612D45D2C87D9ED009BB384 /* WhisperKit in Frameworks */ = {isa = PBXBuildFile; productRef = 1612D45C2C87D9ED009BB384 /* WhisperKit */; };
1612D45F2C87D9ED009BB384 /* WhisperKitMLX in Frameworks */ = {isa = PBXBuildFile; productRef = 1612D45E2C87D9ED009BB384 /* WhisperKitMLX */; };
167209782C88BF3F0010BE5F /* WhisperKit in Frameworks */ = {isa = PBXBuildFile; productRef = 167209772C88BF3F0010BE5F /* WhisperKit */; };
1677AFC22B57618A008C61C0 /* WhisperAXApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1677AFAB2B57618A008C61C0 /* WhisperAXApp.swift */; };
1677AFC42B57618A008C61C0 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1677AFAE2B57618A008C61C0 /* Preview Assets.xcassets */; };
1677AFC92B57618A008C61C0 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1677AFB42B57618A008C61C0 /* Assets.xcassets */; };
Expand All @@ -25,7 +27,6 @@
1683EFEE2B9FACFE002448CD /* WhisperAX Watch App.app in Embed Watch Content */ = {isa = PBXBuildFile; fileRef = 161135DE2B3F66DA003C20F6 /* WhisperAX Watch App.app */; platformFilter = ios; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
1683EFEF2B9FADFE002448CD /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1677AFB42B57618A008C61C0 /* Assets.xcassets */; };
1683EFF02B9FADFE002448CD /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1677AFB62B57618A008C61C0 /* Preview Assets.xcassets */; };
16EA36CF2B59E550006CA7CF /* WhisperKit in Frameworks */ = {isa = PBXBuildFile; productRef = 16EA36CE2B59E550006CA7CF /* WhisperKit */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -110,7 +111,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
161136102B3F6C68003C20F6 /* WhisperKit in Frameworks */,
167209782C88BF3F0010BE5F /* WhisperKit in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -132,7 +133,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
16EA36CF2B59E550006CA7CF /* WhisperKit in Frameworks */,
1612D45D2C87D9ED009BB384 /* WhisperKit in Frameworks */,
1612D45F2C87D9ED009BB384 /* WhisperKitMLX in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -294,7 +296,7 @@
);
name = "WhisperAX Watch App";
packageProductDependencies = (
1611360F2B3F6C68003C20F6 /* WhisperKit */,
167209772C88BF3F0010BE5F /* WhisperKit */,
);
productName = "Basic Watch App";
productReference = 161135DE2B3F66DA003C20F6 /* WhisperAX Watch App.app */;
Expand Down Expand Up @@ -352,7 +354,8 @@
);
name = WhisperAX;
packageProductDependencies = (
16EA36CE2B59E550006CA7CF /* WhisperKit */,
1612D45C2C87D9ED009BB384 /* WhisperKit */,
1612D45E2C87D9ED009BB384 /* WhisperKitMLX */,
);
productName = BasicExample;
productReference = 167B345E2B05431E0076F261 /* WhisperAX.app */;
Expand Down Expand Up @@ -438,8 +441,7 @@
);
mainGroup = 167B34552B05431E0076F261;
packageReferences = (
161135D62B3F66A6003C20F6 /* XCLocalSwiftPackageReference "../.." */,
16D581062B4F7DCE000C0AB0 /* XCRemoteSwiftPackageReference "swift-markdown-ui" */,
1612D45B2C87D9ED009BB384 /* XCLocalSwiftPackageReference "../../../WhisperKit" */,
);
productRefGroup = 167B345F2B05431E0076F261 /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -1112,30 +1114,24 @@
/* End XCConfigurationList section */

/* Begin XCLocalSwiftPackageReference section */
161135D62B3F66A6003C20F6 /* XCLocalSwiftPackageReference "../.." */ = {
1612D45B2C87D9ED009BB384 /* XCLocalSwiftPackageReference "../../../WhisperKit" */ = {
isa = XCLocalSwiftPackageReference;
relativePath = ../..;
relativePath = ../../../WhisperKit;
};
/* End XCLocalSwiftPackageReference section */

/* Begin XCRemoteSwiftPackageReference section */
16D581062B4F7DCE000C0AB0 /* XCRemoteSwiftPackageReference "swift-markdown-ui" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/gonzalezreal/swift-markdown-ui.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 2.3.0;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
1611360F2B3F6C68003C20F6 /* WhisperKit */ = {
1612D45C2C87D9ED009BB384 /* WhisperKit */ = {
isa = XCSwiftPackageProductDependency;
productName = WhisperKit;
};
16EA36CE2B59E550006CA7CF /* WhisperKit */ = {
1612D45E2C87D9ED009BB384 /* WhisperKitMLX */ = {
isa = XCSwiftPackageProductDependency;
productName = WhisperKitMLX;
};
167209772C88BF3F0010BE5F /* WhisperKit */ = {
isa = XCSwiftPackageProductDependency;
package = 1612D45B2C87D9ED009BB384 /* XCLocalSwiftPackageReference "../../../WhisperKit" */;
productName = WhisperKit;
};
/* End XCSwiftPackageProductDependency section */
Expand Down
25 changes: 3 additions & 22 deletions ...s/WhisperAX/WhisperAX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,12 @@
{
"originHash" : "829222b514832cb61fe0002e0eebda98f23a75169c63f7d6ed7a320d57d5318f",
"originHash" : "831ad63194a5262b2549d58e383a520f9cbbc80b4a75660fbbcc56d65edfdab4",
"pins" : [
{
"identity" : "mlx-swift",
"kind" : "remoteSourceControl",
"location" : "https://github.com/ml-explore/mlx-swift",
"location" : "https://github.com/davidkoski/mlx-swift",
"state" : {
"revision" : "597aaa5f465b4b9a17c8646b751053f84e37925b",
"version" : "0.16.0"
}
},
{
"identity" : "networkimage",
"kind" : "remoteSourceControl",
"location" : "https://github.com/gonzalezreal/NetworkImage",
"state" : {
"revision" : "7aff8d1b31148d32c5933d75557d42f6323ee3d1",
"version" : "6.0.0"
"revision" : "3314bc684f0ccab1793be54acddaea16c0501d3c"
}
},
{
Expand All @@ -28,15 +18,6 @@
"version" : "1.3.0"
}
},
{
"identity" : "swift-markdown-ui",
"kind" : "remoteSourceControl",
"location" : "https://github.com/gonzalezreal/swift-markdown-ui.git",
"state" : {
"revision" : "9a8119b37e09a770367eeb26e05267c75d854053",
"version" : "2.3.1"
}
},
{
"identity" : "swift-numerics",
"kind" : "remoteSourceControl",
Expand Down
Loading
Loading