nits

Author: csegarragonz

.clang-format

@@ -10,4 +10,11 @@ AlwaysBreakAfterReturnType: None
 
 IndentWidth: 4
 DerivePointerAlignment: false
+
+# Precise control over braces alignment
+BreakBeforeBraces: Custom
+BraceWrapping:
+    AfterClass: true
+    SplitEmptyFunction: false
+    SplitEmptyRecord: false
 ---

func/cpp/py_func.cpp

@@ -1,5 +1,4 @@
-extern "C"
-{
+extern "C" {
 #include "pyinit.h"
 }
 
@@ -21,8 +20,7 @@ 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) {
@@ -36,8 +34,7 @@ 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__
@@ -53,8 +50,7 @@ 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
@@ -65,8 +61,7 @@ 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
@@ -95,8 +90,7 @@ 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":

func/cpp/pyinit.c

@@ -74,8 +74,7 @@
     fprintf(devNull, "%p", trunc##sfx);                                        \
     fprintf(devNull, "%p", rint##sfx);
 
-void setUpPyNumpy()
-{
+void setUpPyNumpy() {
     FILE* devNull = fopen("/dev/null", "w");
 
     // Maths

func/cpp/pyinit.h

@@ -2,11 +2,10 @@
 #define FAASM_PYTHON_H
 
 #ifdef __cplusplus
-extern "C"
-{
+extern "C" {
 #endif
 
-    void setUpPyNumpy();
+void setUpPyNumpy();
 
 #ifdef __cplusplus
 }

tasks/cpython.py

@@ -1,9 +1,6 @@
 from copy import copy as deep_copy
 from faasmctl.util.upload import upload_wasm
-from faasmtools.build import (
-    build_config_cmd,
-    get_faasm_build_env_dict
-)
+from faasmtools.build import build_config_cmd, get_faasm_build_env_dict
 from faasmtools.compile_util import wasm_cmake, wasm_copy_upload
 from faasmtools.env import LLVM_NATIVE_VERSION, WASM_DIR
 from invoke import task
@@ -57,7 +54,9 @@
 LIB_DEST_DIR = join(FAASM_RUNTIME_ROOT, "lib")
 
 LIBPYTHON_SRC_PATH = join(LIB_SRC_DIR, "libpython3.8.a")
-LIBPYTHON_DEST_PATH = join(ENV_VARS["FAASM_WASM_LIB_INSTALL_DIR"], "libpython3.8.a")
+LIBPYTHON_DEST_PATH = join(
+    ENV_VARS["FAASM_WASM_LIB_INSTALL_DIR"], "libpython3.8.a"
+)
 
 INCLUDE_SRC_DIR = join(CPYTHON_INSTALL_DIR, "include", "python3.8")
 INCLUDE_DEST_DIR = join(ENV_VARS["FAASM_WASM_HEADER_INSTALL_DIR"], "python3.8")
@@ -233,7 +232,14 @@ def func(ctx, clean=False, debug=False):
     wasm_file = join(func_build_dir, "{}.wasm".format(CPYTHON_FUNC_NAME))
 
     # Build and install the wasm
-    wasm_cmake(func_dir, func_build_dir, CPYTHON_FUNC_NAME, clean, debug, is_threads=True)
+    wasm_cmake(
+        func_dir,
+        func_build_dir,
+        CPYTHON_FUNC_NAME,
+        clean,
+        debug,
+        is_threads=True,
+    )
     wasm_copy_upload(CPYTHON_FUNC_USER, CPYTHON_FUNC_NAME, wasm_file)
 
 

tasks/format_code.py

@@ -54,6 +54,7 @@ def format(ctx, check=False):
     clang_cmd = [
         "clang-format-{}".format(LLVM_VERSION.split(".")[0]),
         "--dry-run --Werror" if check else "-i",
+        "-style=file",
         " ".join(files_to_check),
     ]
     clang_cmd = " ".join(clang_cmd)