Build AVX and basic ROCm wheels

jllllll · jllllll · commit 01a344b126ee · 2023-10-07T16:00:00.000-05:00
diff --git a/.github/workflows/build-wheels-batch-rocm.yml b/.github/workflows/build-wheels-batch-rocm.yml
@@ -5,9 +5,19 @@ on:
     inputs:
       versions:
         description: 'Comma-seperated version tags of llama-cpp-python to build'
-        default: 'v0.1.83,v0.1.82,v0.1.81,v0.1.80'
+        default: 'v0.2.11,v0.2.10,v0.2.9,v0.2.8'
         required: true
         type: string
+      config:
+        description: 'Override configurations to build: key1:item1-1,item1-2;key2:item2-1,item2-2'
+        default: 'Default'
+        required: false
+        type: string
+      exclude:
+        description: 'Exclude build configurations: key1-1:item1-1,key1-2:item1-2;key2-1:item2-1,key2-2:item2-2'
+        default: 'Default'
+        required: false
+        type: string
 
 permissions:
   contents: write
@@ -45,3 +55,5 @@ jobs:
     uses: ./.github/workflows/build-wheels-rocm-full.yml
     with:
       version: ${{ matrix.version }}
+      config: ${{ inputs.config }}
+      exclude: ${{ inputs.exclude }}
diff --git a/.github/workflows/build-wheels-full-release.yml b/.github/workflows/build-wheels-full-release.yml
@@ -4,8 +4,8 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: 'Version tag of llama-cpp-python to build: v0.2.9'
-        default: 'v0.2.9'
+        description: 'Version tag of llama-cpp-python to build: v0.2.11'
+        default: 'v0.2.11'
         required: true
         type: string
 
@@ -34,16 +34,16 @@ jobs:
     with:
       version: ${{ inputs.version }}
       
-  run_rocm:
-    name: Build ROCm Wheels
+  run_macos:
+    name: Build MacOS Metal Wheels
     needs: run_cpu
-    uses: ./.github/workflows/build-wheels-rocm-full.yml
+    uses: ./.github/workflows/build-wheels-macos.yml
     with:
       version: ${{ inputs.version }}
       
-  run_macos:
-    name: Build MacOS Metal Wheels
-    needs: run_rocm
-    uses: ./.github/workflows/build-wheels-macos.yml
+  run_rocm:
+    name: Build ROCm Wheels
+    needs: run_macos
+    uses: ./.github/workflows/build-wheels-rocm-full.yml
     with:
       version: ${{ inputs.version }}
diff --git a/.github/workflows/build-wheels-prioritized-release.yml b/.github/workflows/build-wheels-prioritized-release.yml
@@ -4,8 +4,8 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: 'Version tag of llama-cpp-python to build: v0.2.9'
-        default: 'v0.2.9'
+        description: 'Version tag of llama-cpp-python to build: v0.2.11'
+        default: 'v0.2.11'
         required: true
         type: string
 
@@ -40,7 +40,7 @@ jobs:
     uses: ./.github/workflows/build-wheels-rocm-full.yml
     with:
       version: ${{ inputs.version }}
-      config: 'os:ubuntu-20.04;pyver:3.10;rocm:5.4.2;rename:1'
+      config: 'os:ubuntu-20.04;pyver:3.10;rocm:5.6.1;rename:1'
       exclude: 'None'
       
   build_wheels_macos_prio:
@@ -75,18 +75,18 @@ jobs:
       version: ${{ inputs.version }}
       exclude: 'pyver:3.10,avx:basic'
       
-  build_wheels_rocm:
-    name: ROCm Wheels
-    needs: build_wheels_cpu
-    uses: ./.github/workflows/build-wheels-rocm-full.yml
-    with:
-      version: ${{ inputs.version }}
-      exclude: 'os:ubuntu-20.04,pyver:3.10,rocm:5.4.2,rename:1'
-      
   build_wheels_macos:
     name: MacOS Metal Wheels
-    needs: build_wheels_rocm
+    needs: build_wheels_cpu
     uses: ./.github/workflows/build-wheels-macos.yml
     with:
       version: ${{ inputs.version }}
       exclude: 'pyver:3.10'
+      
+  build_wheels_rocm:
+    name: ROCm Wheels
+    needs: build_wheels_macos
+    uses: ./.github/workflows/build-wheels-rocm-full.yml
+    with:
+      version: ${{ inputs.version }}
+      exclude: 'os:ubuntu-20.04,pyver:3.10,rocm:5.6.1,rename:1'
diff --git a/.github/workflows/build-wheels-rocm-full.yml b/.github/workflows/build-wheels-rocm-full.yml
@@ -4,8 +4,8 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: 'Version tag of llama-cpp-python to build: v0.2.9'
-        default: 'v0.2.9'
+        description: 'Version tag of llama-cpp-python to build: v0.2.11'
+        default: 'v0.2.11'
         required: true
         type: string
       config:
@@ -21,8 +21,8 @@ on:
   workflow_call:
     inputs:
       version:
-        description: 'Version tag of llama-cpp-python to build: v0.2.9'
-        default: 'v0.2.9'
+        description: 'Version tag of llama-cpp-python to build: v0.2.11'
+        default: 'v0.2.11'
         required: true
         type: string
       config:
@@ -60,6 +60,7 @@ jobs:
               'os' = 'ubuntu-20.04', 'windows-latest'
               'pyver' = "3.10", "3.8", "3.9", "3.11"
               'rocm' = '5.4.2', '5.5', '5.5.1', '5.6.1'
+              'avx' = "AVX", "AVX2", "basic"
               'rename' = '0', '1'
               'exclude' = @(
                   @{'os' = 'windows-latest';'rocm' = '5.4.2'},
@@ -81,7 +82,7 @@ jobs:
           Write-Output ('matrix=' + $matrixOut) >> $env:GITHUB_OUTPUT
           
   build_wheels:
-    name: Build ${{ matrix.os }} ROCm ${{ matrix.rocm }} ${{ matrix.rename == '1' && 'Textgen Wheel' || 'Wheel' }} ${{ matrix.pyver }}
+    name: Build ${{ matrix.os }} ${{ matrix.avx }} ROCm ${{ matrix.rocm }} ${{ matrix.rename == '1' && 'Textgen Wheel' || 'Wheel' }} ${{ matrix.pyver }}
     needs: define_matrix
     runs-on: ${{ matrix.os }}
     strategy:
@@ -92,6 +93,7 @@ jobs:
     env:
       PCKGVER: ${{ inputs.version }}
       ROCM_VERSION: ${{ matrix.rocm }}
+      AVXVER: ${{ matrix.avx }}
 
     steps:
       - name: Free Disk Space
@@ -190,10 +192,19 @@ jobs:
           }
           $env:VERBOSE = '1'
           $packageVersion = [version]$env:PCKGVER.TrimStart('v')
+          
           $gputargets = 'gfx803;gfx900;gfx906:xnack-;gfx908:xnack-;gfx90a:xnack+;gfx90a:xnack-;gfx1010;gfx1012;gfx1030;gfx1100;gfx1101;gfx1102'
           if ([version]$env:ROCM_VERSION -lt [version]'5.5') {$gputargets = 'gfx803;gfx900;gfx906:xnack-;gfx908:xnack-;gfx90a:xnack+;gfx90a:xnack-;gfx1010;gfx1012;gfx1030'}
-          $env:CMAKE_ARGS = "-GNinja -DLLAMA_HIPBLAS=ON -DGPU_TARGETS=$gputargets"
-          $buildtag = "+rocm$env:ROCM_VERSION"
+          
+          if ($env:AVXVER -eq 'AVX') {$env:CMAKE_ARGS = "-GNinja -DLLAMA_HIPBLAS=ON -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off -DGPU_TARGETS=$gputargets"}
+          if ($env:AVXVER -eq 'AVX512') {$env:CMAKE_ARGS = "-GNinja -DLLAMA_HIPBLAS=ON -DLLAMA_AVX512=on -DGPU_TARGETS=$gputargets"}
+          if ($env:AVXVER -eq 'basic') {$env:CMAKE_ARGS = "-GNinja -DLLAMA_HIPBLAS=ON -DLLAMA_AVX=off -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off -DGPU_TARGETS=$gputargets"}
+          if ($env:AVXVER -eq 'AVX2')
+          {
+              $env:CMAKE_ARGS = "-GNinja -DLLAMA_HIPBLAS=ON -DGPU_TARGETS=$gputargets"
+              $buildtag = "+rocm$env:ROCM_VERSION"
+          } else {$buildtag = "+rocm$env:ROCM_VERSION$env:AVXVER"}
+          
           if ($packageVersion -lt [version]'0.2.0') {
             python -m build --wheel -C--build-option=egg_info "-C--build-option=--tag-build=$buildtag"
           } else {
