Merge remote-tracking branch 'origin/main'

# Conflicts:
#	deepinv_bench/benchmarks/div2k_gaussian_deblurring/solvers/dps.py
#	deepinv_bench/benchmarks/div2k_inpainting_easy/solvers/dps.py
#	deepinv_bench/benchmarks/div2k_super_resolution_2x/solvers/dps.py

Author: tachella

.github/scripts/find_benchmarks.py

@@ -94,13 +94,20 @@ def main() -> None:
     root = Path.cwd()
     repo = Repo(root)
 
-    # Find all benchmark directories
+    # Retrieve all benchmark directories and setup dispatch filters based
+    # on dispatch context and git reference range (if applicable)
     all_dirs = find_benchmark_dirs(root)
-
-    # Get reference range for filtering
+    dispatch_benchmark_dir = os.environ.get("DISPATCH_BENCHMARK_DIR", "")
     ref_range = get_ref_range(repo)
 
-    if ref_range and not args.all:
+    if dispatch_benchmark_dir:
+        # If a specific benchmark dir is provided via dispatch, directly include it.
+        assert dispatch_benchmark_dir in all_dirs, (
+            f"Provided BENCHMARK_DIR '{dispatch_benchmark_dir}' is not a valid benchmark.\n"
+            "Valid values are:\n- " + "\n- ".join(all_dirs)
+        )
+        filtered_dirs = [dispatch_benchmark_dir]
+    elif ref_range and not args.all:
         base, head = ref_range
         changed_files = get_changed_files(repo, base, head)
         filtered_dirs = filter_changed_dirs(all_dirs, changed_files)
@@ -109,14 +116,14 @@ def main() -> None:
         filtered_dirs = all_dirs
 
     # Output as JSON
+    print(f"Found benchmark directories:\n{filtered_dirs}")
     result = json.dumps(filtered_dirs)
-    print(result)
 
     # If running in GitHub Actions, set the output
     github_output = os.environ.get("GITHUB_OUTPUT")
     if github_output:
         with open(github_output, "a") as f:
-            f.write(f"dirs={result}\n")
+            f.write(f"dirs={result}\nfound_benchmarks={len(filtered_dirs) > 0}\n")
 
 
 if __name__ == "__main__":

.github/workflows/benchopt_test.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-  create:
     tags:
       - '**'
   pull_request:
@@ -17,14 +16,15 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       benchmark-dirs: ${{ steps.find-dirs.outputs.dirs }}
+      found_benchmarks: ${{ steps.find-dirs.outputs.found_benchmarks }}
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.11'
+          python-version: '3.14'
       - name: Install dependencies
         run: pip install GitPython
       - name: Find benchmark directories
@@ -38,6 +38,7 @@ jobs:
 
   benchopt-tests:
     needs: find-benchmarks
+    if : needs.find-benchmarks.outputs.found_benchmarks == 'True'
     strategy:
       matrix:
         benchmark_dir: ${{ fromJson(needs.find-benchmarks.outputs.benchmark-dirs) }}

.github/workflows/deepinv_run_hf.yml

@@ -4,24 +4,29 @@ on:
   push:
     branches:
       - main
-  create:
     tags:
       - '**'
   workflow_dispatch:
+    inputs:
+      benchmark_dir:
+        description: 'Single benchmark dir to run (leave empty to run all)'
+        required: false
+        default: ''
 
 jobs:
   find-benchmarks:
     runs-on: ubuntu-latest
     outputs:
       benchmark-dirs: ${{ steps.find-dirs.outputs.dirs }}
+      found_benchmarks: ${{ steps.find-dirs.outputs.found_benchmarks }}
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.11'
+          python-version: '3.14'
       - name: Install dependencies
         run: pip install GitPython
       - name: Find benchmark directories
@@ -32,10 +37,12 @@ jobs:
           GITHUB_EVENT_NAME: ${{ github.event_name }}
           GITHUB_EVENT_BEFORE: ${{ github.event.before }}
           GITHUB_BASE_REF: ${{ github.event.pull_request.base.ref }}
+          DISPATCH_BENCHMARK_DIR: ${{ inputs.benchmark_dir }}
 
   run-benchmarks:
     runs-on: gpu  # ubuntu-latest
     needs: find-benchmarks
+    if : needs.find-benchmarks.outputs.found_benchmarks == 'True'
     timeout-minutes: 4320  # 3 days (max)
     strategy:
       matrix:
@@ -67,19 +74,17 @@ jobs:
       run: |
         rm -rf $HOME || echo "HOME "$HOME" doesn't exist"
         mkdir -p $HOME
-    - name: Get Date
+    - name: Compute cache key based on the date (monthly)
       id: get-date
       run: |
         echo "date=$(/bin/date -u "+%Y%m")" >> $GITHUB_OUTPUT
       shell: bash
     - name: Cache benchopt runs and conda packages
       id: cache-benchopt
-      uses: actions/cache@v5
+      uses: actions/cache/restore@v5  # restore only
       with:
         path: |
             ${{ matrix.benchmark_dir }}/__cache__
-        # The cache is unique for each benchmark directory, OS and we
-        # invalidate it every month to avoid stale caches.
         key: ${{ runner.os }}-${{matrix.benchmark_dir}}-${{ steps.get-date.outputs.date }}
 
     - name: Setup Conda
@@ -110,8 +115,17 @@ jobs:
             --no-plot --env-name ${{ env.RUN_CONDA_ENV }}
 
     - name: Upload results
+      if: always()
       run: |
         benchopt publish ${{ matrix.benchmark_dir }} --hub huggingface \
             --filename ${{ matrix.benchmark_dir }}/outputs/results_ci_run.csv \
             --repo deepinv/benchmarks --keep last \
             --token ${{ secrets.HF_TOKEN }}
+
+    - name: Save cache
+      if: always()
+      uses: actions/cache/save@v5
+      with:
+        path: |
+            ${{ matrix.benchmark_dir }}/__cache__
+        key: ${{ runner.os }}-${{matrix.benchmark_dir}}-${{ steps.get-date.outputs.date }}

deepinv_bench/benchmarks/div2k_gaussian_deblurring/solvers/dps.py

@@ -30,7 +30,7 @@ def set_objective(self, train_dataset=None, physics=None):
             raise NotImplementedError
 
         self.model = dinv.sampling.DPS(
-            model=denoiser, device=device, max_iter=self.max_iter, dtype=torch.float32
+            denoiser=denoiser, device=device, max_iter=self.max_iter, dtype=torch.float32
         )
         self.model.device = device
 

deepinv_bench/benchmarks/div2k_inpainting_easy/solvers/dps.py

@@ -30,7 +30,7 @@ def set_objective(self, train_dataset=None, physics=None):
             raise NotImplementedError
 
         self.model = dinv.sampling.DPS(
-            model=denoiser, device=device, max_iter=self.max_iter, dtype=torch.float32
+            denoiser=denoiser, device=device, max_iter=self.max_iter, dtype=torch.float32
         )
         self.model.device = device
 

deepinv_bench/benchmarks/div2k_super_resolution_2x/solvers/dps.py

@@ -30,7 +30,7 @@ def set_objective(self, train_dataset=None, physics=None):
             raise NotImplementedError
 
         self.model = dinv.sampling.DPS(
-            model=denoiser, device=device, max_iter=self.max_iter, dtype=torch.float32
+            denoiser=denoiser, device=device, max_iter=self.max_iter, dtype=torch.float32
         )
         self.model.device = device