remove optional symbols

Author: bratpiorka

CMakeLists.txt

@@ -423,29 +423,6 @@ if((UMF_BUILD_GPU_TESTS OR UMF_BUILD_GPU_EXAMPLES) AND UMF_BUILD_CUDA_PROVIDER)
     # TODO do the same for ze_loader
 endif()
 
-# set optional symbols for map/def files
-#
-# TODO: ref. #649
-set(UMF_OPTIONAL_SYMBOLS_LINUX "")
-set(UMF_OPTIONAL_SYMBOLS_WINDOWS "")
-
-if(UMF_BUILD_LEVEL_ZERO_PROVIDER)
-    add_optional_symbol(umfLevelZeroMemoryProviderOps)
-endif()
-
-# Conditional configuration for CUDA provider
-if(UMF_BUILD_CUDA_PROVIDER)
-    add_optional_symbol(umfCUDAMemoryProviderOps)
-endif()
-
-if(NOT UMF_DISABLE_HWLOC)
-    add_optional_symbol(umfOsMemoryProviderOps)
-    if(LINUX)
-        add_optional_symbol(umfDevDaxMemoryProviderOps)
-        add_optional_symbol(umfFileMemoryProviderOps)
-    endif()
-endif()
-
 add_subdirectory(src)
 
 if(UMF_BUILD_TESTS)

cmake/helpers.cmake

@@ -446,12 +446,3 @@ macro(add_sanitizer_flag flag)
 
     set(CMAKE_REQUIRED_FLAGS ${SAVED_CMAKE_REQUIRED_FLAGS})
 endmacro()
-
-function(add_optional_symbol symbol)
-    set(UMF_OPTIONAL_SYMBOLS_WINDOWS
-        "${UMF_OPTIONAL_SYMBOLS_WINDOWS} \n    ${symbol}"
-        PARENT_SCOPE)
-    set(UMF_OPTIONAL_SYMBOLS_LINUX
-        "${UMF_OPTIONAL_SYMBOLS_LINUX} \n    ${symbol};"
-        PARENT_SCOPE)
-endfunction()

src/CMakeLists.txt

@@ -110,8 +110,14 @@ set(UMF_SOURCES
     memtarget.c
     mempolicy.c
     memspace.c
+    memspaces/memspace_host_all.c
+    memspaces/memspace_highest_capacity.c
+    memspaces/memspace_highest_bandwidth.c
+    memspaces/memspace_lowest_latency.c
+    memspaces/memspace_numa.c
     provider/provider_coarse.c
     provider/provider_tracking.c
+    provider/provider_os_memory.c
     critnib/critnib.c
     ravl/ravl.c
     pool/pool_proxy.c
@@ -128,15 +134,8 @@ set(UMF_SOURCES_MACOSX libumf_linux.c)
 set(UMF_SOURCES_WINDOWS libumf_windows.c)
 
 set(UMF_SOURCES_COMMON_LINUX_MACOSX
-    provider/provider_devdax_memory.c
-    provider/provider_file_memory.c
-    provider/provider_os_memory.c
-    memtargets/memtarget_numa.c
-    memspaces/memspace_numa.c
-    memspaces/memspace_host_all.c
-    memspaces/memspace_highest_capacity.c
-    memspaces/memspace_highest_bandwidth.c
-    memspaces/memspace_lowest_latency.c)
+    provider/provider_devdax_memory.c provider/provider_file_memory.c
+    memtargets/memtarget_numa.c)
 
 if(NOT UMF_DISABLE_HWLOC)
     set(UMF_SOURCES_LINUX ${UMF_SOURCES_LINUX}
@@ -145,32 +144,24 @@ if(NOT UMF_DISABLE_HWLOC)
     set(UMF_SOURCES_MACOSX ${UMF_SOURCES_MACOSX}
                            ${UMF_SOURCES_COMMON_LINUX_MACOSX})
 
-    set(UMF_SOURCES_WINDOWS ${UMF_SOURCES_WINDOWS}
-                            provider/provider_os_memory.c)
-
     set(UMF_LIBS ${UMF_LIBS} ${LIBHWLOC_LIBRARIES})
-
-    if(NOT WINDOWS)
-        add_optional_symbol(umfMemspaceCreateFromNumaArray)
-        add_optional_symbol(umfMemspaceHighestBandwidthGet)
-        add_optional_symbol(umfMemspaceHighestCapacityGet)
-        add_optional_symbol(umfMemspaceHostAllGet)
-        add_optional_symbol(umfMemspaceLowestLatencyGet)
-    endif()
 endif()
 
-if(WINDOWS)
-    message(STATUS "UMF_OPTIONAL_SYMBOLS: ${UMF_OPTIONAL_SYMBOLS_WINDOWS}")
-else()
-    message(STATUS "UMF_OPTIONAL_SYMBOLS: ${UMF_OPTIONAL_SYMBOLS_LINUX}")
+# Add symbols for unsupported functions
+if(NOT UMF_BUILD_CUDA_PROVIDER)
+    set(UMF_COMMON_COMPILE_DEFINITIONS ${UMF_COMMON_COMPILE_DEFINITIONS}
+                                       "UMF_NO_CUDA_PROVIDER=1")
+endif()
+if(NOT UMF_BUILD_LEVEL_ZERO_PROVIDER)
+    set(UMF_COMMON_COMPILE_DEFINITIONS ${UMF_COMMON_COMPILE_DEFINITIONS}
+                                       "UMF_NO_LEVEL_ZERO_PROVIDER=1")
+endif()
+if(UMF_DISABLE_HWLOC OR WINDOWS)
+    set(UMF_COMMON_COMPILE_DEFINITIONS ${UMF_COMMON_COMPILE_DEFINITIONS}
+                                       "UMF_NO_DEVDAX_PROVIDER=1")
+    set(UMF_COMMON_COMPILE_DEFINITIONS ${UMF_COMMON_COMPILE_DEFINITIONS}
+                                       "UMF_NO_FILE_PROVIDER=1")
 endif()
-
-# Configure map/def files with optional symbols
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/libumf.def.in"
-               "${CMAKE_CURRENT_BINARY_DIR}/libumf.def" @ONLY)
-
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/libumf.map.in"
-               "${CMAKE_CURRENT_BINARY_DIR}/libumf.map" @ONLY)
 
 set(UMF_PRIVATE_LIBRARY_DIRS ${UMF_PRIVATE_LIBRARY_DIRS}
                              ${LIBHWLOC_LIBRARY_DIRS})
@@ -198,8 +189,8 @@ if(UMF_BUILD_SHARED_LIBRARY)
         TYPE SHARED
         SRCS ${UMF_SOURCES}
         LIBS ${UMF_LIBS} ${HWLOC_LIB}
-        LINUX_MAP_FILE ${CMAKE_CURRENT_BINARY_DIR}/libumf.map
-        WINDOWS_DEF_FILE ${CMAKE_CURRENT_BINARY_DIR}/libumf.def)
+        LINUX_MAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/libumf.map
+        WINDOWS_DEF_FILE ${CMAKE_CURRENT_SOURCE_DIR}/libumf.def)
     set(UMF_COMMON_COMPILE_DEFINITIONS ${UMF_COMMON_COMPILE_DEFINITIONS}
                                        "UMF_SHARED_LIBRARY")
     set_target_properties(
@@ -217,7 +208,7 @@ endif()
 
 if(UMF_DISABLE_HWLOC)
     set(UMF_COMMON_COMPILE_DEFINITIONS ${UMF_COMMON_COMPILE_DEFINITIONS}
-                                       UMF_NO_HWLOC=1)
+                                       "UMF_NO_HWLOC=1")
 endif()
 
 if(UMF_LINK_HWLOC_STATICALLY)

src/libumf.def.in renamed to src/libumf.def

@@ -16,10 +16,13 @@ EXPORTS
     umfCloseIPCHandle
     umfCoarseMemoryProviderGetStats
     umfCoarseMemoryProviderOps
+    umfCUDAMemoryProviderOps
+    umfDevDaxMemoryProviderOps
     umfFree
+    umfFileMemoryProviderOps
     umfGetIPCHandle
     umfGetLastFailedMemoryProvider
-    umfMemoryTrackerGetAllocInfo
+    umfLevelZeroMemoryProviderOps
     umfMemoryProviderAlloc
     umfMemoryProviderAllocationMerge
     umfMemoryProviderAllocationSplit
@@ -38,14 +41,20 @@ EXPORTS
     umfMemoryProviderPurgeForce
     umfMemoryProviderPurgeLazy
     umfMemoryProviderPutIPCHandle
+    umfMemoryTrackerGetAllocInfo
     umfMempolicyCreate
     umfMempolicyDestroy
     umfMempolicySetCustomSplitPartitions
     umfMempolicySetInterleavePartSize
     umfMemspaceClone
+    umfMemspaceCreateFromNumaArray
     umfMemspaceDestroy
     umfMemspaceFilterByCapacity
     umfMemspaceFilterById
+    umfMemspaceHighestBandwidthGet
+    umfMemspaceHighestCapacityGet
+    umfMemspaceHostAllGet
+    umfMemspaceLowestLatencyGet
     umfMemspaceMemtargetAdd
     umfMemspaceMemtargetGet
     umfMemspaceMemtargetNum
@@ -55,7 +64,8 @@ EXPORTS
     umfMemtargetGetCapacity
     umfMemtargetGetId
     umfMemtargetGetType
-    umfOpenIPCHandle    
+    umfOpenIPCHandle
+    umfOsMemoryProviderOps
     umfPoolAlignedMalloc
     umfPoolByPtr
     umfPoolCalloc
@@ -72,4 +82,3 @@ EXPORTS
     umfProxyPoolOps
     umfPutIPCHandle
     umfScalablePoolOps
-    @UMF_OPTIONAL_SYMBOLS_WINDOWS@

src/libumf.map.in renamed to src/libumf.map

@@ -10,10 +10,13 @@ UMF_1.0 {
         umfCloseIPCHandle;
         umfCoarseMemoryProviderGetStats;
         umfCoarseMemoryProviderOps;
+        umfCUDAMemoryProviderOps;
+        umfDevDaxMemoryProviderOps;
         umfFree;
+        umfFileMemoryProviderOps;
         umfGetIPCHandle;
         umfGetLastFailedMemoryProvider;
-        umfMemoryTrackerGetAllocInfo;
+        umfLevelZeroMemoryProviderOps;
         umfMemoryProviderAlloc;
         umfMemoryProviderAllocationMerge;
         umfMemoryProviderAllocationSplit;
@@ -32,14 +35,20 @@ UMF_1.0 {
         umfMemoryProviderPurgeForce;
         umfMemoryProviderPurgeLazy;
         umfMemoryProviderPutIPCHandle;
+        umfMemoryTrackerGetAllocInfo;
         umfMempolicyCreate;
         umfMempolicyDestroy;
         umfMempolicySetCustomSplitPartitions;
         umfMempolicySetInterleavePartSize;
         umfMemspaceClone;
+        umfMemspaceCreateFromNumaArray;
         umfMemspaceDestroy;
         umfMemspaceFilterByCapacity;
         umfMemspaceFilterById;
+        umfMemspaceHighestBandwidthGet;
+        umfMemspaceHighestCapacityGet;
+        umfMemspaceHostAllGet;
+        umfMemspaceLowestLatencyGet;
         umfMemspaceMemtargetAdd;
         umfMemspaceMemtargetGet;
         umfMemspaceMemtargetNum;
@@ -50,6 +59,7 @@ UMF_1.0 {
         umfMemtargetGetId;
         umfMemtargetGetType;
         umfOpenIPCHandle;
+        umfOsMemoryProviderOps;
         umfPoolAlignedMalloc;
         umfPoolByPtr;
         umfPoolCalloc;
@@ -66,7 +76,6 @@ UMF_1.0 {
         umfProxyPoolOps;
         umfPutIPCHandle;
         umfScalablePoolOps;
-        @UMF_OPTIONAL_SYMBOLS_LINUX@
     local:
         *;
 };

src/memspaces/memspace_highest_bandwidth.c

@@ -11,6 +11,20 @@
 #include <ctype.h>
 #include <stdlib.h>
 
+#include <umf.h>
+#include <umf/memspace.h>
+
+// UMF_MEMSPACE_HIGHEST_BANDWIDTH requires HWLOC
+// Additionally, it is currently unsupported on Win
+#if defined(_WIN32) || defined(UMF_NO_HWLOC)
+
+umf_const_memspace_handle_t umfMemspaceHighestBandwidthGet(void) {
+    // not supported
+    return NULL;
+}
+
+#else // !defined(_WIN32) && !defined(UMF_NO_HWLOC)
+
 #include "base_alloc_global.h"
 #include "memspace_internal.h"
 #include "memtarget_numa.h"
@@ -100,3 +114,5 @@ umf_const_memspace_handle_t umfMemspaceHighestBandwidthGet(void) {
                     umfMemspaceHighestBandwidthInit);
     return UMF_MEMSPACE_HIGHEST_BANDWIDTH;
 }
+
+#endif // !defined(_WIN32) && !defined(UMF_NO_HWLOC)

src/memspaces/memspace_highest_capacity.c

@@ -10,6 +10,20 @@
 #include <assert.h>
 #include <stdlib.h>
 
+#include <umf.h>
+#include <umf/memspace.h>
+
+// UMF_MEMSPACE_HIGHEST_CAPACITY requires HWLOC
+// Additionally, it is currently unsupported on Win
+#if defined(_WIN32) || defined(UMF_NO_HWLOC)
+
+umf_const_memspace_handle_t umfMemspaceHighestCapacityGet(void) {
+    // not supported
+    return NULL;
+}
+
+#else // !defined(_WIN32) && !defined(UMF_NO_HWLOC)
+
 #include "base_alloc_global.h"
 #include "memspace_internal.h"
 #include "memtarget_numa.h"
@@ -72,3 +86,5 @@ umf_const_memspace_handle_t umfMemspaceHighestCapacityGet(void) {
                     umfMemspaceHighestCapacityInit);
     return UMF_MEMSPACE_HIGHEST_CAPACITY;
 }
+
+#endif // !defined(_WIN32) && !defined(UMF_NO_HWLOC)

src/memspaces/memspace_host_all.c

@@ -10,6 +10,20 @@
 #include <assert.h>
 #include <stdlib.h>
 
+#include <umf.h>
+#include <umf/memspace.h>
+
+// UMF_MEMSPACE_HOST_ALL requires HWLOC
+// Additionally, it is currently unsupported on Win
+
+#if defined(_WIN32) || defined(UMF_NO_HWLOC)
+umf_const_memspace_handle_t umfMemspaceHostAllGet(void) {
+    // not supported
+    return NULL;
+}
+
+#else // !defined(_WIN32) && !defined(UMF_NO_HWLOC)
+
 #include "base_alloc_global.h"
 #include "memspace_internal.h"
 #include "memtarget_numa.h"
@@ -93,3 +107,5 @@ umf_const_memspace_handle_t umfMemspaceHostAllGet(void) {
     utils_init_once(&UMF_MEMSPACE_HOST_ALL_INITIALIZED, umfMemspaceHostAllInit);
     return UMF_MEMSPACE_HOST_ALL;
 }
+
+#endif // !defined(_WIN32) && !defined(UMF_NO_HWLOC)

src/memspaces/memspace_lowest_latency.c

@@ -11,6 +11,20 @@
 #include <ctype.h>
 #include <stdlib.h>
 
+#include <umf.h>
+#include <umf/memspace.h>
+
+// UMF_MEMSPACE_LOWEST_LATENCY requires HWLOC
+// Additionally, it is currently unsupported on Win
+#if defined(_WIN32) || defined(UMF_NO_HWLOC)
+
+umf_const_memspace_handle_t umfMemspaceLowestLatencyGet(void) {
+    // not supported
+    return NULL;
+}
+
+#else // !defined(_WIN32) && !defined(UMF_NO_HWLOC)
+
 #include "base_alloc_global.h"
 #include "memspace_internal.h"
 #include "memtarget_numa.h"
@@ -100,3 +114,5 @@ umf_const_memspace_handle_t umfMemspaceLowestLatencyGet(void) {
                     umfMemspaceLowestLatencyInit);
     return UMF_MEMSPACE_LOWEST_LATENCY;
 }
+
+#endif // !defined(_WIN32) && !defined(UMF_NO_HWLOC)

src/memspaces/memspace_numa.c

@@ -9,6 +9,24 @@
 
 #include <stdlib.h>
 
+#include <umf.h>
+#include <umf/memspace.h>
+
+// umfMemspaceCreateFromNumaArray requires HWLOC
+// Additionally, it is currently unsupported on Win
+#if defined(_WIN32) || defined(UMF_NO_HWLOC)
+umf_result_t umfMemspaceCreateFromNumaArray(unsigned *nodeIds, size_t numIds,
+                                            umf_memspace_handle_t *hMemspace) {
+    (void)nodeIds;
+    (void)numIds;
+    (void)hMemspace;
+
+    // not supported
+    return UMF_RESULT_ERROR_NOT_SUPPORTED;
+}
+
+#else // !defined(_WIN32) && !defined(UMF_NO_HWLOC)
+
 #include "../memspace_internal.h"
 #include "../memtargets/memtarget_numa.h"
 #include "base_alloc_global.h"
@@ -57,3 +75,5 @@ umf_result_t umfMemspaceCreateFromNumaArray(unsigned *nodeIds, size_t numIds,
     umf_ba_global_free(memspace);
     return ret;
 }
+
+#endif // !defined(_WIN32) && !defined(UMF_NO_HWLOC)