From a24994925c01d5bd98c64c4532e72159807799b7 Mon Sep 17 00:00:00 2001 From: "A. Unique TensorFlower" <gardener@tensorflow.org> Date: Tue, 19 Sep 2017 10:45:51 -0700 Subject: [PATCH] Fix build errors caused by #12502 PiperOrigin-RevId: 169264011 --- tensorflow/tools/ci_build/copy_binary.py | 129 -------------------- tensorflow/tools/test/check_futures_test.py | 1 - 2 files changed, 130 deletions(-) delete mode 100755 tensorflow/tools/ci_build/copy_binary.py diff --git a/tensorflow/tools/ci_build/copy_binary.py b/tensorflow/tools/ci_build/copy_binary.py deleted file mode 100755 index 90fd6a6e71f..00000000000 --- a/tensorflow/tools/ci_build/copy_binary.py +++ /dev/null @@ -1,129 +0,0 @@ -#!/usr/bin/python -# Copyright 2017 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. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============================================================================== -# -# Automatically copy TensorFlow binaries -# -# Usage: -# ./tensorflow/tools/ci_build/copy_binary.py --filename -# tf_nightly/tf_nightly_gpu-1.4.0.dev20170914-cp35-cp35m-manylinux1_x86_64.whl -# --new_py_ver 36 -# -"""Copy binaries of TensorFlow for different python versions.""" - -# pylint: disable=superfluous-parens - -import argparse -import os -import re -import shutil -import subprocess -import zipfile - -UNZIP_CMD = "/usr/bin/unzip" -ZIP_CMD = "/usr/bin/zip" -SED_CMD = "/bin/sed" - -TF_NIGHTLY_REGEX = r"(.+)tf_nightly(|_gpu)-(\d\.\d\.\d.dev[\d]{0,8})-(.+)\.whl" -BINARY_STRING_TEMPLATE = "%s-%s-%s.whl" - - -def check_existence(filename): - """Check the existence of file or dir.""" - if not os.path.exists(filename): - raise RuntimeError("%s not found.") - - -def copy_binary(directory, origin_tag, new_tag, version, gpu=False): - """Rename and copy binaries for different python versions. - - Arguments: - directory: string of directory - origin_tag: str of the old python version tag - new_tag: str of the new tag - version: the version of the package - gpu: bool if its a gpu build or not - - """ - print("Rename and copy binaries with %s to %s." % (origin_tag, new_tag)) - if gpu: - package = "tf_nightly_gpu" - else: - package = "tf_nightly" - origin_binary = BINARY_STRING_TEMPLATE % (package, version, origin_tag) - new_binary = BINARY_STRING_TEMPLATE % (package, version, new_tag) - zip_ref = zipfile.ZipFile(directory + origin_binary, "r") - zip_ref.extractall() - zip_ref.close() - old_py_ver = re.search(r"(cp\d\d-cp\d\d)", origin_tag).group(1) - new_py_ver = re.search(r"(cp\d\d-cp\d\d)", new_tag).group(1) - subprocess.check_call( - "%s -i s/%s/%s/g %s-%s.dist-info/WHEEL" % (SED_CMD, old_py_ver, - new_py_ver, package, version), - shell=True) - zout = zipfile.ZipFile(directory + new_binary, "w", zipfile.ZIP_DEFLATED) - zip_these_files = [ - "%s-%s.dist-info" % (package, version), - "%s-%s.data" % (package, version) - ] - for dirname in zip_these_files: - for root, _, files in os.walk(dirname): - for filename in files: - zout.write(os.path.join(root, filename)) - zout.close() - for dirname in zip_these_files: - shutil.rmtree(dirname) - - -def main(): - """This script copies binaries. - - Requirements: - filename: The path to the whl file - AND - new_py_ver: Create a nightly tag with current date - - Raises: - RuntimeError: If the whl file was not found - """ - - parser = argparse.ArgumentParser(description="Cherry picking automation.") - - # Arg information - parser.add_argument( - "--filename", help="path to whl file we are copying", required=True) - parser.add_argument( - "--new_py_ver", help="two digit py version eg. 27 or 33", required=True) - - args = parser.parse_args() - - # Argument checking - check_existence(args.filename) - regex_groups = re.search(TF_NIGHTLY_REGEX, args.filename) - directory = regex_groups.group(1) - gpu = regex_groups.group(2) - version = regex_groups.group(3) - origin_tag = regex_groups.group(4) - old_py_ver = re.search(r"(cp\d\d)", origin_tag).group(1) - - # Create new tags - new_tag = origin_tag.replace(old_py_ver, "cp" + args.new_py_ver) - - # Copy the binary with the info we have - copy_binary(directory, origin_tag, new_tag, version, gpu) - - -if __name__ == "__main__": - main() diff --git a/tensorflow/tools/test/check_futures_test.py b/tensorflow/tools/test/check_futures_test.py index 1c07511888d..652c1eeb0ff 100644 --- a/tensorflow/tools/test/check_futures_test.py +++ b/tensorflow/tools/test/check_futures_test.py @@ -43,7 +43,6 @@ WHITELIST = [ 'python/platform/control_imports.py', 'tools/docker/jupyter_notebook_config.py', 'tools/ci_build/update_version.py', - 'tools/ci_build/copy_binary.py', ] # Tests that must *not* import division