Merge branch 'main' of github.com:beeldengeluid/dane-whisper-asr-worker

beeldengeluid · Jul 12, 2024 · f182cbd · f182cbd
2 parents f5efd20 + 8373dc7
commit f182cbd
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/base_util.py b/base_util.py
@@ -70,12 +70,6 @@ def validate_config(config: CfgNode, validate_file_paths: bool = True) -> bool:
         assert check_setting(
             config.INPUT.S3_ENDPOINT_URL, str, True
         ), "INPUT.S3_ENDPOINT_URL"
-        assert check_setting(
-            config.INPUT.MODEL_CHECKPOINT_S3_URI, str, True
-        ), "INPUT.MODEL_CHECKPOINT_S3_URI"
-        assert check_setting(
-            config.INPUT.MODEL_CONFIG_S3_URI, str, True
-        ), "INPUT.MODEL_CONFIG_S3_URI"
         assert check_setting(
             config.INPUT.DELETE_ON_COMPLETION, bool
         ), "INPUT.DELETE_ON_COMPLETION"

diff --git a/whisper.py b/whisper.py
@@ -40,10 +40,7 @@ def run_whisper(
             "Failed to apply model (WHISPER_ASR_SETTINGS.MODEL not configured correctly)",
         )
 
-    if (
-        cfg.WHISPER_ASR_SETTINGS.DEVICE != "cuda"
-        or cfg.WHISPER_ASR_SETTINGS.DEVICE != "cpu"
-    ):
+    if cfg.WHISPER_ASR_SETTINGS.DEVICE not in ["cuda", "cpu"]:
         return WhisperASROutput(
             500,
             "Failed to apply model (WHISPER_ASR_SETTINGS.DEVICE not configured correctly)",