Merge remote-tracking branch 'refs/remotes/origin/main'

Author: matthewdouglas

.github/workflows/package.yml

@@ -7,39 +7,20 @@ on:
     branches: [main]
   release:
     types: [published]
-  workflow_dispatch: {}
+  workflow_dispatch:
+    inputs:
+      publish:
+        description: 'Publish to PyPI'
+        required: false
+        default: 'false'
+        type: choice
+        options:
+          - 'true'
+          - 'false'
 
 jobs:
-  # TODO: add testing functionality on Intel runner, by Intel team
-  # test:
-  #   runs-on: ubuntu-latest
-  #   strategy:
-  #     matrix:
-  #       python-version: ["3.8", "3.9", "3.10", "3.11"]
-  #   steps:
-  #     - uses: actions/checkout@v4
-  #     - name: Set up Python ${{ matrix.python-version }}
-  #       uses: actions/setup-python@v5
-  #       with:
-  #         python-version: ${{ matrix.python-version }}
-  #         cache: pip
-  #     - name: Install dependencies
-  #       run: |
-  #         python -m pip install --upgrade pip
-  #         pip install pytest
-  #         pip install -e .
-  #     - name: Test with pytest
-  #       run: pytest
-
-  build-and-publish:
-    needs: test
+  build:
     runs-on: ubuntu-latest
-    if: github.event_name == 'release' && github.event.action == 'published'
-    environment:
-      name: release
-      url: https://pypi.org/p/bitsandbytes-intel
-    permissions:
-      id-token: write
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python
@@ -52,5 +33,91 @@ jobs:
           pip install build wheel
       - name: Build package
         run: python -m build
+      - name: Upload build artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: dist
+          path: dist/
+          retention-days: 7
+
+  test:
+    needs: build
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version:
+          - "3.9"
+          # - "3.10"
+          # - "3.11"
+          # - "3.12"
+          # - "3.13"
+    steps:
+      - uses: actions/checkout@v4
+      
+      - name: Checkout bitsandbytes
+        uses: actions/checkout@v4
+        with:
+          repository: bitsandbytes-foundation/bitsandbytes
+          path: bitsandbytes
+      
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+          cache: pip
+      
+      - name: Install build tools
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y build-essential cmake
+      
+      - name: Compile bitsandbytes with CPU backend
+        run: |
+          cd bitsandbytes
+          cmake -DCOMPUTE_BACKEND=cpu -S . && make
+          cd ..
+          
+      - name: Download build artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: dist
+          path: dist/
+          
+      - name: Install dependencies and built package
+        run: |
+          python -m pip install --upgrade pip
+          pip install ./bitsandbytes
+          pip install dist/*.whl
+          
+      - name: Test import works
+        run: |
+          python -c "
+          import bitsandbytes
+          print('✅ bitsandbytes import successful')
+          import bnb_intel
+          print('✅ bnb_intel import successful')
+          print('✅ All imports successful')
+          "
+      
+      # - name: Test with pytest
+      #   run: pytest
+
+  publish:
+    needs: [build, test]
+    runs-on: ubuntu-latest
+    if: github.event_name == 'release' && github.event.action == 'published' || (github.event_name == 'workflow_dispatch' && github.event.inputs.publish == 'true')
+    environment:
+      name: release
+      url: https://pypi.org/p/bitsandbytes-intel
+    permissions:
+      id-token: write
+    steps:
+      - name: Download build artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: dist
+          path: dist/
       - name: Publish to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          packages-dir: dist/