Componentized builds for XRT #8706
Merged
Conversation
This file contains 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
Ensure that all install targets specify a CMake component.
XRT currently supports building four packages: base, npu, alveo, and
legacy xrt. The package built by XRT is controlled through CMake
variables that are either set by build scripts or inferred automatically:
- XRT_BASE: Builds the base package, which contains everything shared by
other packages.
- XRT_NPU: Builds the npu package with content specific to NPU.
- XRT_ALVEO: Builds the alveo package with content specific to Alveo.
- XRT_XRT: Builds the legacy XRT package (default when no other variables are set).
The packages are created by populating CMake components controlled
through following symbolic internal CMake variables, which are set to
either base, npu, alveo, or xrt depending on which package is built
- XRT_BASE_COMPONENT: Deployment component for XRT base content. The base component
has content that is required by npu, alveo, and xrt packages.
- XRT_BASE_DEV_COMPONENT: Development component for XRT base content.
- XRT_COMPONENT: Deployment component for XRT npu, alveo, or legacy xrt packages.
This component is dependent on the base component.
- XRT_DEV_COMPONENT: Development compoment for XRT npu, alveo, or legacy xrt packages.
This PR ensures that all install targets specify and CMake component
and it wires up the symbolic components based on what package is being
built.
For the time being, the npu, alveo, and legacy xrt packages all
include the base component. This will change when we are ready keep a
separate base package and support side-by-side installation of npu and
alveo.
This PR has been tested building all variants listed above ensuring
that the legacy xrt package (and npu package) have the same content as
in earlier (or current) XRT releases.
Signed-off-by: Soren Soe <[email protected]>
stsoe
requested review from
rozumx,
sonals,
chvamshi-xilinx,
xfreid,
jvillarre and
AShivangi
as code owners
stsoe
added a commit
to stsoe/XRT
that referenced
this pull request
Jan 21, 2025
Amend Xilinx#8706. Use dummy value or XRT_DEV_COMPONENT when building only base component. Tempoary fix for cpackLin conditionally adding dependencies for legacy XRT when XRT_DEV_COMPONENT equals "xrt". We don't want the dependencies in case of base package so use dummy value to by-pass. Also, ensure that pcie/linux shim is built only when XRT_BASE is active. Linux shim is shared between npu and alveo, hence should be in base component only. Signed-off-by: Soren Soe <[email protected]>
stsoe
added a commit
that referenced
this pull request
Jan 22, 2025
Amend #8706. Use dummy value or XRT_DEV_COMPONENT when building only base component. Tempoary fix for cpackLin conditionally adding dependencies for legacy XRT when XRT_DEV_COMPONENT equals "xrt". We don't want the dependencies in case of base package so use dummy value to by-pass. Also, ensure that pcie/linux shim is built only when XRT_BASE is active. Linux shim is shared between npu and alveo, hence should be in base component only. Signed-off-by: Soren Soe <[email protected]>
rchane
pushed a commit
to rchane/XRT
that referenced
this pull request
Jan 24, 2025
Amend Xilinx#8706. Use dummy value or XRT_DEV_COMPONENT when building only base component. Tempoary fix for cpackLin conditionally adding dependencies for legacy XRT when XRT_DEV_COMPONENT equals "xrt". We don't want the dependencies in case of base package so use dummy value to by-pass. Also, ensure that pcie/linux shim is built only when XRT_BASE is active. Linux shim is shared between npu and alveo, hence should be in base component only. Signed-off-by: Soren Soe <[email protected]>
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.
Problem solved by the commit
Ensure that all install targets specify a CMake component.
How problem was solved, alternative solutions (if any) and why they were rejected
XRT currently supports building four packages: base, npu, alveo, and legacy xrt. The package built by XRT is controlled through CMake variables that are either set by build scripts or inferred automatically:
The packages are created by populating CMake components controlled through following symbolic internal CMake variables, which are set to either base, npu, alveo, or xrt depending on which package is built
This PR ensures that all install targets specify and CMake component and it wires up the symbolic components based on what package is being built.
For the time being, the npu, alveo, and legacy xrt packages all include the base component. This will change when we are ready keep a separate base package and support side-by-side installation of npu and alveo. Also for the time being, all packages combine deployment and development.
Risks (if any) associated the changes in the commit
What has been tested and how, request additional testing if necessary
This PR has been tested building all variants listed above ensuring that the legacy xrt package (and npu package) have the same content as in earlier (or current) XRT releases.