Rename CMake flags to have an IMEX prefix. Update all impacted files.

Author: Diptorup Deb

.gitignore

@@ -175,6 +175,8 @@ CMakeLists.txt.user
 
 # Build dir
 /cmake_build
+_build
+_install
 
 # pip wheels
 *.whl

dpcomp_runtime/CMakeLists.txt

@@ -16,7 +16,7 @@ project(dpcomp-runtime LANGUAGES CXX C)
 
 include(GenerateExportHeader)
 
-if(TBB_ENABLE)
+if(IMEX_ENABLE_TBB_SUPPORT)
     find_package(TBB REQUIRED)
 endif()
 
@@ -39,7 +39,7 @@ target_include_directories(${PROJECT_NAME} SYSTEM PRIVATE
     ${PROJECT_BINARY_DIR}
     )
 
-if(TBB_ENABLE)
-    target_compile_definitions(${PROJECT_NAME} PRIVATE TBB_ENABLE=1)
+if(IMEX_ENABLE_TBB_SUPPORT)
+    target_compile_definitions(${PROJECT_NAME} PRIVATE IMEX_ENABLE_TBB_SUPPORT=1)
     target_link_libraries(${PROJECT_NAME} TBB::tbb)
 endif()

dpcomp_runtime/lib/tbb_parallel.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifdef TBB_ENABLE
+#ifdef IMEX_ENABLE_TBB_SUPPORT
 
 #include <array>
 #include <cassert>
@@ -246,4 +246,4 @@ DPCOMP_RUNTIME_EXPORT void dpcompParallelFinalize() {
   globalContext.reset();
 }
 }
-#endif // TBB_ENABLE
+#endif // IMEX_ENABLE_TBB_SUPPORT

mlir/CMakeLists.txt

@@ -41,7 +41,7 @@ add_subdirectory(include/mlir-extensions/dialect/plier)
 add_subdirectory(include/mlir-extensions/dialect/plier_util)
 add_subdirectory(include/mlir-extensions/dialect/gpu_runtime/IR)
 
-if (GPU_ENABLE)
+if (IMEX_ENABLE_IGPU_DIALECT)
     add_subdirectory(tools)
 endif()
 

numba_dpcomp/numba_dpcomp/math_runtime/CMakeLists.txt

@@ -31,7 +31,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE
     ${PROJECT_BINARY_DIR}
     )
 
-if(DPNP_ENABLE)
+if(IMEX_USE_DPNP)
     target_include_directories(${PROJECT_NAME} PRIVATE
         ${DPNP_INCLUDE_DIR}
         )
@@ -45,5 +45,5 @@ if(DPNP_ENABLE)
         INSTALL_RPATH "${DPNP_RPATH}"
     )
 
-    target_compile_definitions(${PROJECT_NAME} PRIVATE DPNP_ENABLE=1)
+    target_compile_definitions(${PROJECT_NAME} PRIVATE IMEX_USE_DPNP=1)
 endif()

numba_dpcomp/numba_dpcomp/math_runtime/lib/numpy_linalg.cpp

@@ -16,15 +16,15 @@
 
 #include "common.hpp"
 
-#ifdef DPNP_ENABLE
+#ifdef IMEX_USE_DPNP
 #include <dpnp_iface.hpp>
 #endif
 
 namespace {
 template <typename T>
 void eigImpl(Memref<2, const T> *input, Memref<1, T> *vals,
              Memref<2, T> *vecs) {
-#ifdef DPNP_ENABLE
+#ifdef IMEX_USE_DPNP
   dpnp_eig_c<T, T>(input->data, vals->data, vecs->data, input->dims[0]);
 #else
   (void)input;

numba_dpcomp/numba_dpcomp/mlir_compiler/CMakeLists.txt

@@ -101,12 +101,12 @@ target_include_directories(${PROJECT_NAME} SYSTEM PRIVATE
     PRIVATE
     ./lib)
 
-if(DPNP_ENABLE)
-    target_compile_definitions(${PROJECT_NAME} PRIVATE DPNP_ENABLE=1)
+if(IMEX_USE_DPNP)
+    target_compile_definitions(${PROJECT_NAME} PRIVATE IMEX_USE_DPNP=1)
 endif()
 
-if(GPU_ENABLE)
-    target_compile_definitions(${PROJECT_NAME} PRIVATE GPU_ENABLE=1)
+if(IMEX_ENABLE_IGPU_DIALECT)
+    target_compile_definitions(${PROJECT_NAME} PRIVATE IMEX_ENABLE_IGPU_DIALECT=1)
 endif()
 
 set(CMAKE_INSTALL_BINDIR ./numba_dpcomp/numba_dpcomp)
@@ -117,7 +117,7 @@ install(TARGETS dpcomp-runtime dpcomp-math-runtime dpcomp-python-runtime mlir_co
         LIBRARY DESTINATION numba_dpcomp/numba_dpcomp
         )
 
-if(GPU_ENABLE)
+if(IMEX_ENABLE_IGPU_DIALECT)
     install(TARGETS dpcomp-gpu-runtime
             LIBRARY DESTINATION numba_dpcomp/numba_dpcomp
             )

numba_dpcomp/numba_dpcomp/mlir_compiler/lib/lowering.cpp

@@ -711,7 +711,7 @@ static void createPipeline(plier::PipelineRegistry &registry,
   registerParallelToTBBPipeline(registry);
 
   if (settings.enableGpuPipeline) {
-#ifdef GPU_ENABLE
+#ifdef IMEX_ENABLE_IGPU_DIALECT
     registerLowerToGPUPipeline(registry);
     // TODO(nbpatel): Add Gpu->GpuRuntime & GpuRuntimetoLlvm Transformation
 #else

numba_dpcomp/numba_dpcomp/mlir_compiler/lib/py_module.cpp

@@ -20,7 +20,7 @@
 
 namespace {
 bool is_dpnp_supported() {
-#ifdef DPNP_ENABLE
+#ifdef IMEX_USE_DPNP
   return true;
 #else
   return false;

numba_dpcomp/setup.py

@@ -63,8 +63,8 @@
         "-DCMAKE_INSTALL_PREFIX=" + CMAKE_INSTALL_PREFIX,
         "-DPython3_NumPy_INCLUDE_DIRS=" + NUMPY_INCLUDE_DIR,
         "-DPython3_FIND_STRATEGY=LOCATION",
-        "-DNUMBA_ENABLE=ON",
-        "-DTBB_ENABLE=ON",
+        "-DIMEX_ENABLE_NUMBA_FE=ON",
+        "-DIMEX_ENABLE_TBB_SUPPORT=ON",
     ]
 
     # DPNP
@@ -76,7 +76,7 @@
         cmake_cmd += [
             "-DDPNP_LIBRARY_DIR=" + DPNP_LIBRARY_DIR,
             "-DDPNP_INCLUDE_DIR=" + DPNP_INCLUDE_DIR,
-            "-DDPNP_ENABLE=ON",
+            "-DIMEX_USE_DPNP=ON",
         ]
         print("Found DPNP at", DPNP_LIBRARY_DIR)
     except ImportError:
@@ -89,7 +89,7 @@
     else:
         print("LEVEL_ZERO_DIR is", LEVEL_ZERO_DIR)
         cmake_cmd += [
-            "-DGPU_ENABLE=ON",
+            "-DIMEX_ENABLE_IGPU_DIALECT=ON",
         ]
 
     try: