[SYCL][UR] Update CMake to enable easier local dev #11492
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
Oct 10, 2023
kbenzie
commented
Oct 10, 2023
|
Changes look good 👍 Could you document the CMake variables somewhere as well? Maybe in the get started guide: |
For sure. |
kbenzie
force-pushed
the
benie/ur-support-local-dev
branch
from
5f77789 to
f504e6d
Compare
ldrumm
requested changes
Oct 12, 2023
kbenzie
force-pushed
the
benie/ur-support-local-dev
branch
from
f504e6d to
f113d65
Compare
kbenzie
force-pushed
the
benie/ur-support-local-dev
branch
from
f113d65 to
405ad7d
Compare
ldrumm
approved these changes
Oct 12, 2023
kbenzie
had a problem deploying
to
WindowsCILock
GitHub Actions
Failure
kbenzie
force-pushed
the
benie/ur-support-local-dev
branch
from
405ad7d to
5e3d639
Compare
npmiller
approved these changes
Oct 12, 2023
|
@intel/dpcpp-l0-pi-reviewers @intel/dpcpp-doc-reviewers @intel/llvm-reviewers-runtime this PR significantly improves the development workflow with the adapters in the UR repo, it would be highly appreciated if we can prioritize it and get it through quickly, Thanks! |
kbenzie
force-pushed
the
benie/ur-support-local-dev
branch
from
5e3d639 to
af0894e
Compare
againull
reviewed
Oct 17, 2023
This patch introduces new ways to include the Unified Runtime source
code in the CMake build, the default behaviour is unchanged. It
introduces three new CMake variables:
* `SYCL_PI_UR_OVERRIDE_FETCH_CONTENT_REPO` is a variable which can be used to
override the `UNIFIED_RUNTIME_REPO` variable used by `FetchContent` to attain
the Unified Runtime source code.
* `SYCL_PI_UR_OVERRIDE_FETCH_CONTENT_TAG` is a variable which can be used to
override the `UNIFIED_RUNTIME_TAG` variable used by `FetchContent` to attain
the Unified Runtime source code.
* `SYCL_PI_UR_USE_FETCH_CONTENT` is an option to control if CMake should use
`FetchContent` to pull in the Unified Runtime repository, it defaults to `ON`.
When set to `OFF`, `FetchContent` will not be used, instead:
* The path specified by variable `SYCL_PI_UR_SOURCE_DIR` will be used with
`add_directory()`. This can be used to point at an adjacent directory
containing a clone of the Unified Runtime repository.
* The path `sycl/plugins/unified_runtime/unified-runtime` will be used, if it
exists. This can be used as-if an in-tree build.
* `SYCL_PI_UR_SOURCE_DIR` is a variable used to specify the path to the Unified
Runtime repository when `SYCL_PI_UR_USE_FETCH_CONTENT` is set of `OFF`.
Additionally:
* The logic using `UNIFIED_RUNTIME_LIBRARY` and
`UNIFIED_RUNTIME_INCLUDE_DIR` was remove because
`UNIFIED_RUNTIME_LIBRARY` has no other uses and the `if` statement
would always be true.
* The `unified_runtime` PI plugin is now always included in the CMake
build.
kbenzie
force-pushed
the
benie/ur-support-local-dev
branch
from
af0894e to
4ff80f1
Compare
sergey-semenov
approved these changes
Oct 18, 2023
|
@intel/llvm-gatekeepers this is ready to merge |
|
Failed Tests (1): |
|
Missing approval from @intel/dpcpp-l0-pi-reviewers |
Apologies, I missed that. |
againull
approved these changes
Oct 18, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This patch introduces new ways to include the Unified Runtime source code in the CMake build, the default behaviour is unchanged. It introduces three new CMake variables:
SYCL_PI_UR_OVERRIDE_FETCH_CONTENT_REPOis a variable which can be used to override theUNIFIED_RUNTIME_REPOvariable used byFetchContentto attain the Unified Runtime source code.SYCL_PI_UR_OVERRIDE_FETCH_CONTENT_TAGis a variable which can be used to override theUNIFIED_RUNTIME_TAGvariable used byFetchContentto attain the Unified Runtime source code.SYCL_PI_UR_USE_FETCH_CONTENTis an option to control if CMake should useFetchContentto pull in the Unified Runtime repository, it defaults toON. When set toOFF,FetchContentwill not be used, instead:SYCL_PI_UR_SOURCE_DIRwill be used withadd_directory(). This can be used to point at an adjacent directory containing a clone of the Unified Runtime repository.sycl/plugins/unified_runtime/unified-runtimewill be used, if it exists. This can be used as-if an in-tree build.SYCL_PI_UR_SOURCE_DIRis a variable used to specify the path to the Unified Runtime repository whenSYCL_PI_UR_USE_FETCH_CONTENTis set ofOFF.Additionally:
UNIFIED_RUNTIME_LIBRARYandUNIFIED_RUNTIME_INCLUDE_DIRwas removed becauseUNIFIED_RUNTIME_LIBRARYhas no other uses and theifstatement would always be true.unified_runtimePI plugin is now always included in the CMake build.