Skip to content

Commit c19c1b8

Browse files
authored
Merge pull request #1431 from lukaszstolarczuk/change-map-file-1.0
Update libumf.map file to only have 1.0 section
2 parents 170350d + 6582ea3 commit c19c1b8

File tree

3 files changed

+17
-19
lines changed

3 files changed

+17
-19
lines changed

.github/workflows/pr_push.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ jobs:
9595
security-events: write
9696
uses: ./.github/workflows/reusable_trivy.yml
9797
Compatibility:
98+
# TODO: bring back when new UMF version is ready
99+
if: false
98100
needs: [Build]
99101
uses: ./.github/workflows/reusable_compatibility.yml
100102
strategy:

src/libumf.def

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ EXPORTS
1212
DllMain
1313
umfInit
1414
umfTearDown
15-
umfGetCurrentVersion
1615
umfCloseIPCHandle
1716
umfCUDAMemoryProviderOps
1817
umfCUDAMemoryProviderParamsCreate
@@ -32,6 +31,7 @@ EXPORTS
3231
umfFileMemoryProviderParamsSetProtection
3332
umfFileMemoryProviderParamsSetVisibility
3433
umfFree
34+
umfGetCurrentVersion
3535
umfGetIPCHandle
3636
umfGetLastFailedMemoryProvider
3737
umfJemallocPoolOps
@@ -86,13 +86,13 @@ EXPORTS
8686
umfOsMemoryProviderOps
8787
umfOsMemoryProviderParamsCreate
8888
umfOsMemoryProviderParamsDestroy
89-
umfOsMemoryProviderParamsSetProtection
90-
umfOsMemoryProviderParamsSetVisibility
91-
umfOsMemoryProviderParamsSetShmName
9289
umfOsMemoryProviderParamsSetNumaList
9390
umfOsMemoryProviderParamsSetNumaMode
94-
umfOsMemoryProviderParamsSetPartSize
9591
umfOsMemoryProviderParamsSetPartitions
92+
umfOsMemoryProviderParamsSetPartSize
93+
umfOsMemoryProviderParamsSetProtection
94+
umfOsMemoryProviderParamsSetShmName
95+
umfOsMemoryProviderParamsSetVisibility
9696
umfPoolAlignedMalloc
9797
umfPoolByPtr
9898
umfPoolCalloc
@@ -134,8 +134,8 @@ EXPORTS
134134
umfFixedMemoryProviderParamsCreate
135135
umfFixedMemoryProviderParamsDestroy
136136
umfFixedMemoryProviderParamsSetMemory
137-
umfLevelZeroMemoryProviderParamsSetFreePolicy
138137
umfLevelZeroMemoryProviderParamsSetDeviceOrdinal
138+
umfLevelZeroMemoryProviderParamsSetFreePolicy
139139
; Added in UMF_1.0
140140
umfCtlExec
141141
umfCtlGet

src/libumf.map

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
# Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
33
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
44

5-
UMF_0.10 {
5+
UMF_1.0 {
66
global:
77
umfInit;
88
umfTearDown;
9-
umfGetCurrentVersion;
109
umfCloseIPCHandle;
1110
umfCUDAMemoryProviderOps;
1211
umfCUDAMemoryProviderParamsCreate;
@@ -26,6 +25,7 @@ UMF_0.10 {
2625
umfFileMemoryProviderParamsSetProtection;
2726
umfFileMemoryProviderParamsSetVisibility;
2827
umfFree;
28+
umfGetCurrentVersion;
2929
umfGetIPCHandle;
3030
umfGetLastFailedMemoryProvider;
3131
umfJemallocPoolOps;
@@ -82,8 +82,8 @@ UMF_0.10 {
8282
umfOsMemoryProviderParamsDestroy;
8383
umfOsMemoryProviderParamsSetNumaList;
8484
umfOsMemoryProviderParamsSetNumaMode;
85-
umfOsMemoryProviderParamsSetPartSize;
8685
umfOsMemoryProviderParamsSetPartitions;
86+
umfOsMemoryProviderParamsSetPartSize;
8787
umfOsMemoryProviderParamsSetProtection;
8888
umfOsMemoryProviderParamsSetShmName;
8989
umfOsMemoryProviderParamsSetVisibility;
@@ -110,11 +110,7 @@ UMF_0.10 {
110110
umfScalablePoolParamsDestroy;
111111
umfScalablePoolParamsSetGranularity;
112112
umfScalablePoolParamsSetKeepAllMemory;
113-
local:
114-
*;
115-
};
116-
117-
UMF_0.11 {
113+
# Added in UMF_0.11
118114
umfCUDAMemoryProviderParamsSetAllocFlags;
119115
umfDisjointPoolOps;
120116
umfDisjointPoolParamsCreate;
@@ -132,16 +128,16 @@ UMF_0.11 {
132128
umfFixedMemoryProviderParamsCreate;
133129
umfFixedMemoryProviderParamsDestroy;
134130
umfFixedMemoryProviderParamsSetMemory;
135-
umfLevelZeroMemoryProviderParamsSetFreePolicy;
136131
umfLevelZeroMemoryProviderParamsSetDeviceOrdinal;
137-
} UMF_0.10;
138-
139-
UMF_1.0 {
132+
umfLevelZeroMemoryProviderParamsSetFreePolicy;
133+
# Added in UMF_1.0
140134
umfCtlExec;
141135
umfCtlGet;
142136
umfCtlSet;
143137
umfJemallocPoolParamsCreate;
144138
umfJemallocPoolParamsDestroy;
145139
umfJemallocPoolParamsSetNumArenas;
146140
umfPoolGetName;
147-
} UMF_0.11;
141+
local:
142+
*;
143+
};

0 commit comments

Comments
 (0)