Fix compilation, there are still linking issues which will be fixed in a followup commit.
diff --git a/configure.py b/configure.py
index b621b1b..1567ed6 100644
--- a/configure.py
+++ b/configure.py
@@ -37,7 +37,6 @@
_TF_WORKSPACE = os.path.join(os.path.dirname(os.path.abspath(__file__)),
'WORKSPACE')
_DEFAULT_CUDA_VERSION = '9.0'
-_DEFAULT_TENSORRT_VERSION = '4'
_DEFAULT_CUDNN_VERSION = '7'
_DEFAULT_CUDA_COMPUTE_CAPABILITIES = '3.5,5.2'
_DEFAULT_CUDA_PATH = '/usr/local/cuda'
@@ -384,12 +383,13 @@
var = str(int(get_var(environ_cp, var_name, query_item, enabled_by_default)))
environ_cp[var_name] = var
- # TODO(mikecase): Migrate all users of configure.py to use --config Bazel
- # options and not to set build configs through environment variables.
- if var=='1':
- setting='true'
- confname=":%s"%(bazel_config_name) if bazel_config_name is not None else ""
- write_to_bazelrc('build%s --define %s=%s' % (confname,option_name,setting))
+ if var == '1':
+ write_to_bazelrc('build --define %s=true' % option_name)
+ elif bazel_config_name is not None:
+ # TODO(mikecase): Migrate all users of configure.py to use --config Bazel
+ # options and not to set build configs through environment variables.
+ write_to_bazelrc('build:%s --define %s=true'
+ % (bazel_config_name, option_name))
def set_action_env_var(environ_cp,
@@ -439,6 +439,7 @@
for seg in version_segments:
if not seg.isdigit():
return None
+
version_str = ''.join(['%03d' % int(seg) for seg in version_segments])
return int(version_str)
@@ -1169,108 +1170,6 @@
write_to_bazelrc('test --config=cuda')
-def set_tf_trt_version(environ_cp):
- """Set TENSORRT_INSTALL_PATH and TF_TENSORRT_VERSION."""
- ask_trt_version = (
- 'Please specify the TensorRT (libnvinfer) version you want to use. '
- '[Leave empty to default to libnvinfer %s]: ') % _DEFAULT_TENSORRT_VERSION
-
- while True:
- tf_trt_version = get_from_env_or_user_or_default(
- environ_cp, 'TF_TENSORRT_VERSION', ask_trt_version,
- _DEFAULT_TENSORRT_VERSION)
- # if library version is passed and known
- default_trt_path = environ_cp.get('TENSORRT_INSTALL_PATH',_DEFAULT_TENSORRT_PATH_LINUX)
- ask_trt_path = (r'Please specify the location where libnvinfer %s library is '
- 'installed. Refer to README.md for more details. [Default'
- ' is %s]:') % (tf_trt_version, default_trt_path)
- trt_install_path = get_from_env_or_user_or_default(
- environ_cp, 'TENSORRT_INSTALL_PATH', ask_trt_path, default_trt_path)
-
- # Result returned from "read" will be used unexpanded. That make "~"
- # unusable. Going through one more level of expansion to handle that.
- trt_install_path = os.path.realpath(
- os.path.expanduser(trt_install_path))
- # Simple function to search for libnvinfer in install path
- # it will find all libnvinfer.so* in user defined install path
- # and lib64 subdirectory and return absolute paths
- def find_libs(search_path):
- fl=set()
- if os.path.exists(search_path) and os.path.isdir(search_path):
- fl.update([os.path.realpath(os.path.join(search_path,x)) \
- for x in os.listdir(search_path) if 'libnvinfer.so' in x])
- return fl
- possible_files=find_libs(trt_install_path)
- possible_files.update(find_libs(os.path.join(trt_install_path,'lib64')))
- if is_linux():
- cudnnpatt=re.compile(".*libcudnn.so\.?(.*) =>.*$")
- cudapatt =re.compile(".*libcudart.so\.?(.*) =>.*$")
- def is_compatible(lib,cudaver,cudnnver):
- ldd_bin=which('ldd') or '/usr/bin/ldd'
- ldd_out=run_shell([ldd_bin,lib]).split(os.linesep)
- for l in ldd_out:
- if 'libcudnn.so' in l:
- cudnn=cudnnpatt.search(l)
- elif 'libcudart.so' in l:
- cudart=cudapatt.search(l)
- if cudnn:
- cudnn=convert_version_to_int(cudnn.group(1)) if len(cudnn.group(1)) else 0
- if cudart:
- cudart=convert_version_to_int(cudart.group(1)) if len(cudart.group(1)) else 0
- return (cudnn==cudnnver) and (cudart==cudaver)
- cudaver=convert_version_to_int(environ_cp['TF_CUDA_VERSION'])
- cudnnver=convert_version_to_int(environ_cp['TF_CUDNN_VERSION'])
- valid_libs=[]
- vfinder=re.compile('.*libnvinfer.so.?(.*)$')
- highest_ver=[0,None,None]
-
- for l in possible_files:
- if is_compatible(l,cudaver,cudnnver):
- valid_libs.append(l)
- vstr=vfinder.search(l).group(1)
- currver=convert_version_to_int(vstr) if len(vstr) else 0
- if currver > highest_ver[0]:
- highest_ver= [currver,vstr,l]
- if highest_ver[1] is not None:
- trt_install_path=os.path.dirname(highest_ver[2])
- tf_trt_version=highest_ver[1]
- break
- ldconfig_bin = which('ldconfig') or '/sbin/ldconfig'
- libnvinfer_path_from_ldconfig = run_shell([ldconfig_bin, '-p'])
- libnvinfer_path_from_ldconfig = re.search('.*libnvinfer.so.* => (.*)',
- libnvinfer_path_from_ldconfig)
- if libnvinfer_path_from_ldconfig:
- libnvinfer_path_from_ldconfig = libnvinfer_path_from_ldconfig.group(1)
- if os.path.exists('%s.%s' % (libnvinfer_path_from_ldconfig,
- tf_trt_version)):
- trt_install_path = os.path.dirname(libnvinfer_path_from_ldconfig)
- break
-
- # Reset and Retry
- if len(possible_files):
- print(
- 'Invalid path to TensorRT %s. libnvinfer.so* files found are for incompatible cuda versions '
- % tf_trt_version)
- print(trt_install_path)
- print(os.path.join(trt_install_path,'lib64'))
- else:
- print(
- 'Invalid path to TensorRT %s. No libnvinfer.so* files found in '
- 'found:' % tf_trt_version)
- print(trt_install_path)
- print(os.path.join(trt_install_path,'lib64'))
- if is_linux():
- print('%s.%s' % (libnvinfer_path_from_ldconfig, tf_trt_version))
-
- environ_cp['TF_TENSORRT_VERSION'] = ''
-
- # Set TENSORRT_INSTALL_PATH and TENSORRT_CUDNN_VERSION
- environ_cp['TENSORRT_INSTALL_PATH'] = trt_install_path
- write_action_env_to_bazelrc('TENSORRT_INSTALL_PATH', trt_install_path)
- environ_cp['TF_TENSORRT_VERSION'] = tf_trt_version
- write_action_env_to_bazelrc('TF_TENSORRT_VERSION', tf_trt_version)
- write_to_bazelrc('build:tensorrt --define using_tensorrt=true')
-
def set_host_cxx_compiler(environ_cp):
"""Set HOST_CXX_COMPILER."""
default_cxx_host_compiler = which('g++') or ''
@@ -1455,6 +1354,7 @@
environ_cp['TF_NEED_GCP'] = '0'
environ_cp['TF_NEED_HDFS'] = '0'
environ_cp['TF_NEED_JEMALLOC'] = '0'
+ environ_cp['TF_NEED_KAFKA'] = '0'
environ_cp['TF_NEED_OPENCL_SYCL'] = '0'
environ_cp['TF_NEED_COMPUTECPP'] = '0'
environ_cp['TF_NEED_OPENCL'] = '0'
@@ -1473,6 +1373,8 @@
'with_hdfs_support', True, 'hdfs')
set_build_var(environ_cp, 'TF_NEED_S3', 'Amazon S3 File System',
'with_s3_support', True, 's3')
+ set_build_var(environ_cp, 'TF_NEED_KAFKA', 'Apache Kafka Platform',
+ 'with_kafka_support', False, 'kafka')
set_build_var(environ_cp, 'TF_ENABLE_XLA', 'XLA JIT', 'with_xla_support',
False, 'xla')
set_build_var(environ_cp, 'TF_NEED_GDR', 'GDR', 'with_gdr_support',
@@ -1520,10 +1422,6 @@
if not is_windows():
set_gcc_host_compiler_path(environ_cp)
set_other_cuda_vars(environ_cp)
- # enable tensorrt if desired. Disabled on non-linux
- set_action_env_var(environ_cp, 'TF_NEED_TENSORRT', 'TensorRT', False)
- if environ_cp.get('TF_NEED_TENSORRT') == '1':
- set_tf_trt_version(environ_cp)
set_build_var(environ_cp, 'TF_NEED_MPI', 'MPI', 'with_mpi_support', False)
if environ_cp.get('TF_NEED_MPI') == '1':