FIX MacOS Build (#452)

* * Reorganize toolchain directory
* Remove windows toolchains for time being
* Update releases scripts to include CPU optimizations

* Update test scripts/docs

* Lint

* Move delocate install

* Update pyenv

* Revert move of delocate

* Revert move of delocate

Author: seanpmorgan

CONTRIBUTING.md

@@ -98,6 +98,7 @@ docker run --runtime=nvidia --rm -it -v ${PWD}:/addons -w /addons tensorflow/ten
 
 bazel test -c opt -k \
 --test_timeout 300,450,1200,3600 \
+--crosstool_top=//build_deps/toolchains/gcc7_manylinux2010-nvcc-cuda10.0:toolchain \
 --test_output=all \
 --jobs=1 \
 //tensorflow_addons/...

…4/gcc7_manylinux2010-nvcc-cuda10.0/BUILD …s/gcc7_manylinux2010-nvcc-cuda10.0/BUILDbuild_deps/toolchains/preconfig/ubuntu16.04/gcc7_manylinux2010-nvcc-cuda10.0/BUILD renamed to build_deps/toolchains/gcc7_manylinux2010-nvcc-cuda10.0/BUILD build_deps/toolchains/preconfig/ubuntu16.04/gcc7_manylinux2010-nvcc-cuda10.0/BUILD renamed to build_deps/toolchains/gcc7_manylinux2010-nvcc-cuda10.0/BUILD

@@ -26,13 +26,7 @@ cc_toolchain_suite(
     toolchains = {
         "local|compiler": ":cc-compiler-local",
         "darwin|compiler": ":cc-compiler-darwin",
-        "x64_windows|msvc-cl": ":cc-compiler-windows",
-        "x64_windows": ":cc-compiler-windows",
-        "arm": ":cc-compiler-local",
-        "aarch64": ":cc-compiler-local",
         "k8": ":cc-compiler-local",
-        "piii": ":cc-compiler-local",
-        "ppc": ":cc-compiler-local",
         "darwin": ":cc-compiler-darwin",
     },
 )
@@ -99,9 +93,6 @@ cc_toolchain_config(
         "/dt7/usr/lib/gcc/x86_64-pc-linux-gnu/7/include",
         "/dt7/usr/lib/gcc/x86_64-pc-linux-gnu/7/include-fixed",
         "/dt7/usr/include",
-        "/usr/local/cuda-10.0/targets/x86_64-linux/include",
-        "/usr/local/cuda-10.0/include",
-        "/usr/local/cuda-10.0/extras/CUPTI/include",
         "/usr/include",
     ],
     cpu = "darwin",
@@ -113,44 +104,6 @@ cc_toolchain_config(
     linker_bin_path = "/usr/bin",
 )
 
-cc_toolchain(
-    name = "cc-compiler-windows",
-    all_files = ":windows_msvc_wrapper_files",
-    compiler_files = ":empty",
-    dwp_files = ":empty",
-    linker_files = ":windows_msvc_wrapper_files",
-    objcopy_files = ":empty",
-    strip_files = ":empty",
-    supports_param_files = 1,
-    toolchain_config = ":cc-compiler-windows-config",
-    toolchain_identifier = "local_windows",
-)
-
-cc_toolchain_config(
-    name = "cc-compiler-windows-config",
-    builtin_include_directories = [
-        "/dt7/usr/include/c++/7",
-        "/dt7/usr/include/c++/7/x86_64-pc-linux-gnu",
-        "/dt7/usr/include/c++/7/backward",
-        "/dt7/usr/lib/gcc/x86_64-pc-linux-gnu/7/include",
-        "/dt7/usr/lib/gcc/x86_64-pc-linux-gnu/7/include-fixed",
-        "/dt7/usr/include",
-        "/usr/local/cuda-10.0/targets/x86_64-linux/include",
-        "/usr/local/cuda-10.0/include",
-        "/usr/local/cuda-10.0/extras/CUPTI/include",
-        "/usr/include",
-    ],
-    cpu = "x64_windows",
-    msvc_cl_path = "msvc_not_used",
-    msvc_env_include = "msvc_not_used",
-    msvc_env_lib = "msvc_not_used",
-    msvc_env_path = "msvc_not_used",
-    msvc_env_tmp = "msvc_not_used",
-    msvc_lib_path = "msvc_not_used",
-    msvc_link_path = "msvc_not_used",
-    msvc_ml_path = "msvc_not_used",
-)
-
 filegroup(
     name = "empty",
     srcs = [],
@@ -160,8 +113,3 @@ filegroup(
     name = "crosstool_wrapper_driver_is_not_gcc",
     srcs = ["clang/bin/crosstool_wrapper_driver_is_not_gcc"],
 )
-
-filegroup(
-    name = "windows_msvc_wrapper_files",
-    srcs = glob(["windows/msvc_*"]),
-)

…10-nvcc-cuda10.0/cc_toolchain_config.bzl …10-nvcc-cuda10.0/cc_toolchain_config.bzlbuild_deps/toolchains/preconfig/ubuntu16.04/gcc7_manylinux2010-nvcc-cuda10.0/cc_toolchain_config.bzl renamed to build_deps/toolchains/gcc7_manylinux2010-nvcc-cuda10.0/cc_toolchain_config.bzl build_deps/toolchains/preconfig/ubuntu16.04/gcc7_manylinux2010-nvcc-cuda10.0/cc_toolchain_config.bzl renamed to build_deps/toolchains/gcc7_manylinux2010-nvcc-cuda10.0/cc_toolchain_config.bzl

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -26,11 +26,6 @@ DESCRIPTION:
   as is as a string to --compiler-options of nvcc. When "-x cuda" is not
   present, this wrapper invokes hybrid_driver_is_not_gcc with the input
   arguments as is.
-
-NOTES:
-  Changes to the contents of this file must be propagated from
-  //third_party/gpus/crosstool/crosstool_wrapper_is_not_gcc to
-  //third_party/gpus/crosstool/v*/*/clang/bin/crosstool_wrapper_is_not_gcc
 """
 
 from __future__ import print_function

…/bin/crosstool_wrapper_driver_is_not_gcc …/bin/crosstool_wrapper_driver_is_not_gccbuild_deps/toolchains/preconfig/ubuntu16.04/gcc7_manylinux2010-nvcc-cuda10.0/clang/bin/crosstool_wrapper_driver_is_not_gcc renamed to build_deps/toolchains/gcc7_manylinux2010-nvcc-cuda10.0/clang/bin/crosstool_wrapper_driver_is_not_gcc build_deps/toolchains/preconfig/ubuntu16.04/gcc7_manylinux2010-nvcc-cuda10.0/clang/bin/crosstool_wrapper_driver_is_not_gcc renamed to build_deps/toolchains/gcc7_manylinux2010-nvcc-cuda10.0/clang/bin/crosstool_wrapper_driver_is_not_gcc

@@ -78,21 +78,18 @@ write_action_env_to_bazelrc "TF_SHARED_LIBRARY_DIR" ${TF_SHARED_LIBRARY_DIR}
 write_action_env_to_bazelrc "TF_SHARED_LIBRARY_NAME" ${TF_SHARED_LIBRARY_NAME}
 write_action_env_to_bazelrc "TF_CXX11_ABI_FLAG" ${TF_CXX11_ABI_FLAG}
 
-write_to_bazelrc "build:manylinux2010 --crosstool_top=//build_deps/toolchains/preconfig/ubuntu16.04/gcc7_manylinux2010-nvcc-cuda10.0:toolchain"
-write_to_bazelrc "build --config=manylinux2010"
-write_to_bazelrc "test --config=manylinux2010"
 
 if [[ "$TF_NEED_CUDA" == "1" ]]; then
+    write_action_env_to_bazelrc "TF_NEED_CUDA" ${TF_NEED_CUDA}
     write_action_env_to_bazelrc "CUDNN_INSTALL_PATH" "/usr/lib/x86_64-linux-gnu"
     write_action_env_to_bazelrc "TF_CUDA_VERSION" "10.0"
     write_action_env_to_bazelrc "TF_CUDNN_VERSION" "7"
     write_action_env_to_bazelrc "CUDA_TOOLKIT_PATH" "${CUDA_HOME:=/usr/local/cuda}"
-    write_to_bazelrc "build --config=cuda"
-    write_to_bazelrc "test --config=cuda"
 
+    write_to_bazelrc "test --config=cuda"
+    write_to_bazelrc "build --config=cuda"
+    write_to_bazelrc "build --spawn_strategy=local"
+    write_to_bazelrc "build --strategy=Genrule=local"
     write_to_bazelrc "build:cuda --define=using_cuda=true --define=using_cuda_nvcc=true"
-    write_to_bazelrc "build --spawn_strategy=standalone"
-    write_to_bazelrc "build --strategy=Genrule=standalone"
-    write_action_env_to_bazelrc "TF_NEED_CUDA" ${TF_NEED_CUDA}
 
 fi

build_deps/toolchains/preconfig/ubuntu16.04/gcc7_manylinux2010-nvcc-cuda10.0/windows/msvc_wrapper_for_nvcc.py

@@ -34,10 +34,12 @@ for version in ${PYTHON_VERSIONS}; do
 
     # Build
     bazel build \
+      -c opt \
       --noshow_progress \
       --noshow_loading_progress \
       --verbose_failures \
       --test_output=errors \
+      --crosstool_top=//build_deps/toolchains/gcc7_manylinux2010-nvcc-cuda10.0:toolchain \
       build_pip_pkg
 
     # Package Whl

configure.sh

@@ -27,6 +27,7 @@ export PATH="$PATH:$HOME/bin"
 # Install delocate
 python3 -m pip install -q delocate
 
+brew update && brew upgrade pyenv
 eval "$(pyenv init -)"
 
 for version in ${PYTHON_VERSIONS}; do
@@ -41,6 +42,7 @@ for version in ${PYTHON_VERSIONS}; do
 
     # Build
     bazel build \
+      -c opt \
       --noshow_progress \
       --noshow_loading_progress \
       --verbose_failures \

tools/ci_build/builds/release_linux.sh

@@ -43,6 +43,7 @@ yes 'y' | ./configure.sh
 bazel test -c opt -k \
     --jobs=${N_JOBS} --test_timeout 300,450,1200,3600 \
     --test_output=errors --local_test_jobs=8 \
+    --crosstool_top=//build_deps/toolchains/gcc7_manylinux2010-nvcc-cuda10.0:toolchain \
     //tensorflow_addons/...
 
 exit $?