merge main

Author: 宣源

.github/ISSUE_TEMPLATE/1-bug-report.yml

@@ -3,39 +3,38 @@ name: 🐞 Bug report
 description: Create a report to help us reproduce and fix the bug
 title: "[Bug] "
 labels: ['Bug']
-
 body:
-- type: checkboxes
-  attributes:
-    label: Checklist
-    options:
-    - label: 1. I have searched for related issues and FAQs (https://github.com/mit-han-lab/nunchaku/blob/main/docs/faq.md) but was unable to find a solution.
-    - label: 2. The issue persists in the latest version.
-    - label: 3. Please note that without environment information and a minimal reproducible example, it will be difficult for us to reproduce and address the issue, which may delay our response.
-    - label: 4. If your report is a question rather than a bug, please submit it as a discussion at https://github.com/mit-han-lab/ComfyUI-nunchaku/discussions/new/choose. Otherwise, this issue will be closed.
-    - label: 5. I will do my best to describe the issue in English.
-- type: textarea
-  attributes:
-    label: Describe the Bug
-    description: Provide a clear and concise explanation of the bug you encountered.
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Environment
-    description: |
-      Please include relevant environment details such as your system specifications, Python version, PyTorch version, and CUDA version.
-    placeholder: "Example: Ubuntu 24.04, Python 3.11, PyTorch 2.6, CUDA 12.4"
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Reproduction Steps
-    description: |
-      Please provide clear, step-by-step instructions to help us reproduce the issue. Be as specific as possible. Include the following:
-      - The ComfyUI workflow file (`.json`) you used, along with a screenshot of your workflow
-      - Links to the models, LoRAs, and control components involved
-      - The exact prompt(s) used
-      - Any input images required by the workflow
-  validations:
-    required: true
+  - type: checkboxes
+    attributes:
+      label: Checklist
+      options:
+        - label: 1. I have searched for related issues and FAQs (https://github.com/mit-han-lab/nunchaku/blob/main/docs/faq.md) but was unable to find a solution.
+        - label: 2. The issue persists in the latest version.
+        - label: 3. Please note that without environment information and a minimal reproducible example, it will be difficult for us to reproduce and address the issue, which may delay our response.
+        - label: 4. If your report is a question rather than a bug, please submit it as a discussion at https://github.com/mit-han-lab/ComfyUI-nunchaku/discussions/new/choose. Otherwise, this issue will be closed.
+        - label: 5. I will do my best to describe the issue in English.
+  - type: textarea
+    attributes:
+      label: Describe the Bug
+      description: Provide a clear and concise explanation of the bug you encountered.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Environment
+      description: |
+        Please include relevant environment details such as your system specifications, Python version, PyTorch version, and CUDA version.
+      placeholder: "Example: Ubuntu 24.04, Python 3.11, PyTorch 2.6, CUDA 12.4"
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Reproduction Steps
+      description: |
+        Please provide clear, step-by-step instructions to help us reproduce the issue. Be as specific as possible. Include the following:
+        - The ComfyUI workflow file (`.json`) you used, along with a screenshot of your workflow
+        - Links to the models, LoRAs, and control components involved
+        - The exact prompt(s) used
+        - Any input images required by the workflow
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/2-feature-request.yml

@@ -2,23 +2,22 @@
 name: 🚀 Feature request
 description: Suggest an idea for this project
 title: "[Feature] "
-
 body:
-- type: checkboxes
-  attributes:
-    label: Checklist
-    options:
-    - label: 1. If the issue you raised is not a feature but a question, please raise a discussion at https://github.com/mit-han-lab/ComfyUI-nunchaku/discussions/new/choose. Otherwise, it will be closed.
-    - label: 2. I will do my best to describe the issue in English.
-- type: textarea
-  attributes:
-    label: Motivation
-    description: |
-      A clear and concise description of the motivation of the feature.
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Related resources
-    description: |
-      If there is an official code release or third-party implementations, please also provide the information here, which would be very helpful.
+  - type: checkboxes
+    attributes:
+      label: Checklist
+      options:
+        - label: 1. If the issue you raised is not a feature but a question, please raise a discussion at https://github.com/mit-han-lab/ComfyUI-nunchaku/discussions/new/choose. Otherwise, it will be closed.
+        - label: 2. I will do my best to describe the issue in English.
+  - type: textarea
+    attributes:
+      label: Motivation
+      description: |
+        A clear and concise description of the motivation of the feature.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Related resources
+      description: |
+        If there is an official code release or third-party implementations, please also provide the information here, which would be very helpful.

…b/workflows/auto-merge-main-into-dev.yml …/workflows/auto-merge-main-into-dev.yaml.github/workflows/auto-merge-main-into-dev.yml renamed to .github/workflows/auto-merge-main-into-dev.yaml .github/workflows/auto-merge-main-into-dev.yml renamed to .github/workflows/auto-merge-main-into-dev.yaml

@@ -1,26 +1,21 @@
 name: Auto-merge main into dev
-
 on:
   workflow_dispatch:
   push:
     branches:
       - main
-
 permissions:
   contents: write
-
 jobs:
   merge-main-into-dev:
     runs-on: ubuntu-latest
     if: github.repository == 'mit-han-lab/ComfyUI-nunchaku'
-
     steps:
       - name: Checkout the repository
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
           token: ${{ secrets.GH_TOKEN }}
-
       - name: Check if main and dev are already in sync
         id: check_sync
         run: |
@@ -36,7 +31,6 @@ jobs:
             echo "Branches differ. Proceeding with merge."
             echo "skip_merge=false" >> "$GITHUB_OUTPUT"
           fi
-
       - name: Merge main into dev
         id: last_commit
         if: steps.check_sync.outputs.skip_merge == 'false'

…hub/workflows/close_inactive_issues.yaml …hub/workflows/close-inactive-issues.yaml.github/workflows/close_inactive_issues.yaml renamed to .github/workflows/close-inactive-issues.yaml .github/workflows/close_inactive_issues.yaml renamed to .github/workflows/close-inactive-issues.yaml

@@ -1,15 +1,12 @@
 # Borrowed from https://github.com/sgl-project/sglang/blob/main/.github/workflows/close-inactive-issues.yml
 name: Close Inactive Issues
-
 on:
   schedule:
     - cron: '0 0 * * *'
   workflow_dispatch:
-
 permissions:
   issues: write
   contents: read
-
 jobs:
   close-inactive-issues:
     if: github.repository == 'mit-han-lab/ComfyUI-nunchaku'

.github/workflows/lint.yaml

@@ -1,5 +1,4 @@
 name: Lint
-
 on:
   push:
     branches:
@@ -15,34 +14,27 @@ on:
         options:
           - pr
           - branch
-
       pr_number:
         description: 'Pull Request Number (only if test_target == "pr")'
         required: false
-
       branch_name:
         description: 'Branch name (only if test_target == "branch")'
         default: 'main'
         required: false
-
 jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-
       - name: Show current commit
         run: git log -1 --oneline
-
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
           python-version: '3.11'
-
       - name: Install pre-commit hook
         run: |
           python -m pip install pre-commit
           pre-commit install
-
       - name: Linting
         run: pre-commit run --all-files --show-diff-on-failure

.github/workflows/test_ampere.yaml .github/workflows/test-ampere.yaml.github/workflows/test_ampere.yaml renamed to .github/workflows/test-ampere.yaml

@@ -1,5 +1,4 @@
-name: test_ampere
-
+name: Ampere Tests
 on:
   workflow_dispatch:
     inputs:
@@ -10,11 +9,9 @@ on:
         options:
           - pr
           - branch
-
       pr_number:
         description: 'Pull Request Number (only if test_target == "pr")'
         required: false
-
       branch_name:
         description: 'Branch name (only if test_target == "branch")'
         default: 'main'
@@ -36,15 +33,13 @@ on:
 #  issue_comment:
 #    types: [ created ]
 
-
 concurrency:
   group: ${{ github.repository }}-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
-
 jobs:
   check-comment:
     if: ${{ github.event_name == 'workflow_dispatch' || (github.event_name == 'issue_comment' && github.event.issue.pull_request && !github.event.pull_request.draft) }}
-    runs-on: [ self-hosted, ampere ]
+    runs-on: [self-hosted, ampere]
     outputs:
       should_run: ${{ steps.check.outputs.should_run }}
     steps:
@@ -57,10 +52,9 @@ jobs:
           else
             echo "should_run=false" >> $GITHUB_OUTPUT
           fi
-
   run-tests:
-    runs-on: [ self-hosted, ampere ]
-    needs: [ check-comment ]
+    runs-on: [self-hosted, ampere]
+    needs: [check-comment]
     if: ${{ github.event_name != 'issue_comment' || needs.check-comment.outputs.should_run == 'true' }}
     steps:
       - name: Determine ref
@@ -76,16 +70,13 @@ jobs:
         with:
           ref: ${{ steps.set-ref.outputs.ref }}
           submodules: true
-
       - name: Show current commit
         run: git log -1 --oneline
-
       - name: Set up Python
         run: |
           which python
           echo "Setting up Python with Conda"
           conda create -n test_env python=3.12 -y
-
       - name: Install dependencies
         run: |
           source $(conda info --base)/etc/profile.d/conda.sh
@@ -95,7 +86,6 @@ jobs:
           echo "Installing dependencies"
           pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu128
           pip install ninja wheel diffusers transformers accelerate sentencepiece protobuf huggingface_hub
-
       - name: Install Nunchaku
         run: |
           source $(conda info --base)/etc/profile.d/conda.sh
@@ -113,7 +103,6 @@ jobs:
           git submodule init
           git submodule update
           NUNCHAKU_INSTALL_MODE=ALL python setup.py develop
-
       - name: Install ComfyUI and set up test environment
         run: |
           source $(conda info --base)/etc/profile.d/conda.sh
@@ -137,7 +126,6 @@ jobs:
           comfy node install comfyui-inpainteasy
           HF_TOKEN=${{ secrets.HF_TOKEN }} python custom_nodes/ComfyUI-nunchaku/scripts/download_models.py
           HF_TOKEN=${{ secrets.HF_TOKEN }} python custom_nodes/ComfyUI-nunchaku/scripts/download_test_data.py
-
       - name: Run tests
         run: |
           source $(conda info --base)/etc/profile.d/conda.sh
@@ -147,12 +135,10 @@ jobs:
           pwd
           python nunchaku_tests/scripts/nunchaku_flux1_dev.py
           pytest -v nunchaku_tests/
-
   clean-up:
     if: always() && (github.event_name != 'issue_comment' || needs.check-comment.outputs.should_run == 'true')
-    needs: [ run-tests ]
-    runs-on: [ self-hosted, ampere ]
-
+    needs: [run-tests]
+    runs-on: [self-hosted, ampere]
     steps:
       - name: Clean up
         run: |