chore: Enable C++23 and abbreviations

It's been a few weeks and no opposition surfaced. This change allows
new code to be written faster and less cluttered.

Author: danielzgtg

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.14)
 project("tts.cpp" C CXX)
 include(CheckIncludeFileCXX)
 
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 

README.md

@@ -45,7 +45,7 @@ Additional Model support will initially be added based on open source model perf
 #### Requirements:
 
 * Local GGUF format model file (see [py-gguf](./py-ggufs/README.md) for information on how to convert the hugging face models to GGUF).
-* C++17 and C17
+* C++23 and C11
   * XCode Command Line Tools (via `xcode-select --install`) should suffice for OS X
 * CMake (>=3.14) 
 * GGML pulled locally

include/common.h

@@ -1,10 +1,7 @@
-#ifndef common_h
-#define common_h
+#pragma once
 
-#include <cstdint>
-#include <string>
 #include <map>
-#include <vector>
+#include "imports.h"
 
 // Using this simple struct as opposed to a common std::vector allows us to return the cpu buffer
 // pointer directly rather than copying the contents of the buffer to a predefined std::vector.
@@ -57,5 +54,3 @@ struct tts_runner {
 	void init_build(std::vector<uint8_t>* buf_compute_meta);
 	void free_build();
 };
-
-#endif

include/imports.h

@@ -0,0 +1,17 @@
+#pragma once
+
+#include <algorithm>
+#include <cstdint>
+#include <memory>
+#include <string_view>
+#include <ranges>
+#include <vector>
+
+using namespace std;
+using namespace std::string_view_literals;
+typedef std::string_view sv;
+typedef const char * str;
+
+#define TTS_ABORT(...) tts_abort(__FILE__, __LINE__, __VA_ARGS__)
+#define TTS_ASSERT(x) if (!(x)) TTS_ABORT("TTS_ASSERT(%s) failed", #x)
+[[noreturn]] void tts_abort(const char * file, int line, const char * fmt, ...);

src/util.cpp

@@ -2,6 +2,7 @@
 
 #include <algorithm>
 #include <cstdio>
+#include <cstring>
 #include <stdarg.h>
 #ifdef __APPLE__
 #include <sys/sysctl.h>

src/util.h

@@ -2,12 +2,9 @@
 #define util_h
 
 #include <functional>
-#include <math.h>
+#include <cmath>
 #include <random>
-#include <stdio.h>
-#include <string>
-#include <cstring>
-#include <vector>
+#include <cstdio>
 #include <stdint.h>
 #include <sys/types.h>
 #include "ggml-metal.h"
@@ -17,9 +14,7 @@
 #include "ggml.h"
 #include "ggml-impl.h"
 #include "ggml-cpp.h"
-
-#define TTS_ABORT(...) tts_abort(__FILE__, __LINE__, __VA_ARGS__)
-#define TTS_ASSERT(x) if (!(x)) TTS_ABORT("TTS_ASSERT(%s) failed", #x)
+#include "imports.h"
 
 struct model_tensor_meta {
 	uint32_t n_tensors = 0;
@@ -60,6 +55,4 @@ std::vector<std::string> split(std::string target, const char split_on, bool inc
 std::string strip(std::string target, std::string vals = " ");
 std::string replace_any(std::string target, std::string to_replace, std::string replacement);
 
-[[noreturn]] void tts_abort(const char * file, int line, const char * fmt, ...);
-
 #endif