fix python and format

Author: SirAlienTheGreat

include/ceed/jit-source/cuda/cuda-jit.h

@@ -13,10 +13,8 @@
 #define CeedPragmaSIMD
 #define CEED_Q_VLA 1
 
-#define CEED_QFUNCTION_RUST(name)                                                                                                           \
+#define CEED_QFUNCTION_RUST(name)                                                                                       \
   extern "C" __device__ int name##_rs(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out); \
-  static __device__ int     name(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) {     \
-    return name##_rs(ctx, Q, in, out);                                                                                                  \
-  }
+  static __device__ int name(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) { return name##_rs(ctx, Q, in, out); }
 
 #include "cuda-types.h"

include/ceed/types.h

@@ -73,8 +73,11 @@ pub unsafe extern "C" fn build_mass_rs(
   static const char              name##_loc[] = __FILE__ ":" #name;                                                          \
   CEED_QFUNCTION_ATTR int        name##_rs(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out); \
   CEED_QFUNCTION_ATTR static int name(void *ctx, const CeedInt Q, const CeedScalar *const *in, CeedScalar *const *out) {     \
-    return name##_rs(ctx, Q, in, out);}
+    return name##_rs(ctx, Q, in, out);                                                                                       \
+  }                                                                                                                          \
+
 #endif
+// Note: the empty line at the end of the macro is required because python cffi will exclude the previous line (the }) based on the backslash at the end of it, which is required for our python build script to exclude macros
 
 /**
   @ingroup CeedQFunction

python/build_ceed_cffi.py

@@ -13,6 +13,28 @@
 ceed_version_ge = re.compile(r'\s+\(!?CEED_VERSION.*')
 
 
+# Checks to see if a c line is part of the lines we have to exclude (macros)
+def is_valid_line(line):
+    if (line.startswith("#") and not line.startswith("#include")):
+        return False
+    if (line.startswith("  static")):
+        return False
+    if (line.startswith("  CEED_QFUNCTION_ATTR")):
+        return False
+    if (line.startswith("    return name##_rs")):
+        return False
+    if (line.endswith('\\\n')):
+        return False
+    if ("CeedErrorImpl" in line):
+        return False
+    if (r'const char *, ...);' in line):
+        return False
+    if (line.startswith("CEED_EXTERN const char *const")):
+        return False
+    if (ceed_version_ge.match(line)):
+        return False
+    return True
+
 def get_ceed_dirs():
     here = os.path.dirname(os.path.abspath(__file__))
     prefix = os.path.dirname(here)
@@ -31,17 +53,10 @@ def get_ceed_dirs():
 lines = []
 for header_path in ["include/ceed/types.h", "include/ceed/ceed.h"]:
     with open(os.path.abspath(header_path)) as f:
-        lines += [line.strip() for line in f if
-                  not (line.startswith("#") and not line.startswith("#include")) and
-                  not line.startswith("  static") and
-                  not line.startswith("  CEED_QFUNCTION_ATTR") and
-                  not line.startswith("    return name##_rs") and
-                  "CeedErrorImpl" not in line and
-                  "const char *, ...);" not in line and
-                  not line.startswith("CEED_EXTERN const char *const") and
-                  not ceed_version_ge.match(line)]
+        lines += [line.strip() for line in f if is_valid_line(line)]
 lines = [line.replace("CEED_EXTERN", "extern") for line in lines]
-
+print(lines)
+#breakpoint()
 # Find scalar type inclusion line and insert definitions
 for line in lines:
     if re.search("ceed-f32.h", line) is not None: