Skip to content

Add both absolute and relative rocm paths to include clang headers #3195

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.

Sign up for GitHub

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

Open
hsharsha wants to merge 4 commits into
base: r2.18-rocm-enhanced
Choose a base branch
from
+10 −4
Open

Add both absolute and relative rocm paths to include clang headers #3195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
41581dd
Add both absolute and relative rocm paths to include clang headers
hsharsha Mar 12, 2026
395c6b3
Generate embedded device lib headers unconditonally
hsharsha Mar 13, 2026
734cc17
Fix bazelrc file in run_xla script
hsharsha Mar 13, 2026
1f13732
Add gcn_arch_name for device description string
hsharsha Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tensorflow/tools/ci_build/linux/rocm/run_xla.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ if [ ! -d /tf ];then
mkdir /tf
fi

bazel --bazelrc=tensorflow/tools/tf_sig_build_dockerfiles/devel.usertools/cpu.bazelrc test \
bazel --bazelrc=tensorflow/tools/tf_sig_build_dockerfiles/devel.usertools/rocm.bazelrc test \
--config=sigbuild_local_cache \
--config=rocm \
--config=xla_cpp_filters \
Expand Down
8 changes: 7 additions & 1 deletion third_party/gpus/rocm_configure.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,16 @@ def _rocm_include_path(repository_ctx, rocm_config, bash_bin):
if resource_dir_result.return_code:
auto_configure_fail("Failed to run hipcc -print-resource-dir: %s" % err_out(resource_dir_result))

resource_dir = resource_dir_result.stdout.strip()
resource_dir_abs = resource_dir_result.stdout.strip()

resource_dir_rel = relative_to(repository_ctx, str(rocm_path.realpath), resource_dir_abs, bash_bin)

resource_dir = str(rocm_path.get_child(resource_dir_rel))

inc_dirs.append(resource_dir + "/include")
inc_dirs.append(resource_dir + "/share")
inc_dirs.append(resource_dir_abs + "/include")
inc_dirs.append(resource_dir_abs + "/share")

return inc_dirs

Expand Down
2 changes: 1 addition & 1 deletion third_party/xla/xla/service/compiler.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ namespace xla {
Compiler::TargetConfig::TargetConfig(se::StreamExecutor* s)
: device_description(s->GetDeviceDescription()),
platform_name(s->GetPlatform()->Name()),
device_description_str(s->GetDeviceDescription().name()) {
device_description_str(s->GetDeviceDescription().rocm_compute_capability().gcn_arch_name()) {
se::dnn::DnnSupport* dnn = s->AsDnn();
if (dnn != nullptr) {
absl::StatusOr<se::dnn::VersionInfo> dnn_version = dnn->GetVersion();
Expand Down
2 changes: 1 addition & 1 deletion third_party/xla/xla/service/gpu/llvm_gpu_backend/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ cc_library(
"GOOGLE_CUDA=1",
]) + if_rocm_is_configured(["TENSORFLOW_USE_ROCM=1"]),
deps = [
":amdgpu_device_lib_data",
"//xla:status_macros",
"//xla:types",
"//xla:util",
Expand Down Expand Up @@ -119,7 +120,6 @@ cc_library(
"@local_config_rocm//rocm:rocm_headers",
"@llvm-project//llvm:AMDGPUCodeGen",
"@llvm-project//llvm:AMDGPUAsmParser",
":amdgpu_device_lib_data",
]) + if_sycl_is_configured([
"@spirv_llvm_translator//:spirv_llvm_translator",
]),
Expand Down