Skip to content

Commit 09b4025

Browse files
authored
Merge pull request #275 from menloresearch/ci/add-windows-linux-common-cpu-instructions
ci: add common cpu instructions for windows and linux
2 parents ba66800 + 1d09ba8 commit 09b4025

File tree

1 file changed

+71
-3
lines changed

1 file changed

+71
-3
lines changed

.github/workflows/menlo-build.yml

Lines changed: 71 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,13 @@ on:
2424
"!README.md",
2525
]
2626
workflow_dispatch:
27+
28+
pull_request:
29+
branches:
30+
- dev
2731

2832
env:
29-
VULKAN_VERSION: 1.3.261.1
33+
VULKAN_VERSION: 1.4.328.0
3034

3135
jobs:
3236
create-draft-release:
@@ -56,12 +60,44 @@ jobs:
5660

5761
build-and-test:
5862
runs-on: ${{ matrix.runs-on }}
59-
needs: [create-draft-release]
63+
# needs: [create-draft-release]
6064
timeout-minutes: 270
6165
strategy:
6266
fail-fast: false
6367
matrix:
6468
include:
69+
- os: "linux"
70+
name: "common_cpus-x64"
71+
runs-on: "ubuntu-22-04-cuda-12-4"
72+
cmake-flags: "-DLLAMA_CURL=OFF -DGGML_BACKEND_DL=ON -DGGML_CPU_ALL_VARIANTS=ON -DBUILD_SHARED_LIBS=ON -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE='Release' -GNinja"
73+
run-e2e: false
74+
vulkan: false
75+
ccache: true
76+
ccache-dir: "/home/runner/.ccache"
77+
- os: "linux"
78+
name: "cuda-11-common_cpus-x64"
79+
runs-on: "ubuntu-22-04-cuda-11-7"
80+
cmake-flags: "-DLLAMA_CURL=OFF -DGGML_CUDA=ON -DGGML_BACKEND_DL=ON -DGGML_CPU_ALL_VARIANTS=ON -DBUILD_SHARED_LIBS=ON -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE='Release' -GNinja"
81+
run-e2e: false
82+
vulkan: false
83+
ccache: true
84+
ccache-dir: "/home/runner/.ccache"
85+
- os: "linux"
86+
name: "cuda-12-common_cpus-x64"
87+
runs-on: "ubuntu-22-04-cuda-12-4"
88+
cmake-flags: "-DLLAMA_CURL=OFF -DGGML_CUDA=ON -DGGML_BACKEND_DL=ON -DGGML_CPU_ALL_VARIANTS=ON -DBUILD_SHARED_LIBS=ON -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE='Release' -GNinja"
89+
run-e2e: false
90+
vulkan: false
91+
ccache: true
92+
ccache-dir: "/home/runner/.ccache"
93+
- os: "linux"
94+
name: "vulkan-common_cpus-x64"
95+
runs-on: "ubuntu-22-04"
96+
cmake-flags: "-DLLAMA_CURL=OFF -DGGML_VULKAN=ON -DGGML_BACKEND_DL=ON -DGGML_CPU_ALL_VARIANTS=ON -DBUILD_SHARED_LIBS=ON -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE='Release' -GNinja"
97+
run-e2e: false
98+
vulkan: true
99+
ccache: true
100+
ccache-dir: "/home/runner/.ccache"
65101
- os: "linux"
66102
name: "noavx-x64"
67103
runs-on: "ubuntu-20-04"
@@ -278,6 +314,38 @@ jobs:
278314
run-e2e: false
279315
ccache: false
280316
ccache-dir: 'C:\Users\ContainerAdministrator\AppData\Local\ccache'
317+
- os: "win"
318+
name: "common_cpus-x64"
319+
runs-on: "windows-cuda-12-0"
320+
cmake-flags: "-DLLAMA_CURL=OFF -DGGML_BACKEND_DL=ON -DGGML_CPU_ALL_VARIANTS=ON -DBUILD_SHARED_LIBS=ON -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE='Release' -GNinja"
321+
run-e2e: false
322+
vulkan: false
323+
ccache: true
324+
ccache-dir: 'C:\Users\ContainerAdministrator\AppData\Local\ccache'
325+
- os: "win"
326+
name: "cuda-11-common_cpus-x64"
327+
runs-on: "windows-cuda-11-7"
328+
cmake-flags: "-DLLAMA_CURL=OFF -DGGML_CUDA=ON -DGGML_NATIVE=OFF -DGGML_BACKEND_DL=ON -DGGML_CPU_ALL_VARIANTS=ON -DBUILD_SHARED_LIBS=ON -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE='Release' -GNinja"
329+
run-e2e: false
330+
vulkan: false
331+
ccache: true
332+
ccache-dir: 'C:\Users\ContainerAdministrator\AppData\Local\ccache'
333+
- os: "win"
334+
name: "cuda-12-common_cpus-x64"
335+
runs-on: "windows-cuda-12-0"
336+
cmake-flags: "-DLLAMA_CURL=OFF -DGGML_CUDA=ON -DGGML_NATIVE=OFF -DGGML_BACKEND_DL=ON -DGGML_CPU_ALL_VARIANTS=ON -DBUILD_SHARED_LIBS=ON -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE='Release' -GNinja"
337+
run-e2e: false
338+
vulkan: false
339+
ccache: true
340+
ccache-dir: 'C:\Users\ContainerAdministrator\AppData\Local\ccache'
341+
- os: "win"
342+
name: "vulkan-common_cpus-x64"
343+
runs-on: "windows-cuda-11-7"
344+
cmake-flags: "-DLLAMA_CURL=OFF -DGGML_VULKAN=ON -DGGML_NATIVE=OFF -DGGML_BACKEND_DL=ON -DGGML_CPU_ALL_VARIANTS=ON -DBUILD_SHARED_LIBS=ON -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE='Release' -GNinja"
345+
run-e2e: false
346+
vulkan: true
347+
ccache: true
348+
ccache-dir: 'C:\Users\ContainerAdministrator\AppData\Local\ccache'
281349

282350
steps:
283351
- name: Clone
@@ -335,7 +403,7 @@ jobs:
335403
if: ${{ matrix.vulkan && (matrix.os == 'win') }}
336404
continue-on-error: true
337405
run: |
338-
curl.exe -o $env:RUNNER_TEMP/VulkanSDK-Installer.exe -L "https://sdk.lunarg.com/sdk/download/${env:VULKAN_VERSION}/windows/VulkanSDK-${env:VULKAN_VERSION}-Installer.exe"
406+
curl.exe -o $env:RUNNER_TEMP/VulkanSDK-Installer.exe -L "https://sdk.lunarg.com/sdk/download/${env:VULKAN_VERSION}/windows/vulkansdk-windows-X64-${env:VULKAN_VERSION}.exe"
339407
& "$env:RUNNER_TEMP\VulkanSDK-Installer.exe" --accept-licenses --default-answer --confirm-command install
340408
Add-Content $env:GITHUB_ENV "VULKAN_SDK=C:\VulkanSDK\${env:VULKAN_VERSION}"
341409
Add-Content $env:GITHUB_PATH "C:\VulkanSDK\${env:VULKAN_VERSION}\bin"

0 commit comments

Comments
 (0)