Merge branch 'master' of https://github.com/tensorflow/addons

Author: parth-p

CONTRIBUTING.md

@@ -46,20 +46,14 @@ process can take longer than typical commit reviews so please bare with
 us**
 
 
-## Development Environment
-It is recommended that development is done in the latest
-`nightly-custom-op` docker image.
+## Development Tips
+Try these useful commands below:
 
-```bash
-docker run --rm -it -v ${PWD}:/addons -w /addons tensorflow/tensorflow:nightly-custom-op /bin/bash
-```
-
-Try these commands below:
-
-* Format code automatically: `make code-format`
-* Run sanity check: `make sanity-check`
-* Run unit tests: `make unit-test`
-* All of the above: `make`
+* Format code automatically: `bash tools/run_docker.sh -c 'make code-format'`
+* Run sanity check: `bash tools/run_docker.sh -c 'make sanity-check'`
+* Run CPU unit tests: `bash tools/run_docker.sh -c 'make unit-test'`
+* Run GPU unit tests: `bash tools/run_docker.sh -c 'make gpu-unit-test'`
+* All of the above: `bash tools/run_docker.sh -c 'make'`
 
 ## Coding style
 
@@ -73,10 +67,10 @@ Please see our [Style Guide](STYLE_GUIDE.md) for more details.
 Nighly CI tests are ran and results can be found on the central README. To 
 subscribe for alerts please join the [addons-testing mailing list](https://groups.google.com/a/tensorflow.org/forum/#!forum/addons-testing).
 
-#### Locally Testing
+#### Locally Testing CPU
 
 ```bash
-docker run --rm -it -v ${PWD}:/addons -w /addons tensorflow/tensorflow:nightly-custom-op make unit-test
+bash tools/run_docker.sh -c 'make unit-test'
 ```
 
 or run manually:
@@ -88,7 +82,25 @@ docker run --rm -it -v ${PWD}:/addons -w /addons tensorflow/tensorflow:nightly-c
 
 bazel test -c opt -k \
 --test_timeout 300,450,1200,3600 \
---test_output=errors \
+--test_output=all \
+//tensorflow_addons/...
+```
+
+#### Locally Testing GPU
+```bash
+bash tools/run_docker.sh -d gpu -c 'make gpu-unit-test'
+```
+
+or run manually:
+
+```bash
+docker run --runtime=nvidia --rm -it -v ${PWD}:/addons -w /addons tensorflow/tensorflow:custom-op-gpu /bin/bash
+./configure.sh  # Links project with TensorFlow dependency
+
+bazel test -c opt -k \
+--test_timeout 300,450,1200,3600 \
+--test_output=all \
+--jobs=1 \
 //tensorflow_addons/...
 ```
 

README.md

@@ -37,7 +37,7 @@ developments that cannot be integrated into core TensorFlow
 | [tfa.metrics](tensorflow_addons/metrics/README.md) | SIG-Addons | @squadrick | 
 | [tfa.optimizers](tensorflow_addons/optimizers/README.md) | SIG-Addons | @facaiy @windqaq @squadrick |
 | [tfa.rnn](tensorflow_addons/rnn/README.md) | Google | @qlzh727 |
-| [tfa.seq2seq](tensorflow_addons/seq2seq/README.md) | Google | @qlzh727 |
+| [tfa.seq2seq](tensorflow_addons/seq2seq/README.md) | Google/SIG-Addons | @qlzh727 @guillaumekln |
 | [tfa.text](tensorflow_addons/text/README.md) |  SIG-Addons |  @seanpmorgan @facaiy |
 
 ## Installation

WORKSPACE

@@ -1,6 +1,19 @@
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("//build_deps/tf_dependency:tf_configure.bzl", "tf_configure")
 load("//build_deps/gpu:cuda_configure.bzl", "cuda_configure")
 
+
+http_archive(
+    name = "cub_archive",
+    build_file = "//build_deps/gpu:cub.BUILD",
+    sha256 = "6bfa06ab52a650ae7ee6963143a0bbc667d6504822cbd9670369b598f18c58c3",
+    strip_prefix = "cub-1.8.0",
+    urls = [
+        "https://storage.googleapis.com/mirror.tensorflow.org/github.com/NVlabs/cub/archive/1.8.0.zip",
+        "https://github.com/NVlabs/cub/archive/1.8.0.zip",
+    ],
+)
+
 tf_configure(
     name = "local_config_tf",
 )

build_deps/gpu/cub.BUILD

@@ -0,0 +1,25 @@
+# Description: CUB library which is a set of primitives for GPU programming.
+
+load("@local_config_cuda//cuda:build_defs.bzl", "cuda_default_copts", "if_cuda")
+
+package(
+    default_visibility = ["//visibility:public"],
+)
+
+licenses(["notice"])  # BSD
+
+filegroup(
+    name = "cub_header_files",
+    srcs = glob([
+        "cub/**",
+    ]),
+)
+
+cc_library(
+    name = "cub",
+    hdrs = if_cuda([":cub_header_files"]),
+    include_prefix = "gpu",
+    deps = [
+        "@local_config_cuda//cuda:cuda_headers",
+    ],
+)

build_deps/gpu/cuda/BUILD.tpl

@@ -1,3 +1,5 @@
+load(":build_defs.bzl", "cuda_header_library")
+
 licenses(["restricted"])  # MPL2, portions GPL v3, LGPL v3, BSD-like
 
 package(default_visibility = ["//visibility:public"])
@@ -37,11 +39,12 @@ config_setting(
     visibility = ["//visibility:public"],
 )
 
-cc_library(
+cuda_header_library(
     name = "cuda_headers",
     hdrs = [
         %{cuda_headers}
     ],
+    include_prefix = "third_party/gpus",
     includes = [
         ".",
         "cuda/include",

build_deps/gpu/cuda/build_defs.bzl.tpl

@@ -31,3 +31,32 @@ def if_cuda_is_configured(x):
     if cuda_is_configured():
       return x
     return []
+
+def cuda_header_library(
+        name,
+        hdrs,
+        include_prefix = None,
+        strip_include_prefix = None,
+        deps = [],
+        **kwargs):
+    """Generates a cc_library containing both virtual and system include paths.
+
+    Generates both a header-only target with virtual includes plus the full
+    target without virtual includes. This works around the fact that bazel can't
+    mix 'includes' and 'include_prefix' in the same target."""
+
+    native.cc_library(
+        name = name + "_virtual",
+        hdrs = hdrs,
+        include_prefix = include_prefix,
+        strip_include_prefix = strip_include_prefix,
+        deps = deps,
+        visibility = ["//visibility:private"],
+    )
+
+    native.cc_library(
+        name = name,
+        textual_hdrs = hdrs,
+        deps = deps + [":%s_virtual" % name],
+        **kwargs
+    )

build_deps/requirements.txt

@@ -1 +1 @@
-tf-nightly-2.0-preview
+tf-nightly-2.0-preview==2.0.0.dev20190731

build_deps/requirements_gpu.txt

@@ -1 +1 @@
-tf-nightly-gpu-2.0-preview
+tf-nightly-gpu-2.0-preview==2.0.0.dev20190731

tensorflow_addons/custom_ops/README.md

@@ -6,3 +6,4 @@
 | Image | Ops for image manipulation   |
 | Seq2seq | Ops for seq2seq encoder-decoder framework |
 | Text |  Ops for text processing  |
+| Layers |  Ops for model layers  |

tensorflow_addons/custom_ops/layers/BUILD

@@ -0,0 +1,49 @@
+licenses(["notice"])  # Apache 2.0
+
+package(default_visibility = ["//visibility:public"])
+
+load("@local_config_tf//:build_defs.bzl", "D_GLIBCXX_USE_CXX11_ABI")
+load("@local_config_cuda//cuda:build_defs.bzl", "if_cuda_is_configured", "if_cuda")
+
+cc_binary(
+    name = "_correlation_cost_ops.so",
+    srcs = [
+        "cc/kernels/correlation_cost_op.cc",
+        "cc/kernels/correlation_cost_op.h",
+        "cc/kernels/correlation_cost_op_gpu.cu.cc",
+        "cc/ops/correlation_cost_op.cc",
+    ],
+    copts = [
+        "-pthread",
+        "-std=c++11",
+        D_GLIBCXX_USE_CXX11_ABI,
+    ],
+    linkshared = 1,
+    deps = [
+        "@local_config_tf//:libtensorflow_framework",
+        "@local_config_tf//:tf_header_lib",
+    ] + if_cuda_is_configured([":correlation_cost_ops_gpu"]),
+)
+
+cc_library(
+    name = "correlation_cost_ops_gpu",
+    srcs = [
+        "cc/kernels/correlation_cost_op.h",
+        "cc/kernels/correlation_cost_op_gpu.cu.cc",
+    ],
+    copts = if_cuda_is_configured([
+        "-DGOOGLE_CUDA=1",
+        "-x cuda",
+        "-nvcc_options=relaxed-constexpr",
+        "-nvcc_options=ftz=true",
+    ]),
+    deps = [
+        "@local_config_tf//:libtensorflow_framework",
+        "@local_config_tf//:tf_header_lib",
+    ] + if_cuda_is_configured([
+        "@local_config_cuda//cuda:cuda_libs",
+        "@local_config_cuda//cuda:cuda_headers",
+        "@cub_archive//:cub",
+    ]),
+    alwayslink = 1,
+)