diff options
| -rw-r--r-- | tensorflow/BUILD | 2 | ||||
| -rw-r--r-- | tensorflow/contrib/makefile/BUILD | 31 | ||||
| -rw-r--r-- | tensorflow/contrib/makefile/Makefile | 3 | ||||
| -rwxr-xr-x | tensorflow/contrib/makefile/build_all_linux.sh | 3 | ||||
| -rw-r--r-- | tensorflow/python/kernel_tests/BUILD | 5 | ||||
| -rw-r--r-- | tensorflow/tools/benchmark/BUILD | 9 | ||||
| -rw-r--r-- | third_party/eigen3/BUILD | 9 | ||||
| -rw-r--r-- | third_party/fft2d/BUILD | 9 |
8 files changed, 65 insertions, 6 deletions
diff --git a/tensorflow/BUILD b/tensorflow/BUILD index d7d6d5fc77..d4396bacbf 100644 --- a/tensorflow/BUILD +++ b/tensorflow/BUILD @@ -400,6 +400,7 @@ filegroup( "//tensorflow/contrib/linear_optimizer:all_files", "//tensorflow/contrib/lookup:all_files", "//tensorflow/contrib/losses:all_files", + "//tensorflow/contrib/makefile:all_files", "//tensorflow/contrib/meta_graph_transform:all_files", "//tensorflow/contrib/metrics:all_files", "//tensorflow/contrib/mpi_collectives:all_files", @@ -513,6 +514,7 @@ filegroup( "//tensorflow/tools/api/golden:all_files", "//tensorflow/tools/api/lib:all_files", "//tensorflow/tools/api/tests:all_files", + "//tensorflow/tools/benchmark:all_files", "//tensorflow/tools/build_info:all_files", "//tensorflow/tools/common:all_files", "//tensorflow/tools/compatibility:all_files", diff --git a/tensorflow/contrib/makefile/BUILD b/tensorflow/contrib/makefile/BUILD new file mode 100644 index 0000000000..a8dd59f32a --- /dev/null +++ b/tensorflow/contrib/makefile/BUILD @@ -0,0 +1,31 @@ +# Necessary build rules for makefile build in our CI. + +licenses(["notice"]) # Apache 2.0 + +package(default_visibility = ["//visibility:private"]) + +filegroup( + name = "all_files", + srcs = glob( + ["**/*"], + exclude = ["**/OWNERS"], + ), + visibility = ["//tensorflow:__subpackages__"], +) + +sh_test( + name = "build_all_linux", + size = "enormous", + srcs = ["build_all_linux.sh"], + data = [ + "//tensorflow:all_opensource_files", + "//third_party/eigen3:all_files", + "//third_party/fft2d:all_files", + ], + tags = [ + "manual", + "no_gpu", + "no_oss", + "notap", + ], +) diff --git a/tensorflow/contrib/makefile/Makefile b/tensorflow/contrib/makefile/Makefile index 3dcff3d4a3..cb23dd6dab 100644 --- a/tensorflow/contrib/makefile/Makefile +++ b/tensorflow/contrib/makefile/Makefile @@ -14,7 +14,7 @@ # Host compilation settings # Find where we're running from, so we can store generated files here. -MAKEFILE_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) +MAKEFILE_DIR ?= $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) HAS_GEN_HOST_PROTOC := \ $(shell test -f $(MAKEFILE_DIR)/gen/protobuf-host/bin/protoc && echo "true" ||\ echo "false") @@ -71,6 +71,7 @@ HOST_LDOPTS += -L/usr/local/lib HOST_INCLUDES := \ -I. \ +-I$(MAKEFILE_DIR)/../../../ \ -I$(MAKEFILE_DIR)/downloads/ \ -I$(MAKEFILE_DIR)/downloads/eigen \ -I$(MAKEFILE_DIR)/downloads/gemmlowp \ diff --git a/tensorflow/contrib/makefile/build_all_linux.sh b/tensorflow/contrib/makefile/build_all_linux.sh index 5d73f697f4..a440633cfc 100755 --- a/tensorflow/contrib/makefile/build_all_linux.sh +++ b/tensorflow/contrib/makefile/build_all_linux.sh @@ -44,4 +44,5 @@ tensorflow/contrib/makefile/compile_linux_protobuf.sh # Build TensorFlow. make -j"${JOB_COUNT}" -f tensorflow/contrib/makefile/Makefile \ OPTFLAGS="-O3 -march=native" \ - HOST_CXXFLAGS="--std=c++11 -march=native" + HOST_CXXFLAGS="--std=c++11 -march=native" \ + MAKEFILE_DIR=$SCRIPT_DIR diff --git a/tensorflow/python/kernel_tests/BUILD b/tensorflow/python/kernel_tests/BUILD index e6848edc12..0e36c3498a 100644 --- a/tensorflow/python/kernel_tests/BUILD +++ b/tensorflow/python/kernel_tests/BUILD @@ -2700,10 +2700,7 @@ tf_py_test( "//tensorflow/python:variables", ], shard_count = 3, - tags = [ - "no_windows_gpu", - "nozapfhahn", - ], + tags = ["no_windows_gpu"], ) tf_py_test( diff --git a/tensorflow/tools/benchmark/BUILD b/tensorflow/tools/benchmark/BUILD index 048035f2b1..caa6629c49 100644 --- a/tensorflow/tools/benchmark/BUILD +++ b/tensorflow/tools/benchmark/BUILD @@ -89,3 +89,12 @@ tf_cc_binary( visibility = ["//visibility:public"], deps = [":benchmark_model_lib"], ) + +filegroup( + name = "all_files", + srcs = glob( + ["**/*"], + exclude = ["**/OWNERS"], + ), + visibility = ["//tensorflow:__subpackages__"], +) diff --git a/third_party/eigen3/BUILD b/third_party/eigen3/BUILD index f38a26717e..ad87477b7a 100644 --- a/third_party/eigen3/BUILD +++ b/third_party/eigen3/BUILD @@ -38,3 +38,12 @@ cc_library( "@local_config_sycl//sycl:sycl", ], ) + +filegroup( + name = "all_files", + srcs = glob( + ["**/*"], + exclude = ["**/OWNERS"], + ), + visibility = ["//tensorflow:__subpackages__"], +) diff --git a/third_party/fft2d/BUILD b/third_party/fft2d/BUILD index 93ea06e81b..8135442482 100644 --- a/third_party/fft2d/BUILD +++ b/third_party/fft2d/BUILD @@ -28,3 +28,12 @@ filegroup( name = "fft2d_headers_srcs", srcs = ["fft.h"], ) + +filegroup( + name = "all_files", + srcs = glob( + ["**/*"], + exclude = ["**/OWNERS"], + ), + visibility = ["//tensorflow:__subpackages__"], +) |