From: Bowen Han <redacted>
Date: Tue, 16 Sep 2025 06:59:19 +0000 (-0700)
Subject: fix: apply clang-format to CUDA macros (#16017)
X-Git-Tag: upstream/0.0.6527~41
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=f1fbffb5c0b34b2a68febb7da3fd0f8333f1ed4c;p=pkg%2Fggml%2Fsources%2Fllama.cpp

fix: apply clang-format to CUDA macros (#16017)

clang-format previously broke long CUDA macros (e.g. __launch_bounds__) into
unreadable line breaks inside template declarations, such as:

  template<int D, int ncols, int nwarps, int VKQ_stride,
           typename KQ_acc_t, bool use_logit_softcap>
      __launch_bounds__(nwarps*ggml_cuda_get_physical_warp_size(), 1)

This change adjusts formatting rules so that CUDA macros remain consistent
and aligned with the surrounding template syntax.
---

diff --git a/.clang-format b/.clang-format
index 117e6986..742723fc 100644
--- a/.clang-format
+++ b/.clang-format
@@ -22,6 +22,13 @@ AllowShortIfStatementsOnASingleLine: Never
 AllowShortLambdasOnASingleLine: Inline
 AllowShortLoopsOnASingleLine: false
 AlwaysBreakBeforeMultilineStrings: true
+# Treat CUDA keywords/attributes as "attribute macros" and avoid breaking lines inside them
+AttributeMacros:
+  - __host__
+  - __device__
+  - __global__
+  - __forceinline__
+  - __launch_bounds__
 BinPackArguments: true
 BinPackParameters: false # OnePerLine
 BitFieldColonSpacing: Both