Skip to content

fix: enable MPS device support for macOS Apple Silicon #64

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

Open
Abeansits wants to merge 2 commits into
base: main
Choose a base branch
from
+6 −6
Open

fix: enable MPS device support for macOS Apple Silicon #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
465efc7
fix: enable MPS device support for macOS Apple Silicon
Abeansits Feb 23, 2026
de66527
fix: replace index_copy_ with MPS-compatible advanced indexing
Abeansits Feb 23, 2026
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
4 changes: 2 additions & 2 deletions moshi/moshi/modules/transformer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,8 +265,8 @@ def complete(self, k: torch.Tensor, v: torch.Tensor) -> KVCacheResult:
B, H, T, D = k.shape
indexes = torch.arange(T, device=self.end_offset.device, dtype=self.end_offset.dtype) + self.end_offset
indexes = indexes % self.capacity
self.cache[0].index_copy_(2, indexes, k)
self.cache[1].index_copy_(2, indexes, v)
self.cache[0][:, :, indexes] = k
self.cache[1][:, :, indexes] = v
self.end_offset.add_(T)

keys = self.cache[0]
Expand Down
8 changes: 4 additions & 4 deletions moshi/moshi/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,16 @@


logger = setup_logger(__name__)
DeviceString = Literal["cuda"] | Literal["cpu"] #| Literal["mps"]
DeviceString = Literal["cuda"] | Literal["cpu"] | Literal["mps"]

def torch_auto_device(requested: Optional[DeviceString] = None) -> torch.device:
"""Return a torch.device based on the requested string or availability."""
if requested is not None:
return torch.device(requested)
if torch.cuda.is_available():
return torch.device("cuda")
#elif hasattr(torch.backends, "mps") and torch.backends.mps.is_available():
# return torch.device("mps")
elif hasattr(torch.backends, "mps") and torch.backends.mps.is_available():
return torch.device("mps")
return torch.device("cpu")


Expand Down Expand Up @@ -369,7 +369,7 @@ def main():
parser.add_argument("--hf-repo", type=str, default=loaders.DEFAULT_REPO,
help="HF repo to look into, defaults PersonaPlex. "
"Use this to select a different pre-trained model.")
parser.add_argument("--device", type=str, default="cuda", help="Device on which to run, defaults to 'cuda'.")
parser.add_argument("--device", type=str, default=None, help="Device on which to run, auto-detected if not set.")
parser.add_argument("--cpu-offload", action="store_true",
help="Offload LM model layers to CPU when GPU memory is insufficient. "
"Requires 'accelerate' package.")
Expand Down