more constistent builds, names and uses of &

Author: fschlimb

CMakeLists.txt

@@ -24,16 +24,32 @@ set(MKL_LIBRARIES -L$ENV{MKLROOT}/lib -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_
 # Use -fPIC even if statically compiled
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
+set(P2C_HPP ${PROJECT_SOURCE_DIR}/src/include/ddptensor/p2c_ids.hpp)
+# Generate enums
+add_custom_command(
+    COMMAND python ${PROJECT_SOURCE_DIR}/scripts/code_gen.py ${PROJECT_SOURCE_DIR}/ddptensor/array_api.py ${P2C_HPP}
+    DEPENDS ${PROJECT_SOURCE_DIR}/scripts/code_gen.py ${PROJECT_SOURCE_DIR}/ddptensor/array_api.py
+    OUTPUT ${P2C_HPP}
+    COMMENT "Generating ${P2C_HPP}."
+    )
+
 # ============
 # Target
 # ============
 FILE(GLOB MyCppSources ${PROJECT_SOURCE_DIR}/src/*.cpp ${PROJECT_SOURCE_DIR}/src/include/ddptensor/*.hpp)
+set(MyCppSources ${MyCppSources} ${P2C_HPP})
 
-# Create the mymath library
-#add_library(_ddptensor MODULE ${MyCppSources})
 pybind11_add_module(_ddptensor MODULE ${MyCppSources})
 
-target_compile_options(_ddptensor PRIVATE -fopenmp)
 target_compile_definitions(_ddptensor PRIVATE USE_MKL=1 XTENSOR_USE_XSIMD=1 XTENSOR_USE_OPENMP=1 DDPT_2TYPES=1)
-target_include_directories(_ddptensor PRIVATE ${PROJECT_SOURCE_DIR}/src/include ${PROJECT_SOURCE_DIR}/third_party/xtl/include ${PROJECT_SOURCE_DIR}/third_party/xsimd/include ${PROJECT_SOURCE_DIR}/third_party/xtensor-blas/include ${PROJECT_SOURCE_DIR}/third_party/xtensor/include ${PROJECT_SOURCE_DIR}/third_party/bitsery/include ${MPI_INCLUDE_PATH} $ENV{MKLROOT}/include ${pybind11_INCLUDE_DIRS})
+target_include_directories(_ddptensor PRIVATE
+  ${PROJECT_SOURCE_DIR}/src/include
+  ${PROJECT_SOURCE_DIR}/third_party/xtl/include
+  ${PROJECT_SOURCE_DIR}/third_party/xsimd/include
+  ${PROJECT_SOURCE_DIR}/third_party/xtensor-blas/include
+  ${PROJECT_SOURCE_DIR}/third_party/xtensor/include
+  ${PROJECT_SOURCE_DIR}/third_party/bitsery/include
+  ${MPI_INCLUDE_PATH} $ENV{MKLROOT}/include
+  ${pybind11_INCLUDE_DIRS})
+target_compile_options(_ddptensor PRIVATE -fopenmp)
 target_link_libraries(_ddptensor PRIVATE ${MPI_C_LIBRARIES} ${MKL_LIBRARIES})

ddptensor/__init__.py

@@ -14,25 +14,39 @@
 # are simply forwarded as-is.
 
 from . import _ddptensor as _cdt
-from ._ddptensor import float64, float32, int64, int32, int16, uint64, uint32, uint16, fini
+from ._ddptensor import (
+    FLOAT64 as float64,
+    FLOAT32 as float32,
+    INT64 as int64,
+    INT32 as int32,
+    INT16  as int16,
+    INT8 as int8,
+    UINT64 as uint64,
+    UINT32 as uint32,
+    UINT16 as uint16,
+    UINT8 as uint8,
+    fini
+)
 from .ddptensor import dtensor
 from os import getenv
 from . import array_api as api
 from . import spmd
 
-for op in api.ew_binary_ops:
-    OP = op.upper()
-    exec(
-        f"{op} = lambda this, other: dtensor(_cdt.EWBinOp.op(_cdt.{OP}, this._t, other._t if isinstance(other, ddptensor) else other))"
-    )
+for op in api.api_categories["EWBinOp"]:
+    if not op.startswith("__"):
+        OP = op.upper()
+        exec(
+            f"{op} = lambda this, other: dtensor(_cdt.EWBinOp.op(_cdt.{OP}, this._t, other._t if isinstance(other, ddptensor) else other))"
+        )
 
-for op in api.ew_unary_ops:
-    OP = op.upper()
-    exec(
-        f"{op} = lambda this: dtensor(_cdt.EWUnyOp.op(_cdt.{OP}, this._t))"
-    )
+for op in api.api_categories["EWUnyOp"]:
+    if not op.startswith("__"):
+        OP = op.upper()
+        exec(
+            f"{op} = lambda this: dtensor(_cdt.EWUnyOp.op(_cdt.{OP}, this._t))"
+        )
 
-for func in api.creators:
+for func in api.api_categories["Creator"]:
     FUNC = func.upper()
     if func in ["empty", "ones", "zeros",]:
         exec(
@@ -43,7 +57,7 @@
             f"{func} = lambda shape, val, dtype: dtensor(_cdt.Creator.full(_cdt.{FUNC}, shape, val, dtype))"
         )
 
-for func in api.statisticals:
+for func in api.api_categories["ReduceOp"]:
     FUNC = func.upper()
     exec(
         f"{func} = lambda this, dim: dtensor(_cdt.ReduceOp.op(_cdt.{FUNC}, this._t, dim))"