Merge changes from github.
PiperOrigin-RevId: 186674197
diff --git a/configure.py b/configure.py
index 6b1fa7f..9744f6a 100644
--- a/configure.py
+++ b/configure.py
@@ -445,7 +445,7 @@
def check_bazel_version(min_version):
- """Check installed bezel version is at least min_version.
+ """Check installed bazel version is at least min_version.
Args:
min_version: string for minimum bazel version.
@@ -1078,12 +1078,22 @@
break
# Reset and Retry
- print('Invalid path to TensorRT. None of the following files can be found:')
- print(trt_install_path)
- print(os.path.join(trt_install_path, 'lib'))
- print(os.path.join(trt_install_path, 'lib64'))
- if search_result:
- print(libnvinfer_path_from_ldconfig)
+ if possible_files:
+ print('TensorRT libraries found in one the following directories',
+ 'are not compatible with selected cuda and cudnn installations')
+ print(trt_install_path)
+ print(os.path.join(trt_install_path, 'lib'))
+ print(os.path.join(trt_install_path, 'lib64'))
+ if search_result:
+ print(libnvinfer_path_from_ldconfig)
+ else:
+ print(
+ 'Invalid path to TensorRT. None of the following files can be found:')
+ print(trt_install_path)
+ print(os.path.join(trt_install_path, 'lib'))
+ print(os.path.join(trt_install_path, 'lib64'))
+ if search_result:
+ print(libnvinfer_path_from_ldconfig)
else:
raise UserInputError('Invalid TF_TENSORRT setting was provided %d '
@@ -1481,7 +1491,6 @@
'more details.')
config_info_line('mkl', 'Build with MKL support.')
config_info_line('monolithic', 'Config for mostly static monolithic build.')
- config_info_line('tensorrt', 'Build with TensorRT support.')
if __name__ == '__main__':
main()