separate includes for meson

Author: SwayamInSync

quaddtype/meson.build

@@ -155,44 +155,26 @@ build_includes = include_directories('.') # compile time generated headers as pe
 includes = include_directories(
     [
         incdir_numpy,
-        'src/csrc',
+        'src/include',
     ]
 )
 pythoncapi_includes = pythoncapi_compat_inc
 
 srcs = [
-    'src/csrc/quad_common.h',
-    'src/csrc/casts.h',
     'src/csrc/casts.cpp',
-    'src/csrc/scalar.h',
     'src/csrc/scalar.c',
-    'src/csrc/dtype.h',
     'src/csrc/dtype.c',
     'src/csrc/quaddtype_main.c',
-    'src/csrc/scalar_ops.h',
     'src/csrc/scalar_ops.cpp',
-    'src/csrc/ops.hpp',
-    'src/csrc/dragon4.h',
     'src/csrc/dragon4.c',
-    'src/csrc/quadblas_interface.h',
     'src/csrc/quadblas_interface.cpp',
-    'src/csrc/umath/umath.h',
     'src/csrc/umath/umath.cpp',
-    'src/csrc/umath/binary_ops.h',
     'src/csrc/umath/binary_ops.cpp',
-    'src/csrc/umath/unary_ops.h',
     'src/csrc/umath/unary_ops.cpp',
-    'src/csrc/umath/unary_props.h',
     'src/csrc/umath/unary_props.cpp',
-    'src/csrc/umath/comparison_ops.h',
     'src/csrc/umath/comparison_ops.cpp',
-    'src/csrc/umath/promoters.hpp',
-    'src/csrc/umath/matmul.h',
     'src/csrc/umath/matmul.cpp',
-    'src/csrc/constants.hpp',
-    'src/csrc/lock.h',
     'src/csrc/lock.c',
-    'src/csrc/utilities.h',
     'src/csrc/utilities.c',
 ]
 

quaddtype/reinstall.sh

@@ -9,7 +9,7 @@ rm -rf subprojects/pythoncapi-compat
 rm -rf .mesonpy-*
 
 python -m pip uninstall -y numpy_quaddtype
-python -m pip install . -vv --no-build-isolation 2>&1 | tee build_log.txt
+python -m pip install . -vv 2>&1 | tee build_log.txt
 
 # for debugging and TSAN builds, comment the above line and uncomment all below:
 # export CFLAGS="-fsanitize=thread -g -O0" 

quaddtype/src/csrc/umath/binary_ops.cpp

@@ -14,12 +14,12 @@
 #include "numpy/dtype_api.h"
 #include "numpy/ndarraytypes.h"
 
-#include "../quad_common.h"
-#include "../scalar.h"
-#include "../dtype.h"
-#include "../ops.hpp"
-#include "promoters.hpp"
-#include "binary_ops.h"
+#include "quad_common.h"
+#include "scalar.h"
+#include "dtype.h"
+#include "ops.hpp"
+#include "umath/promoters.hpp"
+#include "umath/binary_ops.h"
 
 static NPY_CASTING
 quad_binary_op_resolve_descriptors(PyObject *self, PyArray_DTypeMeta *const dtypes[],

quaddtype/src/csrc/umath/comparison_ops.cpp

@@ -14,14 +14,14 @@
 #include "numpy/dtype_api.h"
 #include "numpy/ndarraytypes.h"
 
-#include "../quad_common.h"
-#include "../scalar.h"
-#include "../dtype.h"
-#include "umath.h"
-#include "../ops.hpp"
-#include "promoters.hpp"
-#include "binary_ops.h"
-#include "comparison_ops.h"
+#include "quad_common.h"
+#include "scalar.h"
+#include "dtype.h"
+#include "umath/umath.h"
+#include "ops.hpp"
+#include "umath/promoters.hpp"
+#include "umath/binary_ops.h"
+#include "umath/comparison_ops.h"
 
 static NPY_CASTING
 quad_comparison_op_resolve_descriptors(PyObject *self, PyArray_DTypeMeta *const dtypes[],

quaddtype/src/csrc/umath/matmul.cpp

@@ -16,13 +16,13 @@ extern "C" {
 #include "numpy/dtype_api.h"
 }
 
-#include "../quad_common.h"
-#include "../scalar.h"
-#include "../dtype.h"
-#include "../ops.hpp"
-#include "matmul.h"
-#include "promoters.hpp"
-#include "../quadblas_interface.h"
+#include "quad_common.h"
+#include "scalar.h"
+#include "dtype.h"
+#include "ops.hpp"
+#include "umath/matmul.h"
+#include "umath/promoters.hpp"
+#include "quadblas_interface.h"
 
 static NPY_CASTING
 quad_matmul_resolve_descriptors(PyObject *self, PyArray_DTypeMeta *const dtypes[],

quaddtype/src/csrc/umath/umath.cpp

@@ -14,16 +14,16 @@ extern "C" {
 #include "numpy/ufuncobject.h"
 #include "numpy/dtype_api.h"
 }
-#include "../quad_common.h"
-#include "../scalar.h"
-#include "../dtype.h"
-#include "umath.h"
-#include "../ops.hpp"
-#include "unary_ops.h"
-#include "unary_props.h"
-#include "binary_ops.h"
-#include "comparison_ops.h"
-#include "matmul.h"
+#include "quad_common.h"
+#include "scalar.h"
+#include "dtype.h"
+#include "umath/umath.h"
+#include "ops.hpp"
+#include "umath/unary_ops.h"
+#include "umath/unary_props.h"
+#include "umath/binary_ops.h"
+#include "umath/comparison_ops.h"
+#include "umath/matmul.h"
 
 int
 init_quad_umath(void)

quaddtype/src/csrc/umath/unary_ops.cpp

@@ -15,10 +15,10 @@ extern "C" {
 
 #include "numpy/dtype_api.h"
 }
-#include "../quad_common.h"
-#include "../scalar.h"
-#include "../dtype.h"
-#include "../ops.hpp"
+#include "quad_common.h"
+#include "scalar.h"
+#include "dtype.h"
+#include "ops.hpp"
 
 static NPY_CASTING
 quad_unary_op_resolve_descriptors(PyObject *self, PyArray_DTypeMeta *const dtypes[],

quaddtype/src/csrc/umath/unary_props.cpp

@@ -15,10 +15,10 @@ extern "C" {
 
 #include "numpy/dtype_api.h"
 }
-#include "../quad_common.h"
-#include "../scalar.h"
-#include "../dtype.h"
-#include "../ops.hpp"
+#include "quad_common.h"
+#include "scalar.h"
+#include "dtype.h"
+#include "ops.hpp"
 
 static NPY_CASTING
 quad_unary_prop_resolve_descriptors(PyObject *self, PyArray_DTypeMeta *const dtypes[],