changes

app.py

@@ -38,10 +38,9 @@ TASKS = set(TASKS_TO_OVMODEL.keys()) & set(TASKS_TO_MODEL_LOADERS.keys())
 
 def run_benchmark(kwargs, oauth_token: Optional[gr.OAuthToken] = None):
     if oauth_token.token is None or oauth_token.token == "":
-        gr.Error("Please login to be able to run the benchmark.")
-        return tuple(None for _ in BACKENDS)
+        yield tuple(None for _ in BACKENDS)
 
-    setup_logging(level="INFO", prefix="MAIN-PROCESS")
+        raise gr.Error("Please login to be able to run the benchmark.")
 
     timestamp = time.strftime("%Y-%m-%d-%H-%M-%S")
     name = whoami(oauth_token.token)["name"]
@@ -63,8 +62,6 @@ def run_benchmark(kwargs, oauth_token: Optional[gr.OAuthToken] = None):
             model = value
         elif key.label == "task":
             task = value
-        elif key.label == "backends":
-            backends = value
         elif "." in key.label:
             backend, argument = key.label.split(".")
             configs[backend][argument] = value
@@ -98,7 +95,9 @@ def run_benchmark(kwargs, oauth_token: Optional[gr.OAuthToken] = None):
 
     yield tuple(outputs[b] for b in BACKENDS)
 
-    for backend in backends:
+    setup_logging(level="INFO", prefix="MAIN-PROCESS")
+
+    for backend in BACKENDS:
         try:
             benchmark_name = f"{timestamp}/{backend}"
             benchmark_config = BenchmarkConfig(
@@ -118,121 +117,113 @@ def run_benchmark(kwargs, oauth_token: Optional[gr.OAuthToken] = None):
             benchmark.push_to_hub(
                 repo_id=repo_id, subfolder=benchmark_name, token=oauth_token.token
             )
-            gr.Info(f"Pushed benchmark to {repo_id}/{benchmark_name}")
 
             outputs[backend] = f"\n{benchmark_report.to_markdown_text()}"
 
             yield tuple(outputs[b] for b in BACKENDS)
 
-        except Exception:
-            gr.Error(f"Error while running benchmark for {backend}")
+            gr.Info(f"Pushed benchmark to {repo_id}/{benchmark_name}")
 
+        except Exception:
             outputs[backend] = f"\n```python\n{traceback.format_exc()}```"
 
             yield tuple(outputs[b] for b in BACKENDS)
 
-    logging.getLogger().setLevel(logging.NOTSET)
+            raise gr.Error(f"Error while running benchmark for {backend}")
 
+    logging.getLogger().setLevel(logging.NOTSET)
 
-def build_demo():
-    with gr.Blocks() as demo:
-        # add login button
-        gr.LoginButton()
 
-        # add image
-        gr.HTML(
-            """<img src="https://huggingface.co/spaces/optimum/optimum-benchmark-ui/resolve/main/huggy_bench.png" style="display: block; margin-left: auto; margin-right: auto; width: 30%;">"""
-            "<h1 style='text-align: center'>🤗 Optimum-Benchmark Interface 🏋️</h1>"
-            "<p style='text-align: center'>"
-            "This Space uses <a href='https://github.com/huggingface/optimum-benchmark.git'>Optimum-Benchmark</a> to automatically benchmark a model from the Hub on different backends."
-            "<br>The results (config and report) will be pushed under your namespace in a benchmark repository on the Hub."
-            "</p>"
+def update_task(model_id):
+    try:
+        inferred_task = infer_task_from_model_name_or_path(model_id)
+    except Exception:
+        raise gr.Error(
+            f"Error while inferring task for {model_id}, please select a task manually."
         )
 
-        model = HuggingfaceHubSearch(
-            label="model",
-            search_type="model",
-            value="openai-community/gpt2",
-            placeholder="Search for a model",
-            sumbit_on_select=True,
-        )
-        task = gr.Dropdown(
-            label="task",
-            choices=TASKS,
-            value="text-generation",
-            info="Task to run the benchmark on.",
-        )
-        backends = gr.CheckboxGroup(
-            interactive=True,
-            label="backends",
-            choices=BACKENDS,
-            value=BACKENDS,
-            info="Backends to run the benchmark on.",
+    if inferred_task not in TASKS:
+        raise gr.Error(
+            f"Task {inferred_task} is not supported by OpenVINO, please select a task manually."
         )
 
-        with gr.Row():
-            with gr.Accordion(label="Process Config", open=False, visible=True):
-                process_config = get_process_config()
-        with gr.Row():
-            with gr.Accordion(label="Inference Config", open=False, visible=True):
-                inference_config = get_inference_config()
+    return inferred_task
 
-        with gr.Row() as backend_configs:
-            with gr.Accordion(label="PyTorch Config", open=False, visible=True):
-                pytorch_config = get_pytorch_config()
-            with gr.Accordion(label="OpenVINO Config", open=False, visible=True):
-                openvino_config = get_openvino_config()
 
-        with gr.Row():
-            button = gr.Button(value="Run Benchmark", variant="primary")
-
-        with gr.Row() as markdown_outputs:
-            with gr.Accordion(label="PyTorch Output", open=True, visible=True):
-                pytorch_output = gr.Markdown()
-            with gr.Accordion(label="OpenVINO Output", open=True, visible=True):
-                openvino_output = gr.Markdown()
-
-        model.submit(inputs=model, outputs=task, fn=infer_task_from_model_name_or_path)
-
-        backends.change(
-            inputs=backends,
-            outputs=backend_configs.children,
-            fn=lambda values: [
-                gr.update(visible=value in values) for value in BACKENDS
-            ],
-        )
+with gr.Blocks() as demo:
+    # add login button
+    gr.LoginButton()
 
-        backends.change(
-            inputs=backends,
-            outputs=markdown_outputs.children,
-            fn=lambda values: [
-                gr.update(visible=value in values) for value in BACKENDS
-            ],
-        )
+    # add image
+    gr.HTML(
+        """<img src="https://huggingface.co/spaces/optimum/optimum-benchmark-ui/resolve/main/huggy_bench.png" style="display: block; margin-left: auto; margin-right: auto; width: 30%;">"""
+        "<h1 style='text-align: center'>🤗 Optimum-Benchmark Interface 🏋️</h1>"
+        "<p style='text-align: center'>"
+        "This Space uses <a href='https://github.com/huggingface/optimum-benchmark.git'>Optimum-Benchmark</a> to automatically benchmark a model from the Hub on different backends."
+        "<br>The results (config and report) will be pushed under your namespace in a benchmark repository on the Hub."
+        "</p>"
+    )
 
-        button.click(
-            fn=run_benchmark,
-            inputs={
-                task,
-                model,
-                backends,
-                *process_config.values(),
-                *inference_config.values(),
-                *pytorch_config.values(),
-                *openvino_config.values(),
-            },
-            outputs={
-                pytorch_output,
-                openvino_output,
-            },
-            concurrency_limit=1,
+    with gr.Column(variant="panel"):
+        model = HuggingfaceHubSearch(
+            placeholder="Search for a model",
+            sumbit_on_select=True,
+            search_type="model",
+            label="model",
         )
 
-    return demo
+        with gr.Row():
+            task = gr.Dropdown(
+                info="Task to run the benchmark on.",
+                elem_id="task-dropdown",
+                choices=TASKS,
+                label="task",
+            )
+
+    with gr.Column(variant="panel"):
+        with gr.Accordion(label="Process Config", open=False, visible=True):
+            process_config = get_process_config()
+        with gr.Accordion(label="Inference Config", open=False, visible=True):
+            inference_config = get_inference_config()
+
+    with gr.Row() as backend_configs:
+        with gr.Accordion(label="PyTorch Config", open=False, visible=True):
+            pytorch_config = get_pytorch_config()
+        with gr.Accordion(label="OpenVINO Config", open=False, visible=True):
+            openvino_config = get_openvino_config()
+
+    with gr.Row():
+        button = gr.Button(value="Run Benchmark", variant="primary")
+
+    with gr.Row() as markdown_outputs:
+        with gr.Accordion(label="PyTorch Output", open=True, visible=True):
+            pytorch_output = gr.Markdown()
+        with gr.Accordion(label="OpenVINO Output", open=True, visible=True):
+            openvino_output = gr.Markdown()
+
+    model.submit(inputs=model, outputs=task, fn=update_task)
+
+    button.click(
+        fn=run_benchmark,
+        inputs={
+            task,
+            model,
+            # backends,
+            *process_config.values(),
+            *inference_config.values(),
+            *pytorch_config.values(),
+            *openvino_config.values(),
+        },
+        outputs={
+            pytorch_output,
+            openvino_output,
+        },
+        concurrency_limit=1,
+    )
 
 
 if __name__ == "__main__":
     os.environ["LOG_TO_FILE"] = "0"
     os.environ["LOG_LEVEL"] = "INFO"
 
-    build_demo().queue(max_size=10).launch()
+    demo.queue(max_size=10).launch()