Skip to content

Commit e32fcc7

Browse files
lukaszstolarczuklukaszstolarczuk
authored
Merge pull request #1316 from bratpiorka/rrudnick_cleanup_cmake
remove unused UMF_NO_*_PROVIDER compile defs
2 parents 1faa557 + 4767a75 commit e32fcc7

File tree

3 files changed

+154
-170
lines changed

3 files changed

+154
-170
lines changed

‎src/CMakeLists.txt‎

Lines changed: 13 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -115,20 +115,22 @@ set(UMF_SOURCES_LINUX libumf_linux.c)
115115
set(UMF_SOURCES_MACOSX libumf_linux.c)
116116
set(UMF_SOURCES_WINDOWS libumf_windows.c)
117117

118-
# Add compile definitions to handle unsupported functions
119-
if(NOT UMF_BUILD_CUDA_PROVIDER)
120-
set(UMF_COMMON_COMPILE_DEFINITIONS ${UMF_COMMON_COMPILE_DEFINITIONS}
121-
"UMF_NO_CUDA_PROVIDER=1")
122-
endif()
123-
if(NOT UMF_BUILD_LEVEL_ZERO_PROVIDER)
118+
if(UMF_BUILD_LEVEL_ZERO_PROVIDER)
119+
if(LINUX)
120+
# WA for error ze_api.h:14234:20: no newline at end of file
121+
# [-Werror,-Wnewline-eof]
122+
set_source_files_properties(
123+
provider/provider_level_zero.c
124+
PROPERTIES APPEND_STRING PROPERTY COMPILE_FLAGS "-Wno-newline-eof")
125+
endif()
126+
124127
set(UMF_COMMON_COMPILE_DEFINITIONS ${UMF_COMMON_COMPILE_DEFINITIONS}
125-
"UMF_NO_LEVEL_ZERO_PROVIDER=1")
128+
"UMF_BUILD_LEVEL_ZERO_PROVIDER=1")
126129
endif()
127-
if(UMF_DISABLE_HWLOC OR WINDOWS)
128-
set(UMF_COMMON_COMPILE_DEFINITIONS ${UMF_COMMON_COMPILE_DEFINITIONS}
129-
"UMF_NO_DEVDAX_PROVIDER=1")
130+
131+
if(UMF_BUILD_CUDA_PROVIDER)
130132
set(UMF_COMMON_COMPILE_DEFINITIONS ${UMF_COMMON_COMPILE_DEFINITIONS}
131-
"UMF_NO_FILE_PROVIDER=1")
133+
"UMF_BUILD_CUDA_PROVIDER=1")
132134
endif()
133135

134136
if(LINUX)
@@ -198,24 +200,6 @@ if(NOT WINDOWS AND UMF_POOL_JEMALLOC_ENABLED)
198200
add_dependencies(umf jemalloc)
199201
endif()
200202

201-
if(UMF_BUILD_LEVEL_ZERO_PROVIDER)
202-
if(LINUX)
203-
# WA for error ze_api.h:14234:20: no newline at end of file
204-
# [-Werror,-Wnewline-eof]
205-
set_source_files_properties(
206-
provider/provider_level_zero.c
207-
PROPERTIES APPEND_STRING PROPERTY COMPILE_FLAGS "-Wno-newline-eof")
208-
endif()
209-
210-
set(UMF_COMPILE_DEFINITIONS ${UMF_COMPILE_DEFINITIONS}
211-
"UMF_BUILD_LEVEL_ZERO_PROVIDER=1")
212-
endif()
213-
214-
if(UMF_BUILD_CUDA_PROVIDER)
215-
set(UMF_COMPILE_DEFINITIONS ${UMF_COMPILE_DEFINITIONS}
216-
"UMF_BUILD_CUDA_PROVIDER=1")
217-
endif()
218-
219203
add_library(${PROJECT_NAME}::umf ALIAS umf)
220204

221205
if(LIBHWLOC_INCLUDE_DIRS)

‎src/provider/provider_cuda.c‎

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -25,62 +25,7 @@ void fini_cu_global_state(void) {
2525
}
2626
}
2727

28-
#if defined(UMF_NO_CUDA_PROVIDER)
29-
30-
umf_result_t umfCUDAMemoryProviderParamsCreate(
31-
umf_cuda_memory_provider_params_handle_t *hParams) {
32-
(void)hParams;
33-
LOG_ERR("CUDA provider is disabled (UMF_BUILD_CUDA_PROVIDER is OFF)!");
34-
return UMF_RESULT_ERROR_NOT_SUPPORTED;
35-
}
36-
37-
umf_result_t umfCUDAMemoryProviderParamsDestroy(
38-
umf_cuda_memory_provider_params_handle_t hParams) {
39-
(void)hParams;
40-
LOG_ERR("CUDA provider is disabled (UMF_BUILD_CUDA_PROVIDER is OFF)!");
41-
return UMF_RESULT_ERROR_NOT_SUPPORTED;
42-
}
43-
44-
umf_result_t umfCUDAMemoryProviderParamsSetContext(
45-
umf_cuda_memory_provider_params_handle_t hParams, void *hContext) {
46-
(void)hParams;
47-
(void)hContext;
48-
LOG_ERR("CUDA provider is disabled (UMF_BUILD_CUDA_PROVIDER is OFF)!");
49-
return UMF_RESULT_ERROR_NOT_SUPPORTED;
50-
}
51-
52-
umf_result_t umfCUDAMemoryProviderParamsSetDevice(
53-
umf_cuda_memory_provider_params_handle_t hParams, int hDevice) {
54-
(void)hParams;
55-
(void)hDevice;
56-
LOG_ERR("CUDA provider is disabled (UMF_BUILD_CUDA_PROVIDER is OFF)!");
57-
return UMF_RESULT_ERROR_NOT_SUPPORTED;
58-
}
59-
60-
umf_result_t umfCUDAMemoryProviderParamsSetMemoryType(
61-
umf_cuda_memory_provider_params_handle_t hParams,
62-
umf_usm_memory_type_t memoryType) {
63-
(void)hParams;
64-
(void)memoryType;
65-
LOG_ERR("CUDA provider is disabled (UMF_BUILD_CUDA_PROVIDER is OFF)!");
66-
return UMF_RESULT_ERROR_NOT_SUPPORTED;
67-
}
68-
69-
umf_result_t umfCUDAMemoryProviderParamsSetAllocFlags(
70-
umf_cuda_memory_provider_params_handle_t hParams, unsigned int flags) {
71-
(void)hParams;
72-
(void)flags;
73-
LOG_ERR("CUDA provider is disabled (UMF_BUILD_CUDA_PROVIDER is OFF)!");
74-
return UMF_RESULT_ERROR_NOT_SUPPORTED;
75-
}
76-
77-
const umf_memory_provider_ops_t *umfCUDAMemoryProviderOps(void) {
78-
// not supported
79-
LOG_ERR("CUDA provider is disabled (UMF_BUILD_CUDA_PROVIDER is OFF)!");
80-
return NULL;
81-
}
82-
83-
#else // !defined(UMF_NO_CUDA_PROVIDER)
28+
#if UMF_BUILD_CUDA_PROVIDER
8429

8530
// disable warning 4201: nonstandard extension used: nameless struct/union
8631
#if defined(_MSC_VER)
@@ -759,4 +704,59 @@ const umf_memory_provider_ops_t *umfCUDAMemoryProviderOps(void) {
759704
return &UMF_CUDA_MEMORY_PROVIDER_OPS;
760705
}
761706

762-
#endif // !defined(UMF_NO_CUDA_PROVIDER)
707+
#else // !UMF_BUILD_CUDA_PROVIDER
708+
709+
umf_result_t umfCUDAMemoryProviderParamsCreate(
710+
umf_cuda_memory_provider_params_handle_t *hParams) {
711+
(void)hParams;
712+
LOG_ERR("CUDA provider is disabled (UMF_BUILD_CUDA_PROVIDER is OFF)!");
713+
return UMF_RESULT_ERROR_NOT_SUPPORTED;
714+
}
715+
716+
umf_result_t umfCUDAMemoryProviderParamsDestroy(
717+
umf_cuda_memory_provider_params_handle_t hParams) {
718+
(void)hParams;
719+
LOG_ERR("CUDA provider is disabled (UMF_BUILD_CUDA_PROVIDER is OFF)!");
720+
return UMF_RESULT_ERROR_NOT_SUPPORTED;
721+
}
722+
723+
umf_result_t umfCUDAMemoryProviderParamsSetContext(
724+
umf_cuda_memory_provider_params_handle_t hParams, void *hContext) {
725+
(void)hParams;
726+
(void)hContext;
727+
LOG_ERR("CUDA provider is disabled (UMF_BUILD_CUDA_PROVIDER is OFF)!");
728+
return UMF_RESULT_ERROR_NOT_SUPPORTED;
729+
}
730+
731+
umf_result_t umfCUDAMemoryProviderParamsSetDevice(
732+
umf_cuda_memory_provider_params_handle_t hParams, int hDevice) {
733+
(void)hParams;
734+
(void)hDevice;
735+
LOG_ERR("CUDA provider is disabled (UMF_BUILD_CUDA_PROVIDER is OFF)!");
736+
return UMF_RESULT_ERROR_NOT_SUPPORTED;
737+
}
738+
739+
umf_result_t umfCUDAMemoryProviderParamsSetMemoryType(
740+
umf_cuda_memory_provider_params_handle_t hParams,
741+
umf_usm_memory_type_t memoryType) {
742+
(void)hParams;
743+
(void)memoryType;
744+
LOG_ERR("CUDA provider is disabled (UMF_BUILD_CUDA_PROVIDER is OFF)!");
745+
return UMF_RESULT_ERROR_NOT_SUPPORTED;
746+
}
747+
748+
umf_result_t umfCUDAMemoryProviderParamsSetAllocFlags(
749+
umf_cuda_memory_provider_params_handle_t hParams, unsigned int flags) {
750+
(void)hParams;
751+
(void)flags;
752+
LOG_ERR("CUDA provider is disabled (UMF_BUILD_CUDA_PROVIDER is OFF)!");
753+
return UMF_RESULT_ERROR_NOT_SUPPORTED;
754+
}
755+
756+
const umf_memory_provider_ops_t *umfCUDAMemoryProviderOps(void) {
757+
// not supported
758+
LOG_ERR("CUDA provider is disabled (UMF_BUILD_CUDA_PROVIDER is OFF)!");
759+
return NULL;
760+
}
761+
762+
#endif // !UMF_BUILD_CUDA_PROVIDER

‎src/provider/provider_level_zero.c‎

Lines changed: 84 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -27,89 +27,7 @@ void fini_ze_global_state(void) {
2727
}
2828
}
2929

30-
#if defined(UMF_NO_LEVEL_ZERO_PROVIDER)
31-
32-
umf_result_t umfLevelZeroMemoryProviderParamsCreate(
33-
umf_level_zero_memory_provider_params_handle_t *hParams) {
34-
(void)hParams;
35-
LOG_ERR("L0 memory provider is disabled! (UMF_BUILD_LEVEL_ZERO_PROVIDER is "
36-
"OFF)");
37-
return UMF_RESULT_ERROR_NOT_SUPPORTED;
38-
}
39-
40-
umf_result_t umfLevelZeroMemoryProviderParamsDestroy(
41-
umf_level_zero_memory_provider_params_handle_t hParams) {
42-
(void)hParams;
43-
LOG_ERR("L0 memory provider is disabled! (UMF_BUILD_LEVEL_ZERO_PROVIDER is "
44-
"OFF)");
45-
return UMF_RESULT_ERROR_NOT_SUPPORTED;
46-
}
47-
48-
umf_result_t umfLevelZeroMemoryProviderParamsSetContext(
49-
umf_level_zero_memory_provider_params_handle_t hParams,
50-
ze_context_handle_t hContext) {
51-
(void)hParams;
52-
(void)hContext;
53-
LOG_ERR("L0 memory provider is disabled! (UMF_BUILD_LEVEL_ZERO_PROVIDER is "
54-
"OFF)");
55-
return UMF_RESULT_ERROR_NOT_SUPPORTED;
56-
}
57-
58-
umf_result_t umfLevelZeroMemoryProviderParamsSetDevice(
59-
umf_level_zero_memory_provider_params_handle_t hParams,
60-
ze_device_handle_t hDevice) {
61-
(void)hParams;
62-
(void)hDevice;
63-
LOG_ERR("L0 memory provider is disabled! (UMF_BUILD_LEVEL_ZERO_PROVIDER is "
64-
"OFF)");
65-
return UMF_RESULT_ERROR_NOT_SUPPORTED;
66-
}
67-
68-
umf_result_t umfLevelZeroMemoryProviderParamsSetMemoryType(
69-
umf_level_zero_memory_provider_params_handle_t hParams,
70-
umf_usm_memory_type_t memoryType) {
71-
(void)hParams;
72-
(void)memoryType;
73-
LOG_ERR("L0 memory provider is disabled! (UMF_BUILD_LEVEL_ZERO_PROVIDER is "
74-
"OFF)");
75-
return UMF_RESULT_ERROR_NOT_SUPPORTED;
76-
}
77-
78-
umf_result_t umfLevelZeroMemoryProviderParamsSetResidentDevices(
79-
umf_level_zero_memory_provider_params_handle_t hParams,
80-
ze_device_handle_t *hDevices, uint32_t deviceCount) {
81-
(void)hParams;
82-
(void)hDevices;
83-
(void)deviceCount;
84-
LOG_ERR("L0 memory provider is disabled! (UMF_BUILD_LEVEL_ZERO_PROVIDER is "
85-
"OFF)");
86-
return UMF_RESULT_ERROR_NOT_SUPPORTED;
87-
}
88-
89-
umf_result_t umfLevelZeroMemoryProviderParamsSetFreePolicy(
90-
umf_level_zero_memory_provider_params_handle_t hParams,
91-
umf_level_zero_memory_provider_free_policy_t policy) {
92-
(void)hParams;
93-
(void)policy;
94-
return UMF_RESULT_ERROR_NOT_SUPPORTED;
95-
}
96-
97-
umf_result_t umfLevelZeroMemoryProviderParamsSetDeviceOrdinal(
98-
umf_level_zero_memory_provider_params_handle_t hParams,
99-
uint32_t deviceOrdinal) {
100-
(void)hParams;
101-
(void)deviceOrdinal;
102-
return UMF_RESULT_ERROR_NOT_SUPPORTED;
103-
}
104-
105-
const umf_memory_provider_ops_t *umfLevelZeroMemoryProviderOps(void) {
106-
// not supported
107-
LOG_ERR("L0 memory provider is disabled! (UMF_BUILD_LEVEL_ZERO_PROVIDER is "
108-
"OFF)");
109-
return NULL;
110-
}
111-
112-
#else // !defined(UMF_NO_LEVEL_ZERO_PROVIDER)
30+
#if UMF_BUILD_LEVEL_ZERO_PROVIDER
11331

11432
#include "base_alloc_global.h"
11533
#include "libumf.h"
@@ -867,4 +785,86 @@ const umf_memory_provider_ops_t *umfLevelZeroMemoryProviderOps(void) {
867785
return &UMF_LEVEL_ZERO_MEMORY_PROVIDER_OPS;
868786
}
869787

870-
#endif // !defined(UMF_NO_LEVEL_ZERO_PROVIDER)
788+
#else // !UMF_BUILD_LEVEL_ZERO_PROVIDER
789+
790+
umf_result_t umfLevelZeroMemoryProviderParamsCreate(
791+
umf_level_zero_memory_provider_params_handle_t *hParams) {
792+
(void)hParams;
793+
LOG_ERR("L0 memory provider is disabled! (UMF_BUILD_LEVEL_ZERO_PROVIDER is "
794+
"OFF)");
795+
return UMF_RESULT_ERROR_NOT_SUPPORTED;
796+
}
797+
798+
umf_result_t umfLevelZeroMemoryProviderParamsDestroy(
799+
umf_level_zero_memory_provider_params_handle_t hParams) {
800+
(void)hParams;
801+
LOG_ERR("L0 memory provider is disabled! (UMF_BUILD_LEVEL_ZERO_PROVIDER is "
802+
"OFF)");
803+
return UMF_RESULT_ERROR_NOT_SUPPORTED;
804+
}
805+
806+
umf_result_t umfLevelZeroMemoryProviderParamsSetContext(
807+
umf_level_zero_memory_provider_params_handle_t hParams,
808+
ze_context_handle_t hContext) {
809+
(void)hParams;
810+
(void)hContext;
811+
LOG_ERR("L0 memory provider is disabled! (UMF_BUILD_LEVEL_ZERO_PROVIDER is "
812+
"OFF)");
813+
return UMF_RESULT_ERROR_NOT_SUPPORTED;
814+
}
815+
816+
umf_result_t umfLevelZeroMemoryProviderParamsSetDevice(
817+
umf_level_zero_memory_provider_params_handle_t hParams,
818+
ze_device_handle_t hDevice) {
819+
(void)hParams;
820+
(void)hDevice;
821+
LOG_ERR("L0 memory provider is disabled! (UMF_BUILD_LEVEL_ZERO_PROVIDER is "
822+
"OFF)");
823+
return UMF_RESULT_ERROR_NOT_SUPPORTED;
824+
}
825+
826+
umf_result_t umfLevelZeroMemoryProviderParamsSetMemoryType(
827+
umf_level_zero_memory_provider_params_handle_t hParams,
828+
umf_usm_memory_type_t memoryType) {
829+
(void)hParams;
830+
(void)memoryType;
831+
LOG_ERR("L0 memory provider is disabled! (UMF_BUILD_LEVEL_ZERO_PROVIDER is "
832+
"OFF)");
833+
return UMF_RESULT_ERROR_NOT_SUPPORTED;
834+
}
835+
836+
umf_result_t umfLevelZeroMemoryProviderParamsSetResidentDevices(
837+
umf_level_zero_memory_provider_params_handle_t hParams,
838+
ze_device_handle_t *hDevices, uint32_t deviceCount) {
839+
(void)hParams;
840+
(void)hDevices;
841+
(void)deviceCount;
842+
LOG_ERR("L0 memory provider is disabled! (UMF_BUILD_LEVEL_ZERO_PROVIDER is "
843+
"OFF)");
844+
return UMF_RESULT_ERROR_NOT_SUPPORTED;
845+
}
846+
847+
umf_result_t umfLevelZeroMemoryProviderParamsSetFreePolicy(
848+
umf_level_zero_memory_provider_params_handle_t hParams,
849+
umf_level_zero_memory_provider_free_policy_t policy) {
850+
(void)hParams;
851+
(void)policy;
852+
return UMF_RESULT_ERROR_NOT_SUPPORTED;
853+
}
854+
855+
umf_result_t umfLevelZeroMemoryProviderParamsSetDeviceOrdinal(
856+
umf_level_zero_memory_provider_params_handle_t hParams,
857+
uint32_t deviceOrdinal) {
858+
(void)hParams;
859+
(void)deviceOrdinal;
860+
return UMF_RESULT_ERROR_NOT_SUPPORTED;
861+
}
862+
863+
const umf_memory_provider_ops_t *umfLevelZeroMemoryProviderOps(void) {
864+
// not supported
865+
LOG_ERR("L0 memory provider is disabled! (UMF_BUILD_LEVEL_ZERO_PROVIDER is "
866+
"OFF)");
867+
return NULL;
868+
}
869+
870+
#endif // !UMF_BUILD_LEVEL_ZERO_PROVIDER

0 commit comments

Comments
 (0)