Build Addons for Windows (CPU) (#771)

* Update bazel build to compile with MSVC
* Update custom ops to use C++ standard
* Remove  Windows ParseTime until TF core exports symbols
* Fix resource loader on windows
* Disable parse time on windows
* Fix packaging
* Finalize windows build

Author: seanpmorgan

.travis.yml

@@ -7,11 +7,6 @@ git:
 services:
 - docker
 
-install:
-- curl https://bootstrap.pypa.io/get-pip.py | sudo -H python
-- sudo -H python -m pip install -q -U twine --ignore-installed six
-- twine --version
-
 stages:
 - test
 - build
@@ -31,6 +26,7 @@ jobs:
       # Build GPU kernels without runtime=nvidia as there are no GPUs/Drivers
       - docker run -e TF_NEED_CUDA=1 -v ${PWD}:/addons -w /addons gcr.io/tensorflow-testing/nosla-cuda10.1-cudnn7-ubuntu16.04-manylinux2010 tools/ci_build/builds/release_linux.sh
       after_success:
+        - python -m pip install -q -U twine --ignore-installed six
         - twine upload -u $PYPI_USER -p $PYPI_PW wheelhouse/*.whl
 
     # MacOS Builds
@@ -41,8 +37,33 @@ jobs:
       script:
         - bash -x -e tools/ci_build/builds/release_macos.sh
       after_success:
+        - python -m pip install -q -U twine --ignore-installed six
         - twine upload -u $PYPI_USER -p $PYPI_PW wheelhouse/*.whl
 
+# Windows nightlies for TensorFlow are not available
+    # Windows Builds
+#    - stage: build
+#      name: "Build on Windows for Python 2.7 3.5 3.6 3.7"
+#      os: windows
+#      language: shell
+#      before_install:
+#        - choco install python --version 2.7.11
+#        - choco install python --version 3.5.4
+#        - choco install python --version 3.6.8
+#        - choco install python --version 3.7.5
+#      script:
+#        - export PATH=/c/tools/python:/c/tools/python/Scripts:$PATH
+#        - bash -x -e tools/ci_build/builds/release_windows.sh
+#        - export PATH=/c/Python35:/c/Python35/Scripts:$PATH
+#        - bash -x -e tools/ci_build/builds/release_windows.sh
+#        - export PATH=/c/Python36:/c/Python36/Scripts:$PATH
+#        - bash -x -e tools/ci_build/builds/release_windows.sh
+#        - export PATH=/c/Python37:/c/Python37/Scripts:$PATH
+#        - bash -x -e tools/ci_build/builds/release_windows.sh
+#      after_success:
+#        - python -m pip install -q -U twine --ignore-installed six
+#        - twine upload -u $PYPI_USER -p $PYPI_PW artifacts/*.whl
+
 notifications:
   email:
     recipients:

MANIFEST.in

@@ -1,2 +1,2 @@
-recursive-include tensorflow_addons/ *.so
+recursive-include tensorflow_addons *.so
 include docs/*

README.md

@@ -88,7 +88,7 @@ export CUDNN_INSTALL_PATH="/path/to/cudnn" (default: /usr/lib/x86_64-linux-gnu)
 # This script links project with TensorFlow dependency
 ./configure.sh
 
-bazel build build_pip_pkg
+bazel build --enable_runfiles build_pip_pkg
 bazel-bin/build_pip_pkg artifacts --nightly
 
 pip install artifacts/tensorflow_addons-*.whl

WORKSPACE

@@ -1,5 +1,3 @@
-workspace(name = "tensorflow_addons")
-
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("//build_deps/tf_dependency:tf_configure.bzl", "tf_configure")
 load("//build_deps/toolchains/gpu:cuda_configure.bzl", "cuda_configure")

build_deps/requirements.txt

@@ -1,2 +1,2 @@
 # TensorFlow greater than this date is manylinux2010 compliant
-tf-nightly>=2.1.0.dev20191004
+tf-nightly>=2.1.0.dev20191004

build_deps/tf_dependency/tf_configure.bzl

@@ -133,33 +133,45 @@ def _symlink_genrule_for_dir(
         dest_dir,
         genrule_name,
         src_files = [],
-        dest_files = []):
-    """Returns a genrule to symlink(or copy if on Windows) a set of files.
+        dest_files = [],
+        tf_pip_dir_rename_pair = []):
 
+    """Returns a genrule to symlink(or copy if on Windows) a set of files.
     If src_dir is passed, files will be read from the given directory; otherwise
     we assume files are in src_files and dest_files.
-
     Args:
         repository_ctx: the repository_ctx object.
         src_dir: source directory.
         dest_dir: directory to create symlink in.
         genrule_name: genrule name.
         src_files: list of source files instead of src_dir.
         dest_files: list of corresonding destination files.
-
+        tf_pip_dir_rename_pair: list of the pair of tf pip parent directory to
+          replace. For example, in TF pip package, the source code is under
+          "tensorflow_core", and we might want to replace it with
+          "tensorflow" to match the header includes.
     Returns:
         genrule target that creates the symlinks.
     """
+    # Check that tf_pip_dir_rename_pair has the right length
+    tf_pip_dir_rename_pair_len = len(tf_pip_dir_rename_pair)
+    if tf_pip_dir_rename_pair_len != 0 and tf_pip_dir_rename_pair_len !=2:
+      _fail("The size of argument tf_pip_dir_rename_pair should be either 0 or 2, but %d is given." % tf_pip_dir_rename_pair_len)
+
     if src_dir != None:
         src_dir = _norm_path(src_dir)
         dest_dir = _norm_path(dest_dir)
         files = "\n".join(sorted(_read_dir(repository_ctx, src_dir).splitlines()))
 
         # Create a list with the src_dir stripped to use for outputs.
-        dest_files = files.replace(src_dir, "").splitlines()
+        if tf_pip_dir_rename_pair_len:
+          dest_files = files.replace(src_dir, "").replace(tf_pip_dir_rename_pair[0], tf_pip_dir_rename_pair[1]).splitlines()
+        else:
+          dest_files = files.replace(src_dir, "").splitlines()
         src_files = files.splitlines()
     command = []
     outs = []
+
     for i in range(len(dest_files)):
         if dest_files[i] != "":
             # If we have only one file to link we do not want to use the dest_dir, as
@@ -168,8 +180,9 @@ def _symlink_genrule_for_dir(
 
             # Copy the headers to create a sandboxable setup.
             cmd = "cp -f"
-            command.append(cmd + ' "%s" "%s" | true' % (src_files[i], dest))
+            command.append(cmd + ' "%s" "%s"' % (src_files[i], dest))
             outs.append('        "' + dest_dir + dest_files[i] + '",')
+
     genrule = _genrule(
         genrule_name,
         " && ".join(command),
@@ -184,13 +197,15 @@ def _tf_pip_impl(repository_ctx):
         tf_header_dir,
         "include",
         "tf_header_include",
+        tf_pip_dir_rename_pair = ["tensorflow_core", "tensorflow"]
     )
 
     tf_shared_library_dir = repository_ctx.os.environ[_TF_SHARED_LIBRARY_DIR]
     tf_shared_library_name = repository_ctx.os.environ[_TF_SHARED_LIBRARY_NAME]
     tf_shared_library_path = "%s/%s" % (tf_shared_library_dir, tf_shared_library_name)
     tf_cx11_abi = "-D_GLIBCXX_USE_CXX11_ABI=%s" % (repository_ctx.os.environ[_TF_CXX11_ABI_FLAG])
 
+
     tf_shared_library_rule = _symlink_genrule_for_dir(
         repository_ctx,
         None,

build_deps/toolchains/gpu/cuda_configure.bzl

@@ -1031,7 +1031,7 @@ def find_cuda_config(repository_ctx, cuda_libraries):
     """Returns CUDA config dictionary from running find_cuda_config.py"""
     exec_result = repository_ctx.execute([
         _get_python_bin(repository_ctx),
-        repository_ctx.path(Label("@tensorflow_addons//build_deps/toolchains/gpu:find_cuda_config.py")),
+        repository_ctx.path(Label("//build_deps/toolchains/gpu:find_cuda_config.py")),
     ] + cuda_libraries)
     if exec_result.return_code:
         auto_configure_fail("Failed to run find_cuda_config.py: %s" % exec_result.stderr)

build_pip_pkg.sh

@@ -16,7 +16,18 @@
 set -e
 set -x
 
-PIP_FILE_PREFIX="bazel-bin/build_pip_pkg.runfiles/tensorflow_addons/"
+PLATFORM="$(uname -s | tr 'A-Z' 'a-z')"
+
+function is_windows() {
+  # On windows, the shell script is actually running in msys
+  [[ "${PLATFORM}" =~ msys_nt*|mingw*|cygwin*|uwin* ]]
+}
+
+if is_windows; then
+  PIP_FILE_PREFIX="bazel-bin/build_pip_pkg.exe.runfiles/__main__/"
+else
+  PIP_FILE_PREFIX="bazel-bin/build_pip_pkg.runfiles/__main__/"
+fi
 
 function abspath() {
   cd "$(dirname $1)"
@@ -45,15 +56,24 @@ function main() {
   cp ${PIP_FILE_PREFIX}MANIFEST.in "${TMPDIR}"
   cp ${PIP_FILE_PREFIX}LICENSE "${TMPDIR}"
   touch ${TMPDIR}/stub.cc
-  rsync -avm -L --exclude='*_test.py' ${PIP_FILE_PREFIX}tensorflow_addons "${TMPDIR}"
+
+  if is_windows; then
+    from=$(cygpath -w ${PIP_FILE_PREFIX}tensorflow_addons)
+    to=$(cygpath -w "${TMPDIR}"/tensorflow_addons)
+    start robocopy //S "${from}" "${to}" //xf *_test.py
+    sleep 5
+  else
+    rsync -avm -L --exclude='*_test.py' ${PIP_FILE_PREFIX}tensorflow_addons "${TMPDIR}"
+  fi
 
   pushd ${TMPDIR}
   echo $(date) : "=== Building wheel"
 
   if [[ -z ${BUILD_FLAG} ]]; then
-    ${PYTHON_VERSION:=python} setup.py bdist_wheel > /dev/null
+    # Windows has issues with locking library files for deletion so do not fail here
+    ${PYTHON_VERSION:=python} setup.py bdist_wheel || true
   else
-    ${PYTHON_VERSION:=python} setup.py bdist_wheel "${2}" > /dev/null
+    ${PYTHON_VERSION:=python} setup.py bdist_wheel "${2}" || true
   fi
 
   cp dist/*.whl "${DEST}"

configure.sh

@@ -19,6 +19,9 @@
 #  --quiet  Give less output.
 
 
+PLATFORM="$(uname -s | tr 'A-Z' 'a-z')"
+
+
 # Writes variables to bazelrc file
 function write_to_bazelrc() {
   echo "$1" >> .bazelrc
@@ -28,11 +31,30 @@ function write_action_env_to_bazelrc() {
   write_to_bazelrc "build --action_env $1=\"$2\""
 }
 
+function is_linux() {
+  [[ "${PLATFORM}" == "linux" ]]
+}
+
+function is_macos() {
+  [[ "${PLATFORM}" == "darwin" ]]
+}
+
+function is_windows() {
+  # On windows, the shell script is actually running in msys
+  [[ "${PLATFORM}" =~ msys_nt*|mingw*|cygwin*|uwin* ]]
+}
+
+function is_ppc64le() {
+  [[ "$(uname -m)" == "ppc64le" ]]
+}
+
 # Converts the linkflag namespec to the full shared library name
 function generate_shared_lib_name() {
-  if [[ $(uname) == "Darwin" ]]; then
+  if is_macos; then
     local namespec="$1"
     echo "lib"${namespec:2}".dylib"
+  elif is_windows; then
+    echo "_pywrap_tensorflow_internal.lib"
   else
     local namespec="$1"
     echo ${namespec:3}
@@ -65,14 +87,31 @@ TF_CFLAGS=( $(${PYTHON_VERSION} -c 'import tensorflow as tf; print(" ".join(tf.s
 TF_LFLAGS=( $(${PYTHON_VERSION} -c 'import tensorflow as tf; print(" ".join(tf.sysconfig.get_link_flags()))') )
 TF_CXX11_ABI_FLAG=( $(${PYTHON_VERSION} -c 'import tensorflow as tf; print(tf.sysconfig.CXX11_ABI_FLAG)') )
 
-TF_SHARED_LIBRARY_DIR=${TF_LFLAGS[0]:2}
+if is_windows; then
+  # Use pywrap_tensorflow instead of tensorflow_framework on Windows
+  TF_SHARED_LIBRARY_DIR=${TF_CFLAGS:2:-7}"python"
+else
+  TF_SHARED_LIBRARY_DIR=${TF_LFLAGS[0]:2}
+fi
+
 TF_SHARED_LIBRARY_NAME=$(generate_shared_lib_name ${TF_LFLAGS[1]})
+TF_HEADER_DIR=${TF_CFLAGS:2}
+
+if is_windows; then
+  TF_SHARED_LIBRARY_DIR=${TF_SHARED_LIBRARY_DIR//\\//}
+  TF_SHARED_LIBRARY_NAME=${TF_SHARED_LIBRARY_NAME//\\//}
+  TF_HEADER_DIR=${TF_HEADER_DIR//\\//}
+fi
 
-write_action_env_to_bazelrc "TF_HEADER_DIR" ${TF_CFLAGS:2}
+write_action_env_to_bazelrc "TF_HEADER_DIR" ${TF_HEADER_DIR}
 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: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_to_bazelrc "build -c opt"
 
 if [[ "$TF_NEED_CUDA" == "1" ]]; then
     write_action_env_to_bazelrc "TF_NEED_CUDA" ${TF_NEED_CUDA}
@@ -83,8 +122,5 @@ if [[ "$TF_NEED_CUDA" == "1" ]]; then
 
     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:cuda --crosstool_top=@local_config_cuda//crosstool:toolchain"
 fi

except.txt

@@ -0,0 +1 @@
+_test.py

setup.py

@@ -70,6 +70,12 @@
 elif project_name == TFA_NIGHTLY:
     REQUIRED_PACKAGES.append('tf-nightly')
 
+# Manylinux2010 requires a patch for platlib
+if sys.platform.startswith('linux'):
+    ext_modules = [Extension('_foo', ['stub.cc'])]
+else:
+    ext_modules = []
+
 
 class BinaryDistribution(Distribution):
     """This class is needed in order to create OS specific wheels."""
@@ -86,7 +92,7 @@ def has_ext_modules(self):
     author='Google Inc.',
     author_email='[email protected]',
     packages=find_packages(),
-    ext_modules=[Extension('_foo', ['stub.cc'])],
+    ext_modules=ext_modules,
     install_requires=REQUIRED_PACKAGES,
     include_package_data=True,
     zip_safe=False,

tensorflow_addons/BUILD

@@ -2,6 +2,11 @@ licenses(["notice"])  # Apache 2.0
 
 package(default_visibility = ["//visibility:public"])
 
+config_setting(
+    name = "windows",
+    constraint_values = ["@bazel_tools//platforms:windows"],
+)
+
 py_library(
     name = "tensorflow_addons",
     data = [

tensorflow_addons/custom_ops/activations/cc/kernels/gelu_op.h

@@ -17,6 +17,8 @@ limitations under the License.
 #define TENSORFLOW_ADDONS_ACTIVATIONS_KERNELS_GELU_OP_H_
 
 #define EIGEN_USE_THREADS
+#define _USE_MATH_DEFINES
+#include <cmath>
 
 #include "tensorflow/core/framework/numeric_op.h"
 #include "tensorflow/core/framework/op_kernel.h"

tensorflow_addons/custom_ops/activations/cc/kernels/rrelu_op.h

@@ -38,7 +38,7 @@ struct Rrelu {
                   typename TTypes<T>::Tensor alpha,
                   typename random::SimplePhilox& random) {
     if (training) {
-      T storage[alpha.size()];
+      T* storage = new T[alpha.size()];
       typename TTypes<T>::Tensor alpha_tensor(storage, alpha.size());
       for (int i = 0; i < alpha_tensor.size(); i++) {
         alpha_tensor(i) =

tensorflow_addons/tensorflow_addons.bzl

@@ -36,17 +36,25 @@ def custom_op_library(
         )
         deps = deps + if_cuda_is_configured([":" + basename + "_gpu"])
 
-    copts = copts + [
-        "-pthread",
-        "-std=c++11",
-        D_GLIBCXX_USE_CXX11_ABI,
-    ]
+    copts = copts + select({
+        "//tensorflow_addons:windows": ["/DEIGEN_STRONG_INLINE=inline",
+            "-DTENSORFLOW_MONOLITHIC_BUILD",
+             "/DPLATFORM_WINDOWS", "/DEIGEN_HAS_C99_MATH",
+             "/DTENSORFLOW_USE_EIGEN_THREADPOOL", "/DEIGEN_AVOID_STL_ARRAY",
+             "/Iexternal/gemmlowp", "/wd4018", "/wd4577", "/DNOGDI",
+             "/UTF_COMPILE_LIBRARY"],
+        "//conditions:default": ["-pthread", "-std=c++11", D_GLIBCXX_USE_CXX11_ABI],
+    })
 
     native.cc_binary(
         name = name,
         srcs = srcs,
         copts = copts,
         linkshared = 1,
+        features = select({
+            "//tensorflow_addons:windows": ["windows_export_all_symbols"],
+            "//conditions:default": [],
+        }),
         deps = deps,
         **kwargs
     )