experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change references to libhip_hcc.so to refer to libamdhip64.so instead

Browse Source 
With the switch to the new hipclang-vdi runtime (in ROCm 3.5), the new name for the HIP runtime library is libamdhip64.so.

For backwards compatibility, ROCm 3.5 and ROCm 3.6 include a "libhip_hcc.so" softlink, which points to libamdhip64.so. That softlink will be going away starting with ROCm 3.7(?).

This commit updates references to libhip_hcc.so (in the TF build) to use libamdhip64.so instead.

See following JIRA tickets for further details:

* http://ontrack-internal.amd.com/browse/SWDEV-244762
* http://ontrack-internal.amd.com/browse/SWDEV-238533
This commit is contained in:
Deven Desai 2020-07-16 19:38:03 +00:00
parent e943a5373b
commit fcc2de09eb
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tensorflow/stream_executor/platform/default/dso_loader.cc
View File

@ -140,7 +140,7 @@ port::StatusOr<void*> GetHipsparseDsoHandle() {
return GetDsoHandle("hipsparse", ""); return GetDsoHandle("hipsparse", "");
} }
port::StatusOr<void*> GetHipDsoHandle() { return GetDsoHandle("hip_hcc", ""); } port::StatusOr<void*> GetHipDsoHandle() { return GetDsoHandle("amdhip64", ""); }
} // namespace DsoLoader } // namespace DsoLoader

7
third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_rocm.tpl vendored
View File

@ -34,8 +34,6 @@ HIPCC_ENV = '%{hipcc_env}'
HIPCC_IS_HIPCLANG = '%{hipcc_is_hipclang}'=="True" HIPCC_IS_HIPCLANG = '%{hipcc_is_hipclang}'=="True"
HIP_RUNTIME_PATH = '%{hip_runtime_path}' HIP_RUNTIME_PATH = '%{hip_runtime_path}'
HIP_RUNTIME_LIBRARY = '%{hip_runtime_library}' HIP_RUNTIME_LIBRARY = '%{hip_runtime_library}'
HCC_RUNTIME_PATH = '%{hcc_runtime_path}'
HCC_RUNTIME_LIBRARY = '%{hcc_runtime_library}'
ROCR_RUNTIME_PATH = '%{rocr_runtime_path}' ROCR_RUNTIME_PATH = '%{rocr_runtime_path}'
ROCR_RUNTIME_LIBRARY = '%{rocr_runtime_library}' ROCR_RUNTIME_LIBRARY = '%{rocr_runtime_library}'
VERBOSE = '%{crosstool_verbose}'=='1' VERBOSE = '%{crosstool_verbose}'=='1'
@ -267,11 +265,6 @@ def main():
gpu_linker_flags.append('-L' + ROCR_RUNTIME_PATH) gpu_linker_flags.append('-L' + ROCR_RUNTIME_PATH)
gpu_linker_flags.append('-Wl,-rpath=' + ROCR_RUNTIME_PATH) gpu_linker_flags.append('-Wl,-rpath=' + ROCR_RUNTIME_PATH)
gpu_linker_flags.append('-l' + ROCR_RUNTIME_LIBRARY) gpu_linker_flags.append('-l' + ROCR_RUNTIME_LIBRARY)
# do not link with HCC runtime library in case hip-clang toolchain is used
if not HIPCC_IS_HIPCLANG:
gpu_linker_flags.append('-L' + HCC_RUNTIME_PATH)
gpu_linker_flags.append('-Wl,-rpath=' + HCC_RUNTIME_PATH)
gpu_linker_flags.append('-l' + HCC_RUNTIME_LIBRARY)
gpu_linker_flags.append('-L' + HIP_RUNTIME_PATH) gpu_linker_flags.append('-L' + HIP_RUNTIME_PATH)
gpu_linker_flags.append('-Wl,-rpath=' + HIP_RUNTIME_PATH) gpu_linker_flags.append('-Wl,-rpath=' + HIP_RUNTIME_PATH)
gpu_linker_flags.append('-l' + HIP_RUNTIME_LIBRARY) gpu_linker_flags.append('-l' + HIP_RUNTIME_LIBRARY)

8
third_party/gpus/rocm_configure.bzl vendored
View File

@ -390,7 +390,7 @@ def _find_libs(repository_ctx, rocm_config, bash_bin):
libs_paths = [ libs_paths = [
(name, _rocm_lib_paths(repository_ctx, name, path)) (name, _rocm_lib_paths(repository_ctx, name, path))
for name, path in [ for name, path in [
("hip_hcc", rocm_config.rocm_toolkit_path + "/hip"), ("amdhip64", rocm_config.rocm_toolkit_path + "/hip"),
("rocblas", rocm_config.rocm_toolkit_path + "/rocblas"), ("rocblas", rocm_config.rocm_toolkit_path + "/rocblas"),
("rocfft", rocm_config.rocm_toolkit_path + "/rocfft"), ("rocfft", rocm_config.rocm_toolkit_path + "/rocfft"),
("hiprand", rocm_config.rocm_toolkit_path + "/hiprand"), ("hiprand", rocm_config.rocm_toolkit_path + "/hiprand"),
@ -646,7 +646,7 @@ def _create_local_rocm_repository(repository_ctx):
"rocm/BUILD", "rocm/BUILD",
tpl_paths["rocm:BUILD"], tpl_paths["rocm:BUILD"],
{ {
"%{hip_lib}": rocm_libs["hip_hcc"].file_name, "%{hip_lib}": rocm_libs["amdhip64"].file_name,
"%{rocblas_lib}": rocm_libs["rocblas"].file_name, "%{rocblas_lib}": rocm_libs["rocblas"].file_name,
"%{rocfft_lib}": rocm_libs["rocfft"].file_name, "%{rocfft_lib}": rocm_libs["rocfft"].file_name,
"%{hiprand_lib}": rocm_libs["hiprand"].file_name, "%{hiprand_lib}": rocm_libs["hiprand"].file_name,
@ -733,9 +733,7 @@ def _create_local_rocm_repository(repository_ctx):
"%{rocr_runtime_path}": rocm_config.rocm_toolkit_path + "/lib", "%{rocr_runtime_path}": rocm_config.rocm_toolkit_path + "/lib",
"%{rocr_runtime_library}": "hsa-runtime64", "%{rocr_runtime_library}": "hsa-runtime64",
"%{hip_runtime_path}": rocm_config.rocm_toolkit_path + "/hip/lib", "%{hip_runtime_path}": rocm_config.rocm_toolkit_path + "/hip/lib",
"%{hip_runtime_library}": "hip_hcc", "%{hip_runtime_library}": "amdhip64",
"%{hcc_runtime_path}": rocm_config.rocm_toolkit_path + "/hcc/lib",
"%{hcc_runtime_library}": "mcwamp",
"%{crosstool_verbose}": _crosstool_verbose(repository_ctx), "%{crosstool_verbose}": _crosstool_verbose(repository_ctx),
"%{gcc_host_compiler_path}": str(cc), "%{gcc_host_compiler_path}": str(cc),
}, },