From 466d1ad25a2bda174afc462137b521705002a55f Mon Sep 17 00:00:00 2001 From: Alexandros Theodoridis Date: Wed, 13 Nov 2024 09:35:06 +0000 Subject: [PATCH] Cleanup --- .../tsl/third_party/gpus/rocm/rocm_redist_ubuntu_20_04.bzl | 2 +- .../tsl/third_party/gpus/rocm/rocm_redist_ubuntu_24_04.bzl | 2 +- third_party/tsl/third_party/gpus/rocm_configure.bzl | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/third_party/tsl/third_party/gpus/rocm/rocm_redist_ubuntu_20_04.bzl b/third_party/tsl/third_party/gpus/rocm/rocm_redist_ubuntu_20_04.bzl index 5aa33e7495a745..f3407c968f9cd5 100644 --- a/third_party/tsl/third_party/gpus/rocm/rocm_redist_ubuntu_20_04.bzl +++ b/third_party/tsl/third_party/gpus/rocm/rocm_redist_ubuntu_20_04.bzl @@ -182,6 +182,6 @@ rocm_redist_ubuntu_20_04 = { sha256 = "5c155c58935870bf3b4bfe769116841c0d286a74f59eccfd5645693ac23f06b1", ), ], - "install_path": "opt/rocm-6.2.0", + "rocm_root": "opt/rocm-6.2.0", }, } diff --git a/third_party/tsl/third_party/gpus/rocm/rocm_redist_ubuntu_24_04.bzl b/third_party/tsl/third_party/gpus/rocm/rocm_redist_ubuntu_24_04.bzl index e773149e944dd2..f28e3cd7dbbb49 100644 --- a/third_party/tsl/third_party/gpus/rocm/rocm_redist_ubuntu_24_04.bzl +++ b/third_party/tsl/third_party/gpus/rocm/rocm_redist_ubuntu_24_04.bzl @@ -162,6 +162,6 @@ rocm_redist_ubuntu_24_04 = { sha256 = "5bb6ae92a25f33488f2ee5f123ac4f67ad130e18e4949161715451509be3b89d", ), ], - "install_path": "opt/rocm-6.2.0", + "rocm_root": "opt/rocm-6.2.0", }, } diff --git a/third_party/tsl/third_party/gpus/rocm_configure.bzl b/third_party/tsl/third_party/gpus/rocm_configure.bzl index d9e3ddd3adb177..d4203778286ddc 100644 --- a/third_party/tsl/third_party/gpus/rocm_configure.bzl +++ b/third_party/tsl/third_party/gpus/rocm_configure.bzl @@ -561,6 +561,7 @@ def _remove_root_dir(path, root_dir): return path def _setup_rocm_distro_dir(repository_ctx): + """Sets up the rocm hermetic installation directory to be used in hermetic build""" bash_bin = get_bash_bin(repository_ctx) os = repository_ctx.os.environ.get(_OS) rocm_version = repository_ctx.os.environ.get(_ROCM_VERSION) @@ -569,7 +570,7 @@ def _setup_rocm_distro_dir(repository_ctx): repository_ctx.file("rocm/.index") for archive in redist["archives"]: _download_package(repository_ctx, archive) - return _get_rocm_config(repository_ctx, bash_bin, _DISTRIBUTION_PATH + "/" + redist["install_path"]) + return _get_rocm_config(repository_ctx, bash_bin, _DISTRIBUTION_PATH + "/" + redist["rocm_root"]) else: rocm_path = repository_ctx.os.environ.get(_ROCM_TOOLKIT_PATH, _DEFAULT_ROCM_TOOLKIT_PATH) repository_ctx.symlink(rocm_path, _DISTRIBUTION_PATH)