Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge v0.10.x into main #1032

Merged

Conversation

lukaszstolarczuk
Copy link
Contributor

Merge changes from stable branch v0.10.x into main.

It includes also update of new symbols into our new versioning in symbols .map file.

ldorau and others added 10 commits December 12, 2024 14:00
Add strings with UMF version and useful CMake options
that can be grepped in the following way:

$ strings libumf.so | grep "@(#)"
@(#) Intel(R) UMF version: 0.11.0-dev.git66.g89e3831d
@(#) Intel(R) UMF CMake variables: "CMAKE_BUILD_TYPE:Debug,...

Signed-off-by: Lukasz Dorau <[email protected]>
…rsion_and_all_UMF_CMake_variables

Add strings with UMF version and useful CMake options
Add error messages when CUDA provider is disabled
(UMF_BUILD_CUDA_PROVIDER is OFF).

Signed-off-by: Lukasz Dorau <[email protected]>
Add error messages when L0 memory provider is disabled
(UMF_BUILD_LEVEL_ZERO_PROVIDER is OFF).

Signed-off-by: Lukasz Dorau <[email protected]>
…n_memory_providers_are_disabled

Add error messages when memory providers are disabled
Co-authored-by: Łukasz Stolarczuk <[email protected]>
@lukaszstolarczuk lukaszstolarczuk requested a review from a team as a code owner January 10, 2025 13:07
umfFixedMemoryProviderOps;
umfFixedMemoryProviderParamsCreate;
umfFixedMemoryProviderParamsDestroy;
} UMF_0.10;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure on this one - I based this on info from https://sourceware.org/binutils/docs/ld/VERSION.html

@@ -117,3 +114,9 @@ UMF_1.0 {
local:
*;
};

UMF_0.11 {
umfFixedMemoryProviderOps;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we have any other new symbols on main...?

Copy link
Contributor

@bratpiorka bratpiorka Jan 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure what about recent change in umf_memory_provider_ops_t struct and functions using it but we'll figure it out in backward comp. tests

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

heh, I guess we have to figure it out, cause it's already failing on my test branch in UR 😄

https://github.com/oneapi-src/unified-runtime/actions/runs/12710368809/job/35431309282?pr=2546

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

heh, I guess we have to figure it out, cause it's already failing on my test branch in UR 😄

https://github.com/oneapi-src/unified-runtime/actions/runs/12710368809/job/35431309282?pr=2546

@lukaszstolarczuk Is it still failing ?


VERSION 1.0
VERSION 0.11
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure if this one should be updated...?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it should match map file even if this is not used anywhere

@lukaszstolarczuk lukaszstolarczuk marked this pull request as draft January 14, 2025 12:44
@lukaszstolarczuk lukaszstolarczuk force-pushed the merge-v0.10.x-into-main branch 2 times, most recently from 17f21ef to b5790fe Compare January 14, 2025 13:17
@lukaszstolarczuk lukaszstolarczuk marked this pull request as ready for review January 14, 2025 13:22
@lukaszstolarczuk
Copy link
Contributor Author

rebased with latest main

@ldorau
Copy link
Contributor

ldorau commented Jan 14, 2025

heh, I guess we have to figure it out, cause it's already failing on my test branch in UR 😄

https://github.com/oneapi-src/unified-runtime/actions/runs/12710368809/job/35431309282?pr=2546

@lukaszstolarczuk Is it still failing ?

@lukaszstolarczuk
Copy link
Contributor Author

heh, I guess we have to figure it out, cause it's already failing on my test branch in UR 😄
https://github.com/oneapi-src/unified-runtime/actions/runs/12710368809/job/35431309282?pr=2546

@lukaszstolarczuk Is it still failing ?

it was failing in UR because of breaking change we introduced on main - the fix there is trivial. I just wanted to mention that UMF's compatibility is a general issue 😉

@lukaszstolarczuk lukaszstolarczuk merged commit 8e22b4c into oneapi-src:main Jan 15, 2025
78 checks passed
@lukaszstolarczuk lukaszstolarczuk deleted the merge-v0.10.x-into-main branch January 15, 2025 10:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants