Merge branch 'PanQiWei:main' into main

.github/workflows/build_wheels_rocm.yml

@@ -28,30 +28,42 @@ jobs:
         with:
           python-version: ${{ matrix.python }}
 
-      - name: Free disk space
+#      - name: Free disk space
-        run: |
+#        run: |
-          df -h
+#          df -h
-          echo "Removing large packages"
+#          echo "Removing large packages"
-          sudo apt-get remove -y '^dotnet-.*'
+#          sudo apt-get remove -y '^dotnet-.*'
-          sudo apt-get remove -y 'php.*'
+#          sudo apt-get remove -y 'php.*'
-          sudo apt-get remove -y azure-cli google-cloud-sdk google-chrome-stable firefox powershell mono-devel
+#          sudo apt-get remove -y azure-cli google-cloud-sdk google-chrome-stable firefox powershell mono-devel
-          df -h
+#          df -h
-          sudo apt-get autoremove -y >/dev/null 2>&1
+#          sudo apt-get autoremove -y >/dev/null 2>&1
-          sudo apt-get clean
+#          sudo apt-get clean
-          sudo apt-get autoremove -y >/dev/null 2>&1
+#          sudo apt-get autoremove -y >/dev/null 2>&1
-          sudo apt-get autoclean -y >/dev/null 2>&1
+#          sudo apt-get autoclean -y >/dev/null 2>&1
-          df -h
+#          df -h
-          echo "https://github.com/actions/virtual-environments/issues/709"
+#          echo "https://github.com/actions/virtual-environments/issues/709"
-          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+#          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
-          df -h
+#          df -h
-          echo "remove big /usr/local"
+#          echo "remove big /usr/local"
-          sudo rm -rf "/usr/local/share/boost"
+#          sudo rm -rf "/usr/local/share/boost"
-          sudo rm -rf /usr/local/lib/android >/dev/null 2>&1
+#          sudo rm -rf /usr/local/lib/android >/dev/null 2>&1
-          df -h
+#          df -h
-          sudo rm -rf /usr/share/dotnet/sdk > /dev/null 2>&1
+#          sudo rm -rf /usr/share/dotnet/sdk > /dev/null 2>&1
-          sudo rm -rf /usr/share/dotnet/shared > /dev/null 2>&1
+#          sudo rm -rf /usr/share/dotnet/shared > /dev/null 2>&1
-          sudo rm -rf /usr/share/swift > /dev/null 2>&1
+#          sudo rm -rf /usr/share/swift > /dev/null 2>&1
-          df -h
+#          df -h
+
+      - name: Setup Miniconda
+        uses: conda-incubator/setup-miniconda@v2.2.0
+        with:
+          activate-environment: "build"
+          python-version: ${{ matrix.python }}
+          mamba-version: "*"
+          use-mamba: false
+          channels: conda-forge,defaults
+          channel-priority: true
+          add-pip-as-python-dependency: true
+          auto-activate-base: false
 
       - name: Set up environment
         run: |
@@ -66,16 +78,19 @@ jobs:
           curl -O https://repo.radeon.com/amdgpu-install/${{ matrix.rocm }}/ubuntu/jammy/$ROCM_DL_FILE
           sudo dpkg -i $ROCM_DL_FILE
           sudo DEBIAN_FRONTEND=noninteractive amdgpu-install --usecase=rocm --no-dkms --no-32 -y
+
       - name: Install dependencies
         run: |
           sudo apt-get update
           sudo apt-get install -y --no-install-recommends rocsparse-dev rocthrust-dev rocblas-dev hipblas-dev hipsparse-dev
 
-          python -m pip install torch --index-url https://download.pytorch.org/whl/rocm${{ matrix.rocm }}
           python -m pip install --upgrade build setuptools wheel ninja
+          python -m pip install torch --index-url https://download.pytorch.org/whl/rocm${{ matrix.rocm }}
+
       - name: Build wheels
         run: |
           ROCM_VERSION=${{ matrix.rocm }} python setup.py sdist bdist_wheel
+
       - uses: actions/upload-artifact@v3
         with:
           name: 'linux-rocm-wheels'

auto_gptq/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.4.0"
+__version__ = "0.4.1"
 from .modeling import BaseQuantizeConfig
 from .modeling import AutoGPTQForCausalLM
 from .utils.peft_utils import get_gptq_peft_model

auto_gptq/nn_modules/fused_llama_attn.py

@@ -79,7 +79,7 @@ class FusedLlamaAttentionForQuantizedModel(FusedBaseAttentionModule):
 
         past_key_value = (key_states, value_states) if use_cache else None
 
-        if compare_pytorch_version("v2.0.0", op="eq"):
+        if compare_pytorch_version("v2.0.0", op="ge"):
             attn_output = F.scaled_dot_product_attention(
                 query_states,
                 key_states,

setup.py

@@ -9,7 +9,7 @@ os.environ["CC"] = "g++"
 os.environ["CXX"] = "g++"
 
 common_setup_kwargs = {
-    "version": "0.4.0",
+    "version": "0.4.1",
     "name": "auto_gptq",
     "author": "PanQiWei",
     "description": "An easy-to-use LLMs quantization package with user-friendly apis, based on GPTQ algorithm.",