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

Ci add rocm6.1 deps for ubuntu 20.04 #21901

Closed

Conversation

alekstheod
Copy link
Contributor

Add rocm 6.1.0 dependency for ubuntu 20.04

Comment on lines +59 to +65
cc_library(
name = "rocm_headers_includes",
hdrs = glob([
"%{rocm_root}/include/**",
]),
strip_include_prefix = "%{rocm_root}/include",
)
Copy link
Member

Choose a reason for hiding this comment

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

Why this new target? Looks like you could just change rocm_headers, couldn't you?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You can't we actually need both, both include paths are used:
#include "include/{whateverlib}/whatever.h"
#include "whateverlib/whatever.h"
So hence a new target which will provided as a virtual include.
I think a clean solution would be to modify the include directives everywhere so they use "whateverlib/whatever.h" and strip out the include prefix.

Copy link
Member

Choose a reason for hiding this comment

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

Is it because ROCm 6.1.0 uses the new include paths?

because if both patterns are used in XLA then we should just fix it in XLA.

Otherwise it's probably fine as a temporary measure.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This seems to be a right approach to add additional include dirs. If we are adding them via includes we get bazel complaint that include file is not registered in the deps. So that way we always use virtual includes and everything is done through the deps declaration.

@alekstheod alekstheod force-pushed the ci_add_rocm6.1_deps_for_ubuntu_20.04 branch from da37964 to bbc048b Compare January 28, 2025 12:57
@beckerhe beckerhe added the kokoro:run Runs CI if PR is new label Jan 28, 2025
@kokoro-team kokoro-team removed the kokoro:run Runs CI if PR is new label Jan 28, 2025
@beckerhe beckerhe added the kokoro:run Runs CI if PR is new label Jan 28, 2025
@kokoro-team kokoro-team removed the kokoro:run Runs CI if PR is new label Jan 28, 2025
@beckerhe beckerhe added the kokoro:run Runs CI if PR is new label Jan 29, 2025
@kokoro-team kokoro-team removed the kokoro:run Runs CI if PR is new label Jan 29, 2025
@beckerhe beckerhe added the kokoro:run Runs CI if PR is new label Jan 29, 2025
@kokoro-team kokoro-team removed the kokoro:run Runs CI if PR is new label Jan 29, 2025
copybara-service bot pushed a commit to google/tsl that referenced this pull request Jan 29, 2025
Imported from GitHub PR openxla/xla#21901

Add rocm 6.1.0 dependency for ubuntu 20.04
Copybara import of the project:

--
0acf028eeca5923c7f2aa5762297686836eda310 by Alexandros Theodoridis <[email protected]>:

Add rocm6.1 deps for ubuntu 20.04

--
fc88c83061d6efff2482599489d622ab3114b9a7 by Alexandros Theodoridis <[email protected]>:

Fix hermetic build for 6.0

--
73ace5591f4731e1b95b6d3e6a349b528977c580 by Alexandros Theodoridis <[email protected]>:

Add ci config for hermetic build

--
bbc048bcffd9d35bfad76ff816ed22f3e3f761f8 by Alexandros Theodoridis <[email protected]>:

Introduce rocm 6.1.0 dependency for 22.04

--
9776f398c2711ba37333d29b934d6ba67c55dbef by Alexandros Theodoridis <[email protected]>:

Add missing 24.04 redist

--
acf275d57cc185b9c2122d5930d8cf54e473ad95 by Alexandros Theodoridis <[email protected]>:

Fix test

--
3e49285b0f55597ab5f44c1d0a422bf931d72cda by Alexandros Theodoridis <[email protected]>:

Add comment explaining the reason for a new target

--
35838bf8d6e678717e9b1c551f840918b00a91f8 by Alexandros Theodoridis <[email protected]>:

Rever force verbose in the compiler wrapper

--
2952e115b044e1a8ac8aadc7eac7802e8d79cf91 by Alexandros Theodoridis <[email protected]>:

Add explanation comment for the new target

Merging this change closes #21901

FUTURE_COPYBARA_INTEGRATE_REVIEW=openxla/xla#21901 from ROCm:ci_add_rocm6.1_deps_for_ubuntu_20.04 2952e115b044e1a8ac8aadc7eac7802e8d79cf91
PiperOrigin-RevId: 720984678
copybara-service bot pushed a commit that referenced this pull request Jan 29, 2025
Imported from GitHub PR #21901

Add rocm 6.1.0 dependency for ubuntu 20.04
Copybara import of the project:

--
0acf028 by Alexandros Theodoridis <[email protected]>:

Add rocm6.1 deps for ubuntu 20.04

--
fc88c83 by Alexandros Theodoridis <[email protected]>:

Fix hermetic build for 6.0

--
73ace55 by Alexandros Theodoridis <[email protected]>:

Add ci config for hermetic build

--
bbc048b by Alexandros Theodoridis <[email protected]>:

Introduce rocm 6.1.0 dependency for 22.04

--
9776f39 by Alexandros Theodoridis <[email protected]>:

Add missing 24.04 redist

--
acf275d by Alexandros Theodoridis <[email protected]>:

Fix test

--
3e49285 by Alexandros Theodoridis <[email protected]>:

Add comment explaining the reason for a new target

--
35838bf by Alexandros Theodoridis <[email protected]>:

Rever force verbose in the compiler wrapper

--
2952e11 by Alexandros Theodoridis <[email protected]>:

Add explanation comment for the new target

Merging this change closes #21901

FUTURE_COPYBARA_INTEGRATE_REVIEW=#21901 from ROCm:ci_add_rocm6.1_deps_for_ubuntu_20.04 2952e11
PiperOrigin-RevId: 720984678
copybara-service bot pushed a commit to tensorflow/tensorflow that referenced this pull request Jan 29, 2025
Imported from GitHub PR openxla/xla#21901

Add rocm 6.1.0 dependency for ubuntu 20.04
Copybara import of the project:

--
0acf028eeca5923c7f2aa5762297686836eda310 by Alexandros Theodoridis <[email protected]>:

Add rocm6.1 deps for ubuntu 20.04

--
fc88c83061d6efff2482599489d622ab3114b9a7 by Alexandros Theodoridis <[email protected]>:

Fix hermetic build for 6.0

--
73ace5591f4731e1b95b6d3e6a349b528977c580 by Alexandros Theodoridis <[email protected]>:

Add ci config for hermetic build

--
bbc048bcffd9d35bfad76ff816ed22f3e3f761f8 by Alexandros Theodoridis <[email protected]>:

Introduce rocm 6.1.0 dependency for 22.04

--
9776f398c2711ba37333d29b934d6ba67c55dbef by Alexandros Theodoridis <[email protected]>:

Add missing 24.04 redist

--
acf275d57cc185b9c2122d5930d8cf54e473ad95 by Alexandros Theodoridis <[email protected]>:

Fix test

--
3e49285b0f55597ab5f44c1d0a422bf931d72cda by Alexandros Theodoridis <[email protected]>:

Add comment explaining the reason for a new target

--
35838bf8d6e678717e9b1c551f840918b00a91f8 by Alexandros Theodoridis <[email protected]>:

Rever force verbose in the compiler wrapper

--
2952e115b044e1a8ac8aadc7eac7802e8d79cf91 by Alexandros Theodoridis <[email protected]>:

Add explanation comment for the new target

Merging this change closes #21901

FUTURE_COPYBARA_INTEGRATE_REVIEW=openxla/xla#21901 from ROCm:ci_add_rocm6.1_deps_for_ubuntu_20.04 2952e115b044e1a8ac8aadc7eac7802e8d79cf91
PiperOrigin-RevId: 720984678
copybara-service bot pushed a commit that referenced this pull request Jan 29, 2025
Imported from GitHub PR #21901

Add rocm 6.1.0 dependency for ubuntu 20.04
Copybara import of the project:

--
0acf028 by Alexandros Theodoridis <[email protected]>:

Add rocm6.1 deps for ubuntu 20.04

--
fc88c83 by Alexandros Theodoridis <[email protected]>:

Fix hermetic build for 6.0

--
73ace55 by Alexandros Theodoridis <[email protected]>:

Add ci config for hermetic build

--
bbc048b by Alexandros Theodoridis <[email protected]>:

Introduce rocm 6.1.0 dependency for 22.04

--
9776f39 by Alexandros Theodoridis <[email protected]>:

Add missing 24.04 redist

--
acf275d by Alexandros Theodoridis <[email protected]>:

Fix test

--
3e49285 by Alexandros Theodoridis <[email protected]>:

Add comment explaining the reason for a new target

--
35838bf by Alexandros Theodoridis <[email protected]>:

Rever force verbose in the compiler wrapper

--
2952e11 by Alexandros Theodoridis <[email protected]>:

Add explanation comment for the new target

Merging this change closes #21901

FUTURE_COPYBARA_INTEGRATE_REVIEW=#21901 from ROCm:ci_add_rocm6.1_deps_for_ubuntu_20.04 2952e11
PiperOrigin-RevId: 720984678
copybara-service bot pushed a commit to tensorflow/tensorflow that referenced this pull request Jan 29, 2025
Imported from GitHub PR openxla/xla#21901

Add rocm 6.1.0 dependency for ubuntu 20.04
Copybara import of the project:

--
0acf028eeca5923c7f2aa5762297686836eda310 by Alexandros Theodoridis <[email protected]>:

Add rocm6.1 deps for ubuntu 20.04

--
fc88c83061d6efff2482599489d622ab3114b9a7 by Alexandros Theodoridis <[email protected]>:

Fix hermetic build for 6.0

--
73ace5591f4731e1b95b6d3e6a349b528977c580 by Alexandros Theodoridis <[email protected]>:

Add ci config for hermetic build

--
bbc048bcffd9d35bfad76ff816ed22f3e3f761f8 by Alexandros Theodoridis <[email protected]>:

Introduce rocm 6.1.0 dependency for 22.04

--
9776f398c2711ba37333d29b934d6ba67c55dbef by Alexandros Theodoridis <[email protected]>:

Add missing 24.04 redist

--
acf275d57cc185b9c2122d5930d8cf54e473ad95 by Alexandros Theodoridis <[email protected]>:

Fix test

--
3e49285b0f55597ab5f44c1d0a422bf931d72cda by Alexandros Theodoridis <[email protected]>:

Add comment explaining the reason for a new target

--
35838bf8d6e678717e9b1c551f840918b00a91f8 by Alexandros Theodoridis <[email protected]>:

Rever force verbose in the compiler wrapper

--
2952e115b044e1a8ac8aadc7eac7802e8d79cf91 by Alexandros Theodoridis <[email protected]>:

Add explanation comment for the new target

Merging this change closes #21901

FUTURE_COPYBARA_INTEGRATE_REVIEW=openxla/xla#21901 from ROCm:ci_add_rocm6.1_deps_for_ubuntu_20.04 2952e115b044e1a8ac8aadc7eac7802e8d79cf91
PiperOrigin-RevId: 720984678
copybara-service bot pushed a commit that referenced this pull request Jan 29, 2025
Imported from GitHub PR #21901

Add rocm 6.1.0 dependency for ubuntu 20.04
Copybara import of the project:

--
0acf028 by Alexandros Theodoridis <[email protected]>:

Add rocm6.1 deps for ubuntu 20.04

--
fc88c83 by Alexandros Theodoridis <[email protected]>:

Fix hermetic build for 6.0

--
73ace55 by Alexandros Theodoridis <[email protected]>:

Add ci config for hermetic build

--
bbc048b by Alexandros Theodoridis <[email protected]>:

Introduce rocm 6.1.0 dependency for 22.04

--
9776f39 by Alexandros Theodoridis <[email protected]>:

Add missing 24.04 redist

--
acf275d by Alexandros Theodoridis <[email protected]>:

Fix test

--
3e49285 by Alexandros Theodoridis <[email protected]>:

Add comment explaining the reason for a new target

--
35838bf by Alexandros Theodoridis <[email protected]>:

Rever force verbose in the compiler wrapper

--
2952e11 by Alexandros Theodoridis <[email protected]>:

Add explanation comment for the new target

Merging this change closes #21901

FUTURE_COPYBARA_INTEGRATE_REVIEW=#21901 from ROCm:ci_add_rocm6.1_deps_for_ubuntu_20.04 2952e11
PiperOrigin-RevId: 720984678
copybara-service bot pushed a commit to tensorflow/tensorflow that referenced this pull request Jan 29, 2025
Imported from GitHub PR openxla/xla#21901

Add rocm 6.1.0 dependency for ubuntu 20.04
Copybara import of the project:

--
0acf028eeca5923c7f2aa5762297686836eda310 by Alexandros Theodoridis <[email protected]>:

Add rocm6.1 deps for ubuntu 20.04

--
fc88c83061d6efff2482599489d622ab3114b9a7 by Alexandros Theodoridis <[email protected]>:

Fix hermetic build for 6.0

--
73ace5591f4731e1b95b6d3e6a349b528977c580 by Alexandros Theodoridis <[email protected]>:

Add ci config for hermetic build

--
bbc048bcffd9d35bfad76ff816ed22f3e3f761f8 by Alexandros Theodoridis <[email protected]>:

Introduce rocm 6.1.0 dependency for 22.04

--
9776f398c2711ba37333d29b934d6ba67c55dbef by Alexandros Theodoridis <[email protected]>:

Add missing 24.04 redist

--
acf275d57cc185b9c2122d5930d8cf54e473ad95 by Alexandros Theodoridis <[email protected]>:

Fix test

--
3e49285b0f55597ab5f44c1d0a422bf931d72cda by Alexandros Theodoridis <[email protected]>:

Add comment explaining the reason for a new target

--
35838bf8d6e678717e9b1c551f840918b00a91f8 by Alexandros Theodoridis <[email protected]>:

Rever force verbose in the compiler wrapper

--
2952e115b044e1a8ac8aadc7eac7802e8d79cf91 by Alexandros Theodoridis <[email protected]>:

Add explanation comment for the new target

Merging this change closes #21901

FUTURE_COPYBARA_INTEGRATE_REVIEW=openxla/xla#21901 from ROCm:ci_add_rocm6.1_deps_for_ubuntu_20.04 2952e115b044e1a8ac8aadc7eac7802e8d79cf91
PiperOrigin-RevId: 720984678
copybara-service bot pushed a commit to google/tsl that referenced this pull request Jan 29, 2025
Imported from GitHub PR openxla/xla#21901

Add rocm 6.1.0 dependency for ubuntu 20.04
Copybara import of the project:

--
0acf028eeca5923c7f2aa5762297686836eda310 by Alexandros Theodoridis <[email protected]>:

Add rocm6.1 deps for ubuntu 20.04

--
fc88c83061d6efff2482599489d622ab3114b9a7 by Alexandros Theodoridis <[email protected]>:

Fix hermetic build for 6.0

--
73ace5591f4731e1b95b6d3e6a349b528977c580 by Alexandros Theodoridis <[email protected]>:

Add ci config for hermetic build

--
bbc048bcffd9d35bfad76ff816ed22f3e3f761f8 by Alexandros Theodoridis <[email protected]>:

Introduce rocm 6.1.0 dependency for 22.04

--
9776f398c2711ba37333d29b934d6ba67c55dbef by Alexandros Theodoridis <[email protected]>:

Add missing 24.04 redist

--
acf275d57cc185b9c2122d5930d8cf54e473ad95 by Alexandros Theodoridis <[email protected]>:

Fix test

--
3e49285b0f55597ab5f44c1d0a422bf931d72cda by Alexandros Theodoridis <[email protected]>:

Add comment explaining the reason for a new target

--
35838bf8d6e678717e9b1c551f840918b00a91f8 by Alexandros Theodoridis <[email protected]>:

Rever force verbose in the compiler wrapper

--
2952e115b044e1a8ac8aadc7eac7802e8d79cf91 by Alexandros Theodoridis <[email protected]>:

Add explanation comment for the new target

Merging this change closes #21901

PiperOrigin-RevId: 721043735
copybara-service bot pushed a commit to tensorflow/tensorflow that referenced this pull request Jan 29, 2025
Imported from GitHub PR openxla/xla#21901

Add rocm 6.1.0 dependency for ubuntu 20.04
Copybara import of the project:

--
0acf028eeca5923c7f2aa5762297686836eda310 by Alexandros Theodoridis <[email protected]>:

Add rocm6.1 deps for ubuntu 20.04

--
fc88c83061d6efff2482599489d622ab3114b9a7 by Alexandros Theodoridis <[email protected]>:

Fix hermetic build for 6.0

--
73ace5591f4731e1b95b6d3e6a349b528977c580 by Alexandros Theodoridis <[email protected]>:

Add ci config for hermetic build

--
bbc048bcffd9d35bfad76ff816ed22f3e3f761f8 by Alexandros Theodoridis <[email protected]>:

Introduce rocm 6.1.0 dependency for 22.04

--
9776f398c2711ba37333d29b934d6ba67c55dbef by Alexandros Theodoridis <[email protected]>:

Add missing 24.04 redist

--
acf275d57cc185b9c2122d5930d8cf54e473ad95 by Alexandros Theodoridis <[email protected]>:

Fix test

--
3e49285b0f55597ab5f44c1d0a422bf931d72cda by Alexandros Theodoridis <[email protected]>:

Add comment explaining the reason for a new target

--
35838bf8d6e678717e9b1c551f840918b00a91f8 by Alexandros Theodoridis <[email protected]>:

Rever force verbose in the compiler wrapper

--
2952e115b044e1a8ac8aadc7eac7802e8d79cf91 by Alexandros Theodoridis <[email protected]>:

Add explanation comment for the new target

Merging this change closes #21901

PiperOrigin-RevId: 721043735
@alekstheod alekstheod deleted the ci_add_rocm6.1_deps_for_ubuntu_20.04 branch January 30, 2025 09:18
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.

3 participants