nits: clang-format-17 checks passing

faasm · Mar 4, 2024 · 0e6fc63 · 0e6fc63
1 parent e3f5a14
commit 0e6fc63
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 11 deletions.
diff --git a/.clang-format b/.clang-format
@@ -15,6 +15,11 @@ DerivePointerAlignment: false
 BreakBeforeBraces: Custom
 BraceWrapping:
     AfterClass: true
+    AfterEnum: true
+    AfterExternBlock: true
+    AfterFunction: true
+    AfterStruct: true
+    AfterUnion: true
     SplitEmptyFunction: false
     SplitEmptyRecord: false
 ---
diff --git a/func/cpp/py_func.cpp b/func/cpp/py_func.cpp
@@ -1,4 +1,5 @@
-extern "C" {
+extern "C"
+{
 #include "pyinit.h"
 }
 
@@ -20,7 +21,8 @@ extern "C" {
  * Returns the relevant Python entry function. We need to invoke different
  * functions depending on which Faasm function index we're dealing with.
  */
-const char* getPythonFunctionName() {
+const char* getPythonFunctionName()
+{
     char* entryFunc = faasmGetPythonEntry();
 
     if (strlen(entryFunc) == 0) {
@@ -34,7 +36,8 @@ const char* getPythonFunctionName() {
  * Returns the working dir we need to be in to import the Python module
  * for the required function.
  */
-const char* getPythonWorkingDir(const char* user, const char* funcName) {
+const char* getPythonWorkingDir(const char* user, const char* funcName)
+{
     auto workingDir = new char[60];
 
 #ifdef __wasm__
@@ -50,7 +53,8 @@ const char* getPythonWorkingDir(const char* user, const char* funcName) {
  * Returns the name of the python module to execute. If executing in wasm this
  * will be different to when executing natively.
  */
-const char* getPythonModuleName(const char* funcName) {
+const char* getPythonModuleName(const char* funcName)
+{
 #ifdef __wasm__
     return "function";
 #else
@@ -61,7 +65,8 @@ const char* getPythonModuleName(const char* funcName) {
 /**
  * Initialise CPython using a Faasm zygote to avoid doing so repeatedly
  */
-FAASM_ZYGOTE() {
+FAASM_ZYGOTE()
+{
     Py_InitializeEx(0);
 
     // 21/12/2022 - Numpy support is broken
@@ -90,7 +95,8 @@ FAASM_ZYGOTE() {
     return 0;
 }
 
-int main(int argc, char* argv[]) {
+int main(int argc, char* argv[])
+{
     // With this line uncommented, this file can be run as a normal executable
     // for testing setEmulatedMessageFromJson(R"({"user": "python", "function":
     // "py_func", "py_user": "python", "py_func": "lang_test", "py_entry":

diff --git a/func/cpp/pyinit.c b/func/cpp/pyinit.c
@@ -74,7 +74,8 @@
     fprintf(devNull, "%p", trunc##sfx);                                        \
     fprintf(devNull, "%p", rint##sfx);
 
-void setUpPyNumpy() {
+void setUpPyNumpy()
+{
     FILE* devNull = fopen("/dev/null", "w");
 
     // Maths

diff --git a/func/cpp/pyinit.h b/func/cpp/pyinit.h
@@ -2,10 +2,11 @@
 #define FAASM_PYTHON_H
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
-void setUpPyNumpy();
+    void setUpPyNumpy();
 
 #ifdef __cplusplus
 }

diff --git a/tasks/format_code.py b/tasks/format_code.py
@@ -1,4 +1,4 @@
-from faasmtools.env import LLVM_VERSION
+from faasmtools.env import LLVM_NATIVE_VERSION
 from invoke import task
 from tasks.env import PROJ_ROOT
 from subprocess import run
@@ -52,7 +52,7 @@ def format(ctx, check=False):
     )
 
     clang_cmd = [
-        "clang-format-{}".format(LLVM_VERSION.split(".")[0]),
+        "clang-format-{}".format(LLVM_NATIVE_VERSION.split(".")[0]),
         "--dry-run --Werror" if check else "-i",
         "-style=file",
         " ".join(files_to_check),