update

Author: sayakpaul

.github/workflows/benchmark.yml

@@ -49,26 +49,26 @@ jobs:
           HF_TOKEN: ${{ secrets.DIFFUSERS_HF_HUB_READ_TOKEN }}
         run: |
           cd benchmarks && python run_all.py
-          mkdir $BASE_PATH && mv *.csv $BASE_PATH
 
       - name: Push results to the Hub
         env: 
           HF_TOKEN: ${{ secrets.DIFFUSERS_BOT_TOKEN }}
-        run: 
-          cd benchmarks && cp $BASE_PATH/collated_results.csv . && python push_results.py
+        run: |
+          cd benchmarks && python push_results.py
+          mkdir $BASE_PATH && cp *.csv $BASE_PATH
 
       - name: Test suite reports artifacts
         if: ${{ always() }}
         uses: actions/upload-artifact@v4
         with:
           name: benchmark_test_reports
-          path: benchmarks/benchmark_outputs
+          path: benchmarks/$BASE_PATH
 
       # TODO: enable this once the connection problem has been resolved.
       # - name: Update benchmarking results to DB
       #   env:
       #     PGDATABASE: metrics
-      #     PGHOST: ${{ secrets.DIFFUSERS_BENCHMARKS_PGHOST }} # TODO
+      #     PGHOST: ${{ secrets.DIFFUSERS_BENCHMARKS_PGHOST }}
       #     PGUSER: transformers_benchmarks
       #     PGPASSWORD: ${{ secrets.DIFFUSERS_BENCHMARKS_PGPASSWORD }}
       #   run: cd benchmarks && python populate_into_db.py

benchmarks/benchmarking_utils.py

@@ -1,6 +1,6 @@
 import gc
 import inspect
-import logging as std_logging
+import logging
 import os
 import queue
 import threading
@@ -13,12 +13,11 @@
 import torch.utils.benchmark as benchmark
 
 from diffusers.models.modeling_utils import ModelMixin
-from diffusers.utils import logging
 from diffusers.utils.testing_utils import require_torch_gpu, torch_device
 
 
-std_logging.basicConfig(level=std_logging.INFO, format="%(asctime)s %(levelname)s %(name)s: %(message)s")
-logger = logging.get_logger(__name__)
+logging.basicConfig(level=logging.INFO, format="%(asctime)s %(levelname)s %(name)s: %(message)s")
+logger = logging.getLogger(__name__)
 
 
 def benchmark_fn(f, *args, **kwargs):

benchmarks/populate_into_db.py

@@ -7,7 +7,7 @@
 import psycopg2.extras
 
 
-# FINAL_CSV_FILENAME = "benchmark_outputs/collated_results.csv"
+FINAL_CSV_FILENAME = "collated_results.csv"
 # https://github.com/huggingface/transformers/blob/593e29c5e2a9b17baec010e8dc7c1431fed6e841/benchmark/init_db.sql#L27
 TABLE_NAME = "model_measurements"
 
@@ -24,8 +24,7 @@
         raise
     cur = conn.cursor()
 
-    # df = pd.read_csv(FINAL_CSV_FILENAME)
-    df = pd.read_csv("collated_results.csv")
+    df = pd.read_csv(FINAL_CSV_FILENAME)
 
     # Helper to cast values (or None) given a dtype
     def _cast_value(val, dtype: str):

benchmarks/run_all.py

@@ -1,15 +1,13 @@
 import glob
-import logging as std_logging
+import logging
 import os
 import subprocess
 
 import pandas as pd
 
-from diffusers.utils import logging
 
-
-std_logging.basicConfig(level=std_logging.INFO, format="%(asctime)s %(levelname)s %(name)s: %(message)s")
-logger = logging.get_logger(__name__)
+logging.basicConfig(level=logging.INFO, format="%(asctime)s %(levelname)s %(name)s: %(message)s")
+logger = logging.getLogger(__name__)
 
 PATTERN = "benchmarking_*.py"
 FINAL_CSV_FILENAME = "collated_results.py"