Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

NCCL 2.x document updates and removal of license file #20864

Merged
merged 6 commits into from
Jul 17, 2018
Merged

NCCL 2.x document updates and removal of license file #20864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
80153d4
Link NCCL 2.x lib and header where ./configure expects them.
tfboyd Jul 14, 2018
5066b24
Update default cuda compute capability while installing from sources …
smit-hinsu Jul 14, 2018
bdceb78
Disable more TF_NEED_* on Windows by default.
tensorflower-gardener Jul 16, 2018
dfae0e8
Add NCCL 2.x to install_sources.md
tfboyd Jul 16, 2018
62a84ec
apt-get install NVIDIA libs
tfboyd Jul 16, 2018
9baff09
internal change
tfboyd Jul 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 7 additions & 4 deletions configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
_DEFAULT_CUDA_VERSION = '9.0'
_DEFAULT_CUDNN_VERSION = '7'
_DEFAULT_NCCL_VERSION = '2.2'
_DEFAULT_CUDA_COMPUTE_CAPABILITIES = '3.5,5.2'
_DEFAULT_CUDA_COMPUTE_CAPABILITIES = '3.5,7.0'
_DEFAULT_CUDA_PATH = '/usr/local/cuda'
_DEFAULT_CUDA_PATH_LINUX = '/opt/cuda'
_DEFAULT_CUDA_PATH_WIN = ('C:/Program Files/NVIDIA GPU Computing '
Expand Down Expand Up @@ -1138,9 +1138,7 @@ def set_tf_nccl_install_path(environ_cp):

nccl_lib_path = os.path.join(nccl_install_path, nccl_lib_path)
nccl_hdr_path = os.path.join(nccl_install_path, 'include/nccl.h')
nccl_license_path = os.path.join(nccl_install_path, 'NCCL-SLA.txt')
if os.path.exists(nccl_lib_path) and os.path.exists(
nccl_hdr_path) and os.path.exists(nccl_license_path):
if os.path.exists(nccl_lib_path) and os.path.exists(nccl_hdr_path):
# Set NCCL_INSTALL_PATH
environ_cp['NCCL_INSTALL_PATH'] = nccl_install_path
write_action_env_to_bazelrc('NCCL_INSTALL_PATH', nccl_install_path)
Expand Down Expand Up @@ -1451,6 +1449,11 @@ def main():
# TODO(ibiryukov): Investigate using clang as a cpu or cuda compiler on
# Windows.
environ_cp['TF_DOWNLOAD_CLANG'] = '0'
environ_cp['TF_ENABLE_XLA'] = '0'
environ_cp['TF_NEED_GDR'] = '0'
environ_cp['TF_NEED_VERBS'] = '0'
environ_cp['TF_NEED_MPI'] = '0'
environ_cp['TF_SET_ANDROID_WORKSPACE'] = '0'

if is_macos():
environ_cp['TF_NEED_JEMALLOC'] = '0'
Expand Down