Provide CMake-driver for building libcustom_calls

CMakeLists.txt

@@ -0,0 +1,13 @@
+cmake_minimum_required(VERSION 3.20)
+project(catalyst)
+
+set(LOGO [=[
+░█▀▀░█▀█░▀█▀░█▀█░█░░░█░█░█▀▀░▀█▀
+░█░░░█▀█░░█░░█▀█░█░░░░█░░▀▀█░░█░
+░▀▀▀░▀░▀░░▀░░▀░▀░▀▀▀░░▀░░▀▀▀░░▀░
+]=])
+message(${LOGO})
+
+add_subdirectory(frontend)
+add_subdirectory(mlir)
+add_subdirectory(runtime)

frontend/catalyst/CMakeLists.txt

@@ -1 +1,3 @@
+project(catalyst_frontend)
+
 add_subdirectory(utils)

frontend/catalyst/utils/CMakeLists.txt

@@ -1,3 +1,5 @@
+project(catalyst_frontend_utils)
+
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
@@ -44,3 +46,13 @@ target_include_directories(wrapper PRIVATE ${NUMPY_INCLUDE_DIR})
 # Use suffix ".so" rather than ".abi3.so" for library file using Stable ABI
 # This is necessary for compatibility with setuptools build extensions
 set_target_properties(wrapper PROPERTIES SUFFIX ".so")
+
+
+add_subdirectory(jax_cpu_lapack_kernels)
+
+add_library(custom_calls SHARED
+    ${PROJECT_SOURCE_DIR}/libcustom_calls.cpp
+)
+target_link_libraries(custom_calls PRIVATE catalyst_lapack_kernels)
+#target_include_directories(custom_calls PRIVATE ${NUMPY_INCLUDE_DIR})
+

frontend/catalyst/utils/jax_cpu_lapack_kernels/CMakeLists.txt

@@ -0,0 +1,13 @@
+project(catalyst_jax_lapack)
+
+add_library(catalyst_lapack_kernels STATIC
+    ${PROJECT_SOURCE_DIR}/lapack_kernels.cpp
+    ${PROJECT_SOURCE_DIR}/lapack_kernels_using_lapack.cpp
+)
+
+set_property(TARGET catalyst_lapack_kernels PROPERTY POSITION_INDEPENDENT_CODE ON)
+
+target_include_directories(catalyst_lapack_kernels PRIVATE
+  $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
+  $<INSTALL_INTERFACE:include> 
+)

setup.py

@@ -268,43 +268,12 @@ def run(self):
             check=False,
         )
 
-
-# Compile the library of custom calls in the frontend
-if system_platform == "Linux":
-    custom_calls_extension = Extension(
-        "catalyst.utils.libcustom_calls",
-        sources=[
-            "frontend/catalyst/utils/libcustom_calls.cpp",
-            "frontend/catalyst/utils/jax_cpu_lapack_kernels/lapack_kernels.cpp",
-            "frontend/catalyst/utils/jax_cpu_lapack_kernels/lapack_kernels_using_lapack.cpp",
-        ],
-        extra_compile_args=["-std=c++17"],
-    )
-    cmdclass = {"build_ext": CustomBuildExtLinux}
-
-elif system_platform == "Darwin":
-    variables = sysconfig.get_config_vars()
-    # Here we need to switch the deault to MacOs dynamic lib
-    variables["LDSHARED"] = variables["LDSHARED"].replace("-bundle", "-dynamiclib")
-    if sysconfig.get_config_var("LDCXXSHARED"):
-        variables["LDCXXSHARED"] = variables["LDCXXSHARED"].replace("-bundle", "-dynamiclib")
-    custom_calls_extension = Extension(
-        "catalyst.utils.libcustom_calls",
-        sources=[
-            "frontend/catalyst/utils/libcustom_calls.cpp",
-            "frontend/catalyst/utils/jax_cpu_lapack_kernels/lapack_kernels.cpp",
-            "frontend/catalyst/utils/jax_cpu_lapack_kernels/lapack_kernels_using_lapack.cpp",
-        ],
-        extra_compile_args=["-std=c++17"],
-    )
-    cmdclass = {"build_ext": CustomBuildExtMacos}
-
-
 project_root_dir = os.path.abspath(os.path.dirname(__file__))
 frontend_dir = os.path.join(project_root_dir, "frontend")
 
 ext_modules = [
-    custom_calls_extension,
+    #custom_calls_extension,
+    CMakeExtension("catalyst.utils.libcustom_calls", sourcedir=frontend_dir),
     CMakeExtension("catalyst.utils.wrapper", sourcedir=frontend_dir),
 ]
 
@@ -331,6 +300,6 @@ def run(self):
     package_dir={"": "frontend"},
     include_package_data=True,
     ext_modules=ext_modules,
-    cmdclass=cmdclass,
+    #cmdclass=cmdclass,
     **description,
 )