Merge pull request #38654 from ROCmSoftwarePlatform:google_upstream_rocm_switch_to_rocm33
PiperOrigin-RevId: 308160300
Change-Id: Icd6e71c7bbfe22e0386ff7ebfdc926cf20b3b420
diff --git a/configure.py b/configure.py
index 4dd3469..ac9ed0c 100644
--- a/configure.py
+++ b/configure.py
@@ -1171,14 +1171,16 @@
test_only_filters = ['-oss_serial']
if is_windows():
test_and_build_filters.append('-no_windows')
- if environ_cp.get('TF_NEED_CUDA', None) == '1':
+ if ((environ_cp.get('TF_NEED_CUDA', None) == '1') or
+ (environ_cp.get('TF_NEED_ROCM', None) == '1')):
test_and_build_filters += ['-no_windows_gpu', '-no_gpu']
else:
test_and_build_filters.append('-gpu')
elif is_macos():
test_and_build_filters += ['-gpu', '-nomac', '-no_mac']
elif is_linux():
- if environ_cp.get('TF_NEED_CUDA', None) == '1':
+ if ((environ_cp.get('TF_NEED_CUDA', None) == '1') or
+ (environ_cp.get('TF_NEED_ROCM', None) == '1')):
test_and_build_filters.append('-no_gpu')
write_to_bazelrc('test --test_env=LD_LIBRARY_PATH')
else:
@@ -1416,6 +1418,10 @@
write_action_env_to_bazelrc('LD_LIBRARY_PATH',
environ_cp.get('LD_LIBRARY_PATH'))
+ if (environ_cp.get('TF_NEED_ROCM') == '1' and environ_cp.get('ROCM_PATH')):
+ write_action_env_to_bazelrc('ROCM_PATH', environ_cp.get('ROCM_PATH'))
+ write_action_env_to_bazelrc('ROCM_ROOT', environ_cp.get('ROCM_PATH'))
+
environ_cp['TF_NEED_CUDA'] = str(
int(get_var(environ_cp, 'TF_NEED_CUDA', 'CUDA', False)))
if (environ_cp.get('TF_NEED_CUDA') == '1' and