Skip to content

Fix device override in from_pretrained, add MPS support #9

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
yajur-khanna wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix device override in from_pretrained, add MPS support #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 15 additions & 2 deletions tribev2/demo_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,9 @@ def from_pretrained(
Cluster backend forwarded to feature-extractor infra
(``"auto"`` by default).
device:
Torch device string. ``"auto"`` selects CUDA when available.
Torch device. ``"auto"`` selects CUDA > MPS > CPU.
Note: feature extractors (text, audio, video) always run on CPU
regardless of the specified device.
config_update:
Optional dictionary of config overrides applied after the
YAML config is loaded.
Expand All @@ -190,7 +192,12 @@ def from_pretrained(
if cache_folder is not None:
Path(cache_folder).mkdir(parents=True, exist_ok=True)
if device == "auto":
device = "cuda" if torch.cuda.is_available() else "cpu"
if torch.cuda.is_available():
device = "cuda"
elif torch.backends.mps.is_available():
device = "mps"
else:
device = "cpu"
checkpoint_dir = Path(checkpoint_dir)
if checkpoint_dir.exists():
config_path = checkpoint_dir / "config.yaml"
Expand All @@ -203,6 +210,12 @@ def from_pretrained(
ckpt_path = hf_hub_download(repo_id, checkpoint_name)
with open(config_path, "r") as f:
config = ConfDict(yaml.load(f, Loader=yaml.UnsafeLoader))
if device in ("cpu", "mps"): # mps not supported by neuralset extractors
# Override all extractor devices to cpu when cuda is unavailable
for modality in ["text", "audio"]:
config[f"data.{modality}_feature.device"] = "cpu"
config["data.image_feature.image.device"] = "cpu"
config["data.video_feature.image.device"] = "cpu"
for modality in ["text", "audio", "video"]:
config[f"data.{modality}_feature.infra.folder"] = cache_folder
config[f"data.{modality}_feature.infra.cluster"] = cluster
Expand Down