style: group local, third-party and standard headers

.clang-format

@@ -3,3 +3,14 @@ IndentWidth: 4
 ColumnLimit: 120
 PointerAlignment: Right
 SortIncludes: CaseSensitive
+IncludeBlocks: Regroup
+IncludeCategories:
+  # Third-party headers may use either angle brackets or quotes.
+  - Regex: '^[<"](CLI/|ggml[^>]*\.h[>"]|gguf\.h[>"]|gtest/|httplib\.h[>"]|miniaudio\.h[>"]|nlohmann/|unicode/)'
+    Priority: 1
+  # Keep the main header (implicitly priority 0) with other local headers.
+  - Regex: '^"'
+    Priority: 0
+  # Standard library and platform headers.
+  - Regex: '.*'
+    Priority: 2

src/audio.cpp

@@ -27,11 +27,10 @@
 #define MA_NO_RUNTIME_LINKING
 #define MA_NO_ENCODING
 #define MA_NO_GENERATION
-#include "miniaudio.h"
-
 #include "audio.h"
 
-#include <stdexcept>
+#include "miniaudio.h"
+
 #include <algorithm>
 #include <cmath>
 #include <complex>
@@ -40,6 +39,7 @@
 #include <limits>
 #include <memory>
 #include <numbers>
+#include <stdexcept>
 
 namespace clap {
 

src/cli.cpp

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "embedding.h"
 #include "clap.h"
+#include "embedding.h"
 #include "quantize.h"
 #include "server.h"
 

src/embedding.cpp

@@ -1,6 +1,6 @@
-#include "embedding.h"
-#include "clap.h"
 #include "audio.h"
+#include "clap.h"
+#include "embedding.h"
 
 #include <nlohmann/json.hpp>
 

src/graph.cpp

@@ -1,5 +1,7 @@
 #include "graph.h"
+
 #include <ggml-cpu.h>
+
 #include <algorithm>
 #include <cmath>
 #include <cstdlib>

src/graph.h

@@ -2,7 +2,9 @@
 
 #include "model-loader.h"
 #include "tensor-data.h"
+
 #include <ggml-backend.h>
+
 #include <functional>
 #include <memory>
 #include <mutex>

src/model-loader.cpp

@@ -1,11 +1,12 @@
 #include "model-loader.h"
 #include "quantization-policy.h"
 #include "tensor-data.h"
-#include <stdexcept>
-#include <fstream>
-#include <filesystem>
+
 #include <cmath>
 #include <cstring>
+#include <filesystem>
+#include <fstream>
+#include <stdexcept>
 #ifndef _WIN32
 #include <fcntl.h>
 #include <sys/mman.h>

src/model-loader.h

@@ -2,12 +2,13 @@
 
 #include <ggml.h>
 #include <gguf.h>
+
 #include <cstdint>
 #include <initializer_list>
 #include <string>
-#include <utility>
 #include <unordered_map>
 #include <unordered_set>
+#include <utility>
 #include <vector>
 
 namespace clap {

src/model.cpp

@@ -1,7 +1,8 @@
-#include "model.h"
 #include "audio.h"
+#include "model.h"
 #include "models/models.h"
 #include "vocab.h"
+
 #include <stdexcept>
 
 CLAP::CLAP(const std::string &path, const clap::RuntimeOptions &options) : loader(options) {

src/model.h

@@ -3,12 +3,14 @@
 #include "clap.h"
 #include "graph.h"
 #include "model-loader.h"
+
+#include <nlohmann/json.hpp>
+
 #include <cstddef>
 #include <memory>
 #include <stdexcept>
 #include <string>
 #include <vector>
-#include <nlohmann/json.hpp>
 
 namespace clap {
 // Time-major waveform encoder output; values contains frames * dimension elements.

src/models/clamp3.cpp

@@ -1,8 +1,9 @@
 #include "models.h"
-#include <stdexcept>
+
 #include <algorithm>
 #include <cmath>
 #include <limits>
+#include <stdexcept>
 
 namespace clap::detail {
 using json = nlohmann::json;

src/models/clap.cpp

@@ -1,9 +1,10 @@
-#include "models.h"
 #include "audio.h"
-#include <stdexcept>
+#include "models.h"
+
 #include <algorithm>
 #include <cmath>
 #include <limits>
+#include <stdexcept>
 
 namespace clap::detail {
 using json = nlohmann::json;

src/models/clap2.cpp

@@ -1,5 +1,6 @@
-#include "model.h"
 #include "audio.h"
+#include "model.h"
+
 #include <algorithm>
 #include <cmath>
 #include <complex>

src/models/mert.cpp

@@ -1,4 +1,5 @@
 #include "models.h"
+
 #include <algorithm>
 #include <cmath>
 #include <limits>

src/models/mert2.cpp

@@ -1,11 +1,11 @@
-#include "models.h"
 #include "audio.h"
+#include "models.h"
 
-#include <stdexcept>
 #include <algorithm>
 #include <cmath>
 #include <complex>
 #include <limits>
+#include <stdexcept>
 
 namespace clap::detail {
 using json = nlohmann::json;

src/models/models.h

@@ -1,9 +1,10 @@
 #pragma once
 
-#include "model.h"
-#include "model-loader.h"
 #include "graph.h"
+#include "model-loader.h"
 #include "model-weights.h"
+#include "model.h"
+
 #include <nlohmann/json.hpp>
 
 namespace clap::detail {

src/models/muq.cpp

@@ -1,5 +1,6 @@
-#include "models.h"
 #include "audio.h"
+#include "models.h"
+
 #include <algorithm>
 #include <cmath>
 #include <complex>

src/models/muq_mulan.cpp

@@ -1,4 +1,5 @@
 #include "models.h"
+
 #include <algorithm>
 #include <cmath>
 #include <limits>

src/quantization-policy.h

@@ -1,5 +1,6 @@
 #pragma once
 #include <ggml.h>
+
 #include <regex>
 #include <string>
 

src/quantize-output.h

@@ -2,13 +2,13 @@
 
 #include <cerrno>
 #include <cstdio>
+#include <fcntl.h>
 #include <filesystem>
 #include <random>
 #include <stdexcept>
 #include <string>
-#include <system_error>
-#include <fcntl.h>
 #include <sys/stat.h>
+#include <system_error>
 #ifdef _WIN32
 #include <io.h>
 #include <share.h>

src/quantize.cpp

@@ -1,14 +1,15 @@
 #include "model-loader.h"
+#include "quantization-policy.h"
 #include "quantize-output.h"
 #include "quantize.h"
-#include "quantization-policy.h"
-#include <stdexcept>
+
 #include <algorithm>
 #include <cctype>
 #include <cstdint>
 #include <filesystem>
 #include <iostream>
 #include <memory>
+#include <stdexcept>
 #include <string>
 #include <vector>
 

src/server.cpp

@@ -1,6 +1,6 @@
-#include "server.h"
-#include "clap.h"
 #include "audio.h"
+#include "clap.h"
+#include "server.h"
 
 #include <httplib.h>
 #include <nlohmann/json.hpp>
@@ -9,8 +9,8 @@
 #include <exception>
 #include <filesystem>
 #include <iostream>
-#include <mutex>
 #include <memory>
+#include <mutex>
 #include <stdexcept>
 #include <vector>
 

src/tensor-data.cpp

@@ -1,4 +1,5 @@
 #include "tensor-data.h"
+
 #include <algorithm>
 #include <stdexcept>
 

src/tensor-data.h

@@ -1,5 +1,6 @@
 #pragma once
 #include <ggml.h>
+
 #include <cstddef>
 #include <cstdint>
 #include <vector>

src/vocab.cpp

@@ -1,12 +1,14 @@
 #include "vocab.h"
-#include <stdexcept>
+
 #include <unicode/uchar.h>
 #include <unicode/unistr.h>
+
 #include <algorithm>
 #include <cctype>
 #include <cmath>
 #include <cstdint>
 #include <limits>
+#include <stdexcept>
 
 namespace clap::detail {
 using json = nlohmann::json;

src/vocab.h

@@ -15,15 +15,16 @@
  */
 #pragma once
 
+#include <nlohmann/json.hpp>
+#include <unicode/regex.h>
+
 #include <cstddef>
 #include <cstdint>
 #include <map>
 #include <memory>
 #include <string>
 #include <unordered_map>
 #include <vector>
-#include <nlohmann/json.hpp>
-#include <unicode/regex.h>
 
 namespace clap::detail {
 

tests/abi-test.cpp

@@ -15,9 +15,10 @@
  */
 #include "clap.h"
 
+#include <gtest/gtest.h>
+
 #include <cstdlib>
 #include <cstring>
-#include <gtest/gtest.h>
 #include <new>
 
 namespace {

tests/all-quantization-test.cpp

@@ -1,8 +1,10 @@
-#include "model-loader.h"
 #include "graph-test-helpers.h"
+#include "model-loader.h"
 #include "quantize.h"
+
 #include <ggml.h>
 #include <gguf.h>
+
 #include <cmath>
 #include <cstring>
 #include <filesystem>

tests/audio-path-test.cpp

@@ -1,6 +1,6 @@
-#include "clap.h"
-#include "c-api-helpers.h"
 #include "audio.h"
+#include "c-api-helpers.h"
+#include "clap.h"
 
 #include <cmath>
 #include <filesystem>

tests/audio-test.cpp

@@ -1,9 +1,11 @@
 #include "audio.h"
+
+#include <gtest/gtest.h>
+
 #include <algorithm>
 #include <cmath>
 #include <filesystem>
 #include <fstream>
-#include <gtest/gtest.h>
 #include <iostream>
 #include <iterator>
 #include <limits>

tests/bf16-test.cpp

@@ -1,8 +1,10 @@
-#include "model-loader.h"
 #include "graph-test-helpers.h"
+#include "model-loader.h"
 #include "quantize.h"
+
 #include <ggml.h>
 #include <gguf.h>
+
 #include <cmath>
 #include <cstring>
 #include <filesystem>

tests/c-api-helpers.h

@@ -1,5 +1,6 @@
 #pragma once
 #include "clap.h"
+
 #include <memory>
 #include <stdexcept>
 #include <vector>

tests/graph-pipeline-test.cpp

@@ -1,5 +1,7 @@
 #include "graph.h"
+
 #include <gguf.h>
+
 #include <algorithm>
 #include <cmath>
 #include <cstring>

tests/models/byte-bpe-test.cpp

@@ -1,4 +1,5 @@
 #include "vocab.h"
+
 #include <iostream>
 #include <stdexcept>