[SYCL][UR] Add Windows debug libs to install target #17512
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kbenzie
commented
Mar 18, 2025
kbenzie
force-pushed
the
benie/ur-debug-lib-suffix
branch
from
8a462bf to
3c4e12e
Compare
kbenzie
force-pushed
the
benie/ur-debug-lib-suffix
branch
from
613d83b to
a448455
Compare
kbenzie
commented
Mar 21, 2025
Contributor
Author
kbenzie
left a comment
kbenzie
left a comment
There was a problem hiding this comment.
@bratpiorka as mentioned in my last email, here's where to hook in the UMF debug postfix option and copy/install the library to the relevant places.
Contributor
Author
There was a problem hiding this comment.
Enable building umfd.dll/umfd.lib in the UR subbuild.
Contributor
Author
There was a problem hiding this comment.
Copy umfd.dll/umfd.lib into the parent <build>/bin/<build>/lib directories for use in testing.
Comment on lines
418
to
420
Contributor
Author
There was a problem hiding this comment.
Add umfd.dll/umfd.lib to the install target.
unified-runtime/cmake/helpers.cmake
Outdated
Comment on lines
236
to
230
Contributor
Author
There was a problem hiding this comment.
Add command to install only umfd.dll/umfd.lib, we don't want a full install here since we only care about the runtime libraries being installed with the debug postfix.
Contributor
There was a problem hiding this comment.
Please, see changes in oneapi-src/unified-memory-framework#1238
Contributor
Author
There was a problem hiding this comment.
Thanks, I'll test this today.
Contributor
Author
There was a problem hiding this comment.
This is mostly working, I've commented on the PR with one issue.
kbenzie
changed the title
aarongreig
approved these changes
Mar 21, 2025
kbenzie
force-pushed
the
benie/ur-debug-lib-suffix
branch
from
a448455 to
468c07c
Compare
Contributor
Author
I tried bumping the But got compile errors, @PatKamin / @lukaszstolarczuk is there a UMF pulldown in progress? |
Contributor
We've made the final 0.11.0 release (from branch v0.11.x), and I try to pull it into sycl here: #18095 Can you please share what kind of errors you got? |
Contributor
Author
I'll test with this commit.
They are on Linux , I didn't try Windows: |
Contributor
Author
No errors with this tag, must be something on UMF main causing them. |
Contributor
Och, yeah, these new |
kbenzie
force-pushed
the
benie/ur-debug-lib-suffix
branch
from
c3e02d1 to
a1ec5df
Compare
Contributor
Author
I've verified that the v0.11.0 tag is working as expected locally. I've not included the bug it in this PR, though so #18095 should also be merged once the internal drop is ready. |
Contributor
Author
|
As the testing shows, though, these chanages do require the UMF tag update. |
This patch adds the `install-unified-runtime-libraries` target which installs only the runtime library subset of targets. This can be used to provide `ur_loaderd.dll` and `ur_adatper_<name>d.dll` which link against the multithreaded debug DLL C runtime by using the `DEBUG_POSTFIX` target property to append `d` to the library names.
Instead of implicitly adding the `d` suffix to library names make this
optional. `DEBUG_POSTFIX` appears to be broken on Windows, the place
it's most useful, as `urinfo.exe` still attempts to load `ur_loader.dll`
when it should be looking for `ur_loaderd.dll`. Switching this over to
`OUTPUT_NAME ${name}d` fixes this.
Looks like combining `DEBUG_POSTFIX=d` and then setting `LIBRARY_OUTPUT_NAME`/`RUNTIME_OUTPUT_NAME` exposes a bug in CMake where the `DEBUG_POSTFIX` is ignored for the `ur_loader.dll`. Removing these redundant propert setters fixed the previous issue.
Using ExternalProject this commit adds a subbuild of UR in compiled in debug mode and with the `UR_USE_DEBUG_POSTFIX` option enabled. The resulting libraries are then copied to the `<build>/bin`/`<build>/lib` directories so they can be used in testing (not yet implemented). Additionally, they are also included in the `deploy-sycl-toolchain` install target alongside the normally named runtime libraries.
kbenzie
force-pushed
the
benie/ur-debug-lib-suffix
branch
from
5ecdb6b to
19f2d9c
Compare
KornevNikita
pushed a commit
that referenced
this pull request
May 27, 2025
1. Add install target for Windows debug libs called `install-unified-runtime-libraries` which installs only the runtime library subset of targets. This can be used to provide `ur_loaderd.dll` and `ur_adatper_<name>d.dll` which link against the multithreaded debug DLL C runtime by using the `DEBUG_POSTFIX` target property to append `d` to the library names. 2. Add `UR_USE_DEBUG_POSTFIX` option to enable adding the `d` suffix to library names. 3. Remove setting redundant `OUTPUT_NAME`s as combining `DEBUG_POSTFIX=d` and then setting `LIBRARY_OUTPUT_NAME`/`RUNTIME_OUTPUT_NAME` exposes a bug in CMake where the `DEBUG_POSTFIX` is ignored for the `ur_loader.dll`. Removing these redundant property setters fixed the previous issue. 4. Add debug UR subbuild on Windows `ExternalProject` compiled in debug mode and with the `UR_USE_DEBUG_POSTFIX` option enabled. * The resulting libraries are then copied to the `<build>/bin`/`<build>/lib` directories so they can be used in testing (not yet implemented). * Additionally, they are also included in the `deploy-sycl-toolchain` install target alongside the normally named runtime libraries. 5. Update `ur_proxy_loaderd.dll` to use Windows debug libs
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
install-unified-runtime-librarieswhich installs only the runtime library subset of targets. This can be used to provideur_loaderd.dllandur_adatper_<name>d.dllwhich link against the multithreaded debug DLL C runtime by using theDEBUG_POSTFIXtarget property to appenddto the library names.UR_USE_DEBUG_POSTFIXoption to enable adding thedsuffix to library names.OUTPUT_NAMEs as combiningDEBUG_POSTFIX=dand then settingLIBRARY_OUTPUT_NAME/RUNTIME_OUTPUT_NAMEexposes a bug in CMake where theDEBUG_POSTFIXis ignored for theur_loader.dll. Removing these redundant property setters fixed the previous issue.ExternalProjectcompiled in debug mode and with theUR_USE_DEBUG_POSTFIXoption enabled.<build>/bin/<build>/libdirectories so they can be used in testing (not yet implemented).deploy-sycl-toolchaininstall target alongside the normally named runtime libraries.ur_proxy_loaderd.dllto use Windows debug libs