diff options
Diffstat (limited to 'tensorflow/tools')
25 files changed, 115 insertions, 19 deletions
diff --git a/tensorflow/tools/api/golden/tensorflow.pbtxt b/tensorflow/tools/api/golden/tensorflow.pbtxt index f61f82e43e..bf7bc6a7c1 100644 --- a/tensorflow/tools/api/golden/tensorflow.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.pbtxt @@ -17,6 +17,10 @@ tf_module { mtype: "<type \'str\'>" } member { + name: "CXX11_ABI_FLAG" + mtype: "<type \'int\'>" + } + member { name: "ConditionalAccumulator" mtype: "<type \'type\'>" } diff --git a/tensorflow/tools/api/golden/tensorflow.sysconfig.pbtxt b/tensorflow/tools/api/golden/tensorflow.sysconfig.pbtxt index 02dec04b9c..2f00aeac25 100644 --- a/tensorflow/tools/api/golden/tensorflow.sysconfig.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.sysconfig.pbtxt @@ -1,6 +1,10 @@ path: "tensorflow.sysconfig" tf_module { member_method { + name: "get_compile_flags" + argspec: "args=[], varargs=None, keywords=None, defaults=None" + } + member_method { name: "get_include" argspec: "args=[], varargs=None, keywords=None, defaults=None" } @@ -8,4 +12,8 @@ tf_module { name: "get_lib" argspec: "args=[], varargs=None, keywords=None, defaults=None" } + member_method { + name: "get_link_flags" + argspec: "args=[], varargs=None, keywords=None, defaults=None" + } } diff --git a/tensorflow/tools/ci_build/Dockerfile.android b/tensorflow/tools/ci_build/Dockerfile.android index facff47621..99a69d7b43 100644 --- a/tensorflow/tools/ci_build/Dockerfile.android +++ b/tensorflow/tools/ci_build/Dockerfile.android @@ -1,6 +1,6 @@ FROM ubuntu:14.04 -MAINTAINER Jan Prach <jendap@google.com> +LABEL maintainer="Jan Prach <jendap@google.com>" # Copy and run the install scripts. COPY install/*.sh /install/ diff --git a/tensorflow/tools/ci_build/Dockerfile.cmake b/tensorflow/tools/ci_build/Dockerfile.cmake index 9013dc012d..37ba24d65a 100644 --- a/tensorflow/tools/ci_build/Dockerfile.cmake +++ b/tensorflow/tools/ci_build/Dockerfile.cmake @@ -14,7 +14,7 @@ # ============================================================================== FROM ubuntu:16.04 -MAINTAINER Shanqing Cai <cais@google.com> +LABEL maintainer="Shanqing Cai <cais@google.com>" # Copy and run the install scripts. COPY install/*.sh /install/ diff --git a/tensorflow/tools/ci_build/Dockerfile.cpu b/tensorflow/tools/ci_build/Dockerfile.cpu index 206108930a..57a854a9df 100644 --- a/tensorflow/tools/ci_build/Dockerfile.cpu +++ b/tensorflow/tools/ci_build/Dockerfile.cpu @@ -1,6 +1,6 @@ FROM ubuntu:14.04 -MAINTAINER Jan Prach <jendap@google.com> +LABEL maintainer="Jan Prach <jendap@google.com>" # Copy and run the install scripts. COPY install/*.sh /install/ diff --git a/tensorflow/tools/ci_build/Dockerfile.debian.jessie.cpu b/tensorflow/tools/ci_build/Dockerfile.debian.jessie.cpu index b914f51918..eb9d0d4dd0 100644 --- a/tensorflow/tools/ci_build/Dockerfile.debian.jessie.cpu +++ b/tensorflow/tools/ci_build/Dockerfile.debian.jessie.cpu @@ -1,6 +1,6 @@ FROM debian:jessie -MAINTAINER Jan Prach <jendap@google.com> +LABEL maintainer="Jan Prach <jendap@google.com>" # Copy and run the install scripts. COPY install/*.sh /install/ diff --git a/tensorflow/tools/ci_build/Dockerfile.gpu b/tensorflow/tools/ci_build/Dockerfile.gpu index 5d18295f68..2d46ccb6b1 100644 --- a/tensorflow/tools/ci_build/Dockerfile.gpu +++ b/tensorflow/tools/ci_build/Dockerfile.gpu @@ -1,6 +1,6 @@ FROM nvidia/cuda:8.0-cudnn6-devel-ubuntu14.04 -MAINTAINER Jan Prach <jendap@google.com> +LABEL maintainer="Jan Prach <jendap@google.com>" # In the Ubuntu 14.04 images, cudnn is placed in system paths. Move them to # /usr/local/cuda diff --git a/tensorflow/tools/ci_build/Dockerfile.gpu_clang b/tensorflow/tools/ci_build/Dockerfile.gpu_clang index c4342d17f5..0ecd8c75e0 100644 --- a/tensorflow/tools/ci_build/Dockerfile.gpu_clang +++ b/tensorflow/tools/ci_build/Dockerfile.gpu_clang @@ -1,6 +1,6 @@ FROM nvidia/cuda:8.0-cudnn6-devel-ubuntu14.04 -MAINTAINER Ilya Biryukov <ibiryukov@google.com> +LABEL maintainer="Ilya Biryukov <ibiryukov@google.com>" # In the Ubuntu 14.04 images, cudnn is placed in system paths. Move them to # /usr/local/cuda diff --git a/tensorflow/tools/ci_build/Dockerfile.hadoop b/tensorflow/tools/ci_build/Dockerfile.hadoop index 489493c26e..6010aedb33 100644 --- a/tensorflow/tools/ci_build/Dockerfile.hadoop +++ b/tensorflow/tools/ci_build/Dockerfile.hadoop @@ -1,6 +1,6 @@ FROM ubuntu:14.04 -MAINTAINER Jonathan Hseu <jhseu@google.com> +LABEL maintainer="Jonathan Hseu <jhseu@google.com>" # Copy and run the install scripts. COPY install/*.sh /install/ diff --git a/tensorflow/tools/ci_build/Dockerfile.pi b/tensorflow/tools/ci_build/Dockerfile.pi index 2fddd6a2c0..75ef30d32b 100644 --- a/tensorflow/tools/ci_build/Dockerfile.pi +++ b/tensorflow/tools/ci_build/Dockerfile.pi @@ -1,6 +1,6 @@ FROM ubuntu:14.04 -MAINTAINER Jan Prach <jendap@google.com> +LABEL maintainer="Jan Prach <jendap@google.com>" # Copy and run the install scripts. COPY install/*.sh /install/ diff --git a/tensorflow/tools/ci_build/Dockerfile.pi-python3 b/tensorflow/tools/ci_build/Dockerfile.pi-python3 index 18b131ea19..b1c648ba30 100644 --- a/tensorflow/tools/ci_build/Dockerfile.pi-python3 +++ b/tensorflow/tools/ci_build/Dockerfile.pi-python3 @@ -1,6 +1,6 @@ FROM ubuntu:14.04 -MAINTAINER Jan Prach <jendap@google.com> +LABEL maintainer="Jan Prach <jendap@google.com>" # Copy and run the install scripts. COPY install/*.sh /install/ diff --git a/tensorflow/tools/ci_build/README.md b/tensorflow/tools/ci_build/README.md index acef833909..202fcb9101 100644 --- a/tensorflow/tools/ci_build/README.md +++ b/tensorflow/tools/ci_build/README.md @@ -50,7 +50,7 @@ and tests. Click on **Details** to see the results from Jenkins or the internal CI system. Results from Jenkins are displayed in the Jenkins UI. For more information, -see the [Jenkns documentation](https://jenkins.io/doc/). +see the [Jenkins documentation](https://jenkins.io/doc/). Results from the internal CI system are displayed in the Build Status UI. In this UI, to see the logs for a failed build: diff --git a/tensorflow/tools/ci_build/ci_sanity.sh b/tensorflow/tools/ci_build/ci_sanity.sh index 26053de4e9..f1c207f9b6 100755 --- a/tensorflow/tools/ci_build/ci_sanity.sh +++ b/tensorflow/tools/ci_build/ci_sanity.sh @@ -426,6 +426,72 @@ do_code_link_check() { tensorflow/tools/ci_build/code_link_check.sh } +# List .h|.cc files changed in the last non-merge git commit that still exist, +# i.e., not removed. +# Usage: get_clang_files_to_check [--incremental] +get_clang_files_to_check() { + if [[ "$1" == "--incremental" ]]; then + CHANGED_CLANG_FILES=$(get_changed_files_in_last_non_merge_git_commit | \ + grep '.*\.h$\|.*\.cc$') + + # Do not include files removed in the last non-merge commit. + CLANG_FILES="" + for CLANG_FILE in ${CHANGED_CLANG_FILES}; do + if [[ -f "${CLANG_FILE}" ]]; then + CLANG_FILES="${CLANG_FILES} ${CLANG_FILE}" + fi + done + + echo "${CLANG_FILES}" + else + find tensorflow -name '*.h' -o -name '*.cc' + fi +} + +do_clang_format_check() { + if [[ $# != "0" ]] && [[ $# != "1" ]]; then + echo "Invalid syntax when invoking do_clang_format_check" + echo "Usage: do_clang_format_check [--incremental]" + return 1 + fi + + if [[ "$1" == "--incremental" ]]; then + CLANG_SRC_FILES=$(get_clang_files_to_check --incremental) + + if [[ -z "${CLANG_SRC_FILES}" ]]; then + echo "do_clang_format_check will NOT run due to --incremental flag and "\ +"due to the absence of .h or .cc code changes in the last commit." + return 0 + fi + elif [[ -z "$1" ]]; then + # TODO (yongtang): Always pass --incremental until all files have + # been sanitized gradually. Then this --incremental could be removed. + CLANG_SRC_FILES=$(get_clang_files_to_check --incremental) + else + echo "Invalid syntax for invoking do_clang_format_check" + echo "Usage: do_clang_format_check [--incremental]" + return 1 + fi + + CLANG_FORMAT=${CLANG_FORMAT:-clang-format-3.8} + + success=1 + for filename in $CLANG_SRC_FILES; do + $CLANG_FORMAT --style=google $filename | diff $filename - > /dev/null + if [ ! $? -eq 0 ]; then + success=0 + echo File $filename is not properly formatted with "clang-format "\ +"--style=google" + fi + done + + if [ $success == 0 ]; then + echo Clang format check fails. + exit 1 + fi + echo Clang format check success. +} + do_check_load_py_test() { BUILD_CMD="bazel build ${BAZEL_FLAGS} //tensorflow/tools/pip_package:check_load_py_test" ${BUILD_CMD} diff --git a/tensorflow/tools/ci_build/install/install_deb_packages.sh b/tensorflow/tools/ci_build/install/install_deb_packages.sh index da1f2199d0..4ab307c925 100755 --- a/tensorflow/tools/ci_build/install/install_deb_packages.sh +++ b/tensorflow/tools/ci_build/install/install_deb_packages.sh @@ -28,6 +28,7 @@ if [[ "$1" != "" ]] && [[ "$1" != "--without_cmake" ]]; then fi # Install dependencies from ubuntu deb repository. +apt-key adv --keyserver keyserver.ubuntu.com --recv 084ECFC5828AB726 apt-get update if [[ "$ubuntu_version" == "14" ]]; then @@ -41,6 +42,7 @@ apt-get install -y --no-install-recommends \ autoconf \ automake \ build-essential \ + clang-format-3.8 \ curl \ ffmpeg \ git \ diff --git a/tensorflow/tools/ci_build/update_version.py b/tensorflow/tools/ci_build/update_version.py index c7841f35aa..d2a63e5d66 100755 --- a/tensorflow/tools/ci_build/update_version.py +++ b/tensorflow/tools/ci_build/update_version.py @@ -17,7 +17,7 @@ # Automatically update TensorFlow version in source files # # Usage: -# ./tensorflow/tools/ci_build/update_version.py --version 1.4.0-rc0 +# ./tensorflow/tools/ci_build/update_version.py --version 1.4.0-rc1 # ./tensorflow/tools/ci_build/update_version.py --nightly # """Update version of TensorFlow script.""" diff --git a/tensorflow/tools/dist_test/Dockerfile b/tensorflow/tools/dist_test/Dockerfile index cd64e2c518..2a7605bbc9 100644 --- a/tensorflow/tools/dist_test/Dockerfile +++ b/tensorflow/tools/dist_test/Dockerfile @@ -20,7 +20,7 @@ FROM ubuntu:16.04 -MAINTAINER Shanqing Cai <cais@google.com> +LABEL maintainer="Shanqing Cai <cais@google.com>" RUN apt-get update RUN apt-get install -y \ diff --git a/tensorflow/tools/dist_test/Dockerfile.local b/tensorflow/tools/dist_test/Dockerfile.local index 7a896ab611..795aeee1b5 100644 --- a/tensorflow/tools/dist_test/Dockerfile.local +++ b/tensorflow/tools/dist_test/Dockerfile.local @@ -19,7 +19,7 @@ FROM ubuntu:16.04 -MAINTAINER Shanqing Cai <cais@google.com> +LABEL maintainer="Shanqing Cai <cais@google.com>" # Pick up some TF dependencies. RUN apt-get update && apt-get install -y \ diff --git a/tensorflow/tools/dist_test/local/Dockerfile b/tensorflow/tools/dist_test/local/Dockerfile index 96846f6564..383c3c2f4c 100644 --- a/tensorflow/tools/dist_test/local/Dockerfile +++ b/tensorflow/tools/dist_test/local/Dockerfile @@ -1,6 +1,6 @@ FROM jpetazzo/dind -MAINTAINER Shanqing Cai <cais@google.com> +LABEL maintainer="Shanqing Cai <cais@google.com>" RUN apt-get update diff --git a/tensorflow/tools/dist_test/server/Dockerfile b/tensorflow/tools/dist_test/server/Dockerfile index fabc8a7105..1359428f11 100644 --- a/tensorflow/tools/dist_test/server/Dockerfile +++ b/tensorflow/tools/dist_test/server/Dockerfile @@ -19,7 +19,7 @@ FROM ubuntu:16.04 -MAINTAINER Shanqing Cai <cais@google.com> +LABEL maintainer="Shanqing Cai <cais@google.com>" # Pick up some TF dependencies RUN apt-get update && apt-get install -y \ diff --git a/tensorflow/tools/dist_test/server/Dockerfile.test b/tensorflow/tools/dist_test/server/Dockerfile.test index 908af8af9b..ce7e783a1a 100644 --- a/tensorflow/tools/dist_test/server/Dockerfile.test +++ b/tensorflow/tools/dist_test/server/Dockerfile.test @@ -19,7 +19,7 @@ FROM ubuntu:16.04 -MAINTAINER Shanqing Cai <cais@google.com> +LABEL maintainer="Shanqing Cai <cais@google.com>" # Pick up some TF dependencies RUN apt-get update && apt-get install -y \ diff --git a/tensorflow/tools/docker/Dockerfile.devel-gpu-cuda9-cudnn7 b/tensorflow/tools/docker/Dockerfile.devel-gpu-cuda9-cudnn7 index 4558bc5293..64ebc4607a 100644 --- a/tensorflow/tools/docker/Dockerfile.devel-gpu-cuda9-cudnn7 +++ b/tensorflow/tools/docker/Dockerfile.devel-gpu-cuda9-cudnn7 @@ -1,6 +1,6 @@ FROM nvidia/cuda:9.0-cudnn7-devel-ubuntu16.04 -MAINTAINER Gunhan Gulsoy <gunan@google.com> +LABEL maintainer="Gunhan Gulsoy <gunan@google.com>" # It is possible to override these for releases. ARG TF_BRANCH=master diff --git a/tensorflow/tools/gcs_test/Dockerfile b/tensorflow/tools/gcs_test/Dockerfile index 5af753226f..69b554047b 100644 --- a/tensorflow/tools/gcs_test/Dockerfile +++ b/tensorflow/tools/gcs_test/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:16.04 -MAINTAINER Shanqing Cai <cais@google.com> +LABEL maintainer="Shanqing Cai <cais@google.com>" RUN apt-get update RUN apt-get install -y \ diff --git a/tensorflow/tools/git/gen_git_source.py b/tensorflow/tools/git/gen_git_source.py index a7f8b5bb5f..0307d2a0eb 100755 --- a/tensorflow/tools/git/gen_git_source.py +++ b/tensorflow/tools/git/gen_git_source.py @@ -170,8 +170,16 @@ def write_version_info(filename, git_version): if b"\"" in git_version or b"\\" in git_version: git_version = "git_version_is_invalid" # do not cause build to fail! contents = """/* Generated by gen_git_source.py */ +#include <string> const char* tf_git_version() {return "%s";} const char* tf_compiler_version() {return __VERSION__;} +const int tf_cxx11_abi_flag() { +#ifdef _GLIBCXX_USE_CXX11_ABI + return _GLIBCXX_USE_CXX11_ABI; +#else + return 0; +#endif +} """ % git_version open(filename, "w").write(contents) diff --git a/tensorflow/tools/git/gen_git_source.sh b/tensorflow/tools/git/gen_git_source.sh index 977fe16333..788f9e6e57 100755 --- a/tensorflow/tools/git/gen_git_source.sh +++ b/tensorflow/tools/git/gen_git_source.sh @@ -26,7 +26,15 @@ if [[ $? != 0 ]]; then fi cat <<EOF > ${OUTPUT_FILENAME} +#include <string> const char* tf_git_version() {return "${GIT_VERSION}";} const char* tf_compiler_version() {return __VERSION__;} +const int tf_cxx11_abi_flag() { +#ifdef _GLIBCXX_USE_CXX11_ABI + return _GLIBCXX_USE_CXX11_ABI; +#else + return 0; +#endif +} EOF diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py index 4f0de8f768..071b3a2a18 100644 --- a/tensorflow/tools/pip_package/setup.py +++ b/tensorflow/tools/pip_package/setup.py @@ -29,7 +29,7 @@ from setuptools.dist import Distribution # This version string is semver compatible, but incompatible with pip. # For pip, we will remove all '-' characters from this string, and use the # result for pip. -_VERSION = '1.4.0-rc0' +_VERSION = '1.4.0-rc1' REQUIRED_PACKAGES = [ 'enum34 >= 1.1.6', |