Merge pull request #931 from ldorau/Add_the_coarse_library

Add the coarse library

Author: bratpiorka

cmake/helpers.cmake

@@ -387,7 +387,8 @@ function(add_umf_library)
         ${ARG_NAME}
         PRIVATE ${UMF_CMAKE_SOURCE_DIR}/include
                 ${UMF_CMAKE_SOURCE_DIR}/src/utils
-                ${UMF_CMAKE_SOURCE_DIR}/src/base_alloc)
+                ${UMF_CMAKE_SOURCE_DIR}/src/base_alloc
+                ${UMF_CMAKE_SOURCE_DIR}/src/coarse)
     add_umf_target_compile_options(${ARG_NAME})
     add_umf_target_link_options(${ARG_NAME})
 endfunction()

src/CMakeLists.txt

@@ -16,15 +16,16 @@ set(UMF_CUDA_INCLUDE_DIR
 # TODO: Cleanup the compile definitions across all the CMake files
 set(UMF_COMMON_COMPILE_DEFINITIONS UMF_VERSION=${UMF_VERSION})
 
-add_subdirectory(utils)
-
-set(UMF_LIBS $<BUILD_INTERFACE:umf_utils>)
-
 set(BA_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/base_alloc/base_alloc.c
     ${CMAKE_CURRENT_SOURCE_DIR}/base_alloc/base_alloc_linear.c
     ${CMAKE_CURRENT_SOURCE_DIR}/base_alloc/base_alloc_global.c)
 
+add_subdirectory(utils)
+add_subdirectory(coarse)
+
+set(UMF_LIBS $<BUILD_INTERFACE:umf_utils> $<BUILD_INTERFACE:coarse>)
+
 if(LINUX)
     set(BA_SOURCES ${BA_SOURCES}
                    ${CMAKE_CURRENT_SOURCE_DIR}/base_alloc/base_alloc_linux.c)
@@ -145,6 +146,8 @@ else()
         LIBS ${UMF_LIBS})
 endif()
 
+add_dependencies(umf coarse)
+
 if(UMF_LINK_HWLOC_STATICALLY)
     add_dependencies(umf ${UMF_HWLOC_NAME})
 endif()

src/coarse/CMakeLists.txt

@@ -0,0 +1,26 @@
+# Copyright (C) 2024 Intel Corporation
+# Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+include(${UMF_CMAKE_SOURCE_DIR}/cmake/helpers.cmake)
+
+set(COARSE_SOURCES coarse.c ../ravl/ravl.c)
+
+if(UMF_BUILD_SHARED_LIBRARY)
+    set(COARSE_EXTRA_SRCS ${BA_SOURCES})
+    set(COARSE_EXTRA_LIBS $<BUILD_INTERFACE:umf_utils>)
+endif()
+
+add_umf_library(
+    NAME coarse
+    TYPE STATIC
+    SRCS ${COARSE_SOURCES} ${COARSE_EXTRA_SRCS}
+    LIBS ${COARSE_EXTRA_LIBS})
+
+target_include_directories(
+    coarse
+    PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
+            $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>
+            $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/ravl>)
+
+add_library(${PROJECT_NAME}::coarse ALIAS coarse)