remove lib

Author: bratpiorka

benchmark/CMakeLists.txt

@@ -34,7 +34,7 @@ function(add_umf_benchmark)
 
     set(BENCH_NAME umf-bench-${ARG_NAME})
 
-    set(BENCH_LIBS ${ARG_LIBS} umf disjoint_pool)
+    set(BENCH_LIBS ${ARG_LIBS} umf)
 
     add_umf_executable(
         NAME ${BENCH_NAME}

src/CMakeLists.txt

@@ -24,8 +24,7 @@ set(BA_SOURCES
 add_subdirectory(utils)
 add_subdirectory(coarse)
 
-set(UMF_LIBS $<BUILD_INTERFACE:umf_utils> $<BUILD_INTERFACE:coarse>
-             $<BUILD_INTERFACE:disjoint_pool>)
+set(UMF_LIBS $<BUILD_INTERFACE:umf_utils> $<BUILD_INTERFACE:coarse>)
 
 if(LINUX)
     set(BA_SOURCES ${BA_SOURCES}
@@ -70,6 +69,7 @@ set(UMF_SOURCES
     critnib/critnib.c
     ravl/ravl.c
     pool/pool_proxy.c
+    pool/pool_disjoint.c
     pool/pool_scalable.c)
 
 if(NOT UMF_DISABLE_HWLOC)
@@ -147,7 +147,7 @@ else()
         LIBS ${UMF_LIBS})
 endif()
 
-add_dependencies(umf coarse disjoint_pool)
+add_dependencies(umf coarse)
 
 if(UMF_LINK_HWLOC_STATICALLY)
     add_dependencies(umf ${UMF_HWLOC_NAME})

src/pool/CMakeLists.txt

@@ -9,29 +9,6 @@ endif()
 
 set(POOL_COMPILE_DEFINITIONS ${UMF_COMMON_COMPILE_DEFINITIONS})
 
-# libumf_pool_disjoint
-add_umf_library(
-    NAME disjoint_pool
-    TYPE STATIC
-    SRCS pool_disjoint.c ../critnib/critnib.c ${POOL_EXTRA_SRCS}
-    LIBS ${POOL_EXTRA_LIBS})
-
-target_compile_definitions(disjoint_pool PRIVATE ${POOL_COMPILE_DEFINITIONS})
-
-if(WINDOWS)
-    target_compile_options(disjoint_pool PRIVATE /DWIN32_LEAN_AND_MEAN
-                                                 /DNOMINMAX)
-endif()
-
-add_library(${PROJECT_NAME}::disjoint_pool ALIAS disjoint_pool)
-
-target_include_directories(
-    disjoint_pool
-    PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/umf/pools>
-           $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>
-           $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/critnib>
-           $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
-
 # libumf_pool_jemalloc
 if(UMF_BUILD_LIBUMF_POOL_JEMALLOC)
     add_umf_library(

test/CMakeLists.txt

@@ -208,26 +208,26 @@ add_umf_test(
 
 add_umf_test(
     NAME disjointPool
-    SRCS pools/disjoint_pool.cpp malloc_compliance_tests.cpp
-    LIBS disjoint_pool)
+    SRCS pools/disjoint_pool.cpp malloc_compliance_tests.cpp ${BA_SOURCES_FOR_TEST}
+    LIBS ${UMF_UTILS_FOR_TEST})
 
 add_umf_test(
     NAME c_api_disjoint_pool
-    SRCS c_api/disjoint_pool.c
-    LIBS disjoint_pool)
+    SRCS c_api/disjoint_pool.c ${BA_SOURCES_FOR_TEST}
+    LIBS ${UMF_UTILS_FOR_TEST})
 
 add_umf_test(
     NAME disjointCoarseMallocPool
-    SRCS disjointCoarseMallocPool.cpp
-    LIBS disjoint_pool)
+    SRCS disjointCoarseMallocPool.cpp ${BA_SOURCES_FOR_TEST}
+    LIBS ${UMF_UTILS_FOR_TEST})
 
 if(UMF_POOL_JEMALLOC_ENABLED
    AND UMF_POOL_SCALABLE_ENABLED
    AND (NOT UMF_DISABLE_HWLOC))
     add_umf_test(
         NAME c_api_multi_pool
         SRCS c_api/multi_pool.c
-        LIBS disjoint_pool jemalloc_pool ${JEMALLOC_LIBRARIES})
+        LIBS jemalloc_pool ${JEMALLOC_LIBRARIES})
 endif()
 
 if(UMF_POOL_JEMALLOC_ENABLED AND (NOT UMF_DISABLE_HWLOC))
@@ -257,7 +257,7 @@ if(LINUX AND (NOT UMF_DISABLE_HWLOC)) # OS-specific functions are implemented
     add_umf_test(
         NAME provider_os_memory
         SRCS provider_os_memory.cpp ${BA_SOURCES_FOR_TEST}
-        LIBS ${UMF_UTILS_FOR_TEST} ${LIB_JEMALLOC_POOL} disjoint_pool)
+        LIBS ${UMF_UTILS_FOR_TEST} ${LIB_JEMALLOC_POOL})
     add_umf_test(
         NAME provider_os_memory_multiple_numa_nodes
         SRCS provider_os_memory_multiple_numa_nodes.cpp
@@ -581,7 +581,6 @@ if(LINUX)
             ${UMF_UTILS_DIR}/utils_level_zero.cpp
             LIBS
             ze_loader
-            disjoint_pool
             ${UMF_UTILS_FOR_TEST})
         build_umf_test(
             NAME
@@ -593,7 +592,6 @@ if(LINUX)
             ${UMF_UTILS_DIR}/utils_level_zero.cpp
             LIBS
             ze_loader
-            disjoint_pool
             ${UMF_UTILS_FOR_TEST})
         add_umf_ipc_test(TEST ipc_level_zero_prov SRC_DIR providers)
     endif()
@@ -609,7 +607,6 @@ if(LINUX)
             providers/cuda_helpers.cpp
             LIBS
             cuda
-            disjoint_pool
             ${UMF_UTILS_FOR_TEST})
         build_umf_test(
             NAME
@@ -621,7 +618,6 @@ if(LINUX)
             providers/cuda_helpers.cpp
             LIBS
             cuda
-            disjoint_pool
             ${UMF_UTILS_FOR_TEST})
         add_umf_ipc_test(TEST ipc_cuda_prov SRC_DIR providers)
     endif()

test/c_api/disjoint_pool.c

@@ -4,7 +4,8 @@
 
 #include <stdlib.h>
 
-#include "pool_disjoint.h"
+#include <umf/pools/pool_disjoint.h>
+
 #include "provider_null.h"
 #include "test_helpers.h"
 #include "test_ut_asserts.h"

test/pools/disjoint_pool.cpp

@@ -4,10 +4,11 @@
 
 #include <memory>
 
+#include <umf/pools/pool_disjoint.h>
+
 #include "pool.hpp"
 #include "pool/pool_disjoint_internal.h"
 #include "poolFixtures.hpp"
-#include "pool_disjoint.h"
 #include "provider.hpp"
 #include "provider_null.h"
 #include "provider_trace.h"