Skip to content

build: fix the SYCL and Windows CUDA 13.3 release builds after the upstream merge #422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bri-prism merged 2 commits into from
Oct 31, 2026
Merged

build: fix the SYCL and Windows CUDA 13.3 release builds after the upstream merge #422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e83b49e
sycl: keep one ggml_sycl_mul_mat_vec_q_glu_reorder after the upstream…
bri-prism Oct 31, 2026
1ec50bc
ci: restore the CUDA 13.3 install step in windows-setup-cuda
bri-prism Oct 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions .github/actions/windows-setup-cuda/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,37 @@ runs:
echo "CUDA_PATH=C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v13.1" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
echo "CUDA_PATH_V13_1=C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v13.1" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
- name: Install Cuda Toolkit 13.3
if: ${{ inputs.cuda_version == '13.3' }}
shell: pwsh
run: |
mkdir -p "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v13.3"
choco install unzip -y
curl -O "https://developer.download.nvidia.com/compute/cuda/redist/cuda_crt/windows-x86_64/cuda_crt-windows-x86_64-13.3.33-archive.zip"
curl -O "https://developer.download.nvidia.com/compute/cuda/redist/cuda_cudart/windows-x86_64/cuda_cudart-windows-x86_64-13.3.29-archive.zip"
curl -O "https://developer.download.nvidia.com/compute/cuda/redist/cuda_nvcc/windows-x86_64/cuda_nvcc-windows-x86_64-13.3.33-archive.zip"
curl -O "https://developer.download.nvidia.com/compute/cuda/redist/cuda_nvrtc/windows-x86_64/cuda_nvrtc-windows-x86_64-13.3.33-archive.zip"
curl -O "https://developer.download.nvidia.com/compute/cuda/redist/libcublas/windows-x86_64/libcublas-windows-x86_64-13.5.1.27-archive.zip"
curl -O "https://developer.download.nvidia.com/compute/cuda/redist/libnvvm/windows-x86_64/libnvvm-windows-x86_64-13.3.33-archive.zip"
curl -O "https://developer.download.nvidia.com/compute/cuda/redist/cuda_nvtx/windows-x86_64/cuda_nvtx-windows-x86_64-13.3.29-archive.zip"
curl -O "https://developer.download.nvidia.com/compute/cuda/redist/cuda_profiler_api/windows-x86_64/cuda_profiler_api-windows-x86_64-13.3.27-archive.zip"
curl -O "https://developer.download.nvidia.com/compute/cuda/redist/visual_studio_integration/windows-x86_64/visual_studio_integration-windows-x86_64-13.3.27-archive.zip"
curl -O "https://developer.download.nvidia.com/compute/cuda/redist/cccl/windows-x86_64/cccl-windows-x86_64-13.3.3.3.1-archive.zip"
unzip '*.zip' -d "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v13.3"
xcopy "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v13.3\cuda_crt-windows-x86_64-13.3.33-archive\*" "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v13.3" /E /I /H /Y
xcopy "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v13.3\cuda_cudart-windows-x86_64-13.3.29-archive\*" "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v13.3" /E /I /H /Y
xcopy "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v13.3\cuda_nvcc-windows-x86_64-13.3.33-archive\*" "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v13.3" /E /I /H /Y
xcopy "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v13.3\cuda_nvrtc-windows-x86_64-13.3.33-archive\*" "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v13.3" /E /I /H /Y
xcopy "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v13.3\libcublas-windows-x86_64-13.5.1.27-archive\*" "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v13.3" /E /I /H /Y
xcopy "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v13.3\libnvvm-windows-x86_64-13.3.33-archive\*" "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v13.3" /E /I /H /Y
xcopy "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v13.3\cuda_nvtx-windows-x86_64-13.3.29-archive\*" "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v13.3" /E /I /H /Y
xcopy "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v13.3\cuda_profiler_api-windows-x86_64-13.3.27-archive\*" "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v13.3" /E /I /H /Y
xcopy "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v13.3\visual_studio_integration-windows-x86_64-13.3.27-archive\*" "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v13.3" /E /I /H /Y
xcopy "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v13.3\cccl-windows-x86_64-13.3.3.3.1-archive\*" "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v13.3" /E /I /H /Y
echo "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v13.3\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
echo "CUDA_PATH=C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v13.3" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
echo "CUDA_PATH_V13_3=C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v13.3" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
- name: Install Cuda Toolkit 13.4 for x64
if: ${{ inputs.cuda_version == '13.4' && inputs.cuda_arch == 'x64' }}
shell: pwsh
Expand Down
70 changes: 27 additions & 43 deletions ggml/src/ggml-sycl/mmvq.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4840,49 +4840,6 @@ static bool dispatch_mul_mat_vec_q_glu_plain(const void * vgate, const void * vu
return false;
}

bool ggml_sycl_mul_mat_vec_q_glu_reorder(enum ggml_type src0_type, enum ggml_glu_op glu_op, const void * vx,
const void * vgate, const void * vy, float * dst, int ncols, int nrows,
int ncols_dst, int stride_col_y_bytes, int stride_col_dst,
dpct::queue_ptr stream) {
if (glu_op != GGML_GLU_OP_SWIGLU && glu_op != GGML_GLU_OP_GEGLU) {
return false;
}
switch (src0_type) {
case GGML_TYPE_Q4_K:
return mul_mat_vec_q_glu_reorder_type<GGML_TYPE_Q4_K>(glu_op, vx, vgate, vy, dst, ncols, nrows, ncols_dst,
stride_col_y_bytes, stride_col_dst, stream);
case GGML_TYPE_PQ2_0:
return mul_mat_vec_q_glu_reorder_type<GGML_TYPE_PQ2_0>(glu_op, vx, vgate, vy, dst, ncols, nrows, ncols_dst,
stride_col_y_bytes, stride_col_dst, stream);
case GGML_TYPE_Q6_K: // ARC-LAB: GGML_SYCL_Q6K_GLU (fusion.cpp)
return mul_mat_vec_q_glu_reorder_type<GGML_TYPE_Q6_K>(glu_op, vx, vgate, vy, dst, ncols, nrows, ncols_dst,
stride_col_y_bytes, stride_col_dst, stream);
case GGML_TYPE_PTQ1_0:
if (ncols_dst == 1 && ggml_sycl_ptq1_0_glu_n1_enabled()) {
static const int glu_nr = getenv("GGML_SYCL_PTQ1_GLU1_NR") ? atoi(getenv("GGML_SYCL_PTQ1_GLU1_NR")) : 2;
if (glu_nr == 4) {
launch_ptq1_0_pairs_glu<4>(vx, vgate, vy, dst, ncols, nrows, glu_op, stream);
} else {
launch_ptq1_0_pairs_glu<2>(vx, vgate, vy, dst, ncols, nrows, glu_op, stream);
}
return true;
}
if (ptq1_0_ncols_dec_enabled() && ncols_dst >= 1 && ncols_dst <= 8) {
#define PTQ1_DEC_GLU(N) case N: launch_ptq1_0_ncols_dec<N, true>(vx, vgate, vy, dst, ncols, nrows, stride_col_y_bytes, \
stride_col_dst, glu_op, stream); return true;
switch (ncols_dst) {
PTQ1_DEC_GLU(1) PTQ1_DEC_GLU(2) PTQ1_DEC_GLU(3) PTQ1_DEC_GLU(4)
PTQ1_DEC_GLU(5) PTQ1_DEC_GLU(6) PTQ1_DEC_GLU(7) PTQ1_DEC_GLU(8)
}
#undef PTQ1_DEC_GLU
}
return mul_mat_vec_q_glu_reorder_type<GGML_TYPE_PTQ1_0>(glu_op, vx, vgate, vy, dst, ncols, nrows, ncols_dst,
stride_col_y_bytes, stride_col_dst, stream);
default:
return false;
}
}

// ARC-LAB: reordered q4_0 x f32 for 5..64 columns (speculative verify / n-gram drafts) on XMX via s8 x s4 DPAS
// (inline vISA, xe2-dpas.hpp; Xe2). The MMVQ column kernels re-read the weights per 8 columns and the dequantize
// + GEMM path converts the whole matrix; here each weight row streams once for all columns. One lane per weight row: B =
Expand Down Expand Up @@ -5074,6 +5031,33 @@ bool ggml_sycl_mul_mat_vec_q_glu_reorder(enum ggml_type src0_type, enum ggml_glu
// fusion declines q5_K past 5 columns
return mul_mat_vec_q_glu_reorder_ncols<GGML_TYPE_Q5_K, 1, 2, 3, 4, 5>(
glu_op, vx, vgate, vy, dst, ncols, nrows, ncols_dst, stride_col_y_bytes, stride_col_dst, stream);
case GGML_TYPE_PQ2_0:
return mul_mat_vec_q_glu_reorder_type<GGML_TYPE_PQ2_0>(glu_op, vx, vgate, vy, dst, ncols, nrows, ncols_dst,
stride_col_y_bytes, stride_col_dst, stream);
case GGML_TYPE_Q6_K: // ARC-LAB: GGML_SYCL_Q6K_GLU (fusion.cpp)
return mul_mat_vec_q_glu_reorder_type<GGML_TYPE_Q6_K>(glu_op, vx, vgate, vy, dst, ncols, nrows, ncols_dst,
stride_col_y_bytes, stride_col_dst, stream);
case GGML_TYPE_PTQ1_0:
if (ncols_dst == 1 && ggml_sycl_ptq1_0_glu_n1_enabled()) {
static const int glu_nr = getenv("GGML_SYCL_PTQ1_GLU1_NR") ? atoi(getenv("GGML_SYCL_PTQ1_GLU1_NR")) : 2;
if (glu_nr == 4) {
launch_ptq1_0_pairs_glu<4>(vx, vgate, vy, dst, ncols, nrows, glu_op, stream);
} else {
launch_ptq1_0_pairs_glu<2>(vx, vgate, vy, dst, ncols, nrows, glu_op, stream);
}
return true;
}
if (ptq1_0_ncols_dec_enabled() && ncols_dst >= 1 && ncols_dst <= 8) {
#define PTQ1_DEC_GLU(N) case N: launch_ptq1_0_ncols_dec<N, true>(vx, vgate, vy, dst, ncols, nrows, stride_col_y_bytes, \
stride_col_dst, glu_op, stream); return true;
switch (ncols_dst) {
PTQ1_DEC_GLU(1) PTQ1_DEC_GLU(2) PTQ1_DEC_GLU(3) PTQ1_DEC_GLU(4)
PTQ1_DEC_GLU(5) PTQ1_DEC_GLU(6) PTQ1_DEC_GLU(7) PTQ1_DEC_GLU(8)
}
#undef PTQ1_DEC_GLU
}
return mul_mat_vec_q_glu_reorder_type<GGML_TYPE_PTQ1_0>(glu_op, vx, vgate, vy, dst, ncols, nrows, ncols_dst,
stride_col_y_bytes, stride_col_dst, stream);
default:
return false;
}
Expand Down
Loading