From 88c1f97f89a3725c3a58b45bebc55305a8ce7e19 Mon Sep 17 00:00:00 2001 From: Austin Anderson Date: Fri, 24 Jul 2020 07:31:29 -0700 Subject: [PATCH] Remove extra libtensorflow.sh commands r1.15 does not have any libtensorflow builds in it -- I accidentally copied these. --- .../ci_build/rel/windows/libtensorflow_cpu.sh | 86 ------------------- .../ci_build/rel/windows/libtensorflow_gpu.sh | 86 ------------------- 2 files changed, 172 deletions(-) delete mode 100755 tensorflow/tools/ci_build/rel/windows/libtensorflow_cpu.sh delete mode 100644 tensorflow/tools/ci_build/rel/windows/libtensorflow_gpu.sh diff --git a/tensorflow/tools/ci_build/rel/windows/libtensorflow_cpu.sh b/tensorflow/tools/ci_build/rel/windows/libtensorflow_cpu.sh deleted file mode 100755 index e9f2a38e22eb46..00000000000000 --- a/tensorflow/tools/ci_build/rel/windows/libtensorflow_cpu.sh +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env bash -# 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. -# ============================================================================== -# -# Script to produce binary release of libtensorflow (C API, Java jars etc.). - -set -ex -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" - -# Setup environment for bazel builds -source "${SCRIPT_DIR}/bazel/common_env.sh" -source "${SCRIPT_DIR}/bazel/bazel_test_lib.sh" - -# Sanity check that this is being run from the root of the git repository. -cd ${SCRIPT_DIR}/../../../.. -if [ ! -e "WORKSPACE" ]; then - echo "Must run this from the root of the bazel workspace" - echo "Currently at ${PWD}, script is at ${SCRIPT_DIR}" - exit 1 -fi - -run_configure_for_cpu_build - -# build_libtensorflow_tarball in ../builds/libtensorflow.sh -# cannot be used on Windows since it relies on pkg_tar rules. -# So we do something special here -bazel --output_user_root=${TMPDIR} build -c opt --copt=/arch:AVX --announce_rc --config=short_logs \ - :LICENSE \ - tensorflow:tensorflow.dll \ - tensorflow:tensorflow_dll_import_lib \ - tensorflow/tools/lib_package:clicenses_generate \ - tensorflow/java:tensorflow_jni.dll \ - tensorflow/tools/lib_package:jnilicenses_generate - -DIR=lib_package -rm -rf ${DIR} -mkdir -p ${DIR} - -# Zip up the .dll and the LICENSE for the JNI library. -cp bazel-bin/tensorflow/java/tensorflow_jni.dll ${DIR}/tensorflow_jni.dll -zip -j ${DIR}/libtensorflow_jni-cpu-windows-$(uname -m).zip \ - ${DIR}/tensorflow_jni.dll \ - bazel-genfiles/tensorflow/tools/lib_package/include/tensorflow/THIRD_PARTY_TF_JNI_LICENSES \ - LICENSE -rm -f ${DIR}/tensorflow_jni.dll - -# Zip up the .dll, LICENSE and include files for the C library. -mkdir -p ${DIR}/include/tensorflow/c -mkdir -p ${DIR}/include/tensorflow/c/eager -mkdir -p ${DIR}/lib -cp bazel-bin/tensorflow/tensorflow.dll ${DIR}/lib/tensorflow.dll -cp bazel-genfiles/tensorflow/tensorflow.lib ${DIR}/lib/tensorflow.lib -cp tensorflow/c/c_api.h \ - tensorflow/c/tf_attrtype.h \ - tensorflow/c/tf_datatype.h \ - tensorflow/c/tf_status.h \ - tensorflow/c/tf_tensor.h \ - ${DIR}/include/tensorflow/c -cp tensorflow/c/eager/c_api.h ${DIR}/include/tensorflow/c/eager -cp LICENSE ${DIR}/LICENSE -cp bazel-genfiles/tensorflow/tools/lib_package/THIRD_PARTY_TF_C_LICENSES ${DIR}/ -cd ${DIR} -zip libtensorflow-cpu-windows-$(uname -m).zip \ - lib/tensorflow.dll \ - lib/tensorflow.lib \ - include/tensorflow/c/eager/c_api.h \ - include/tensorflow/c/c_api.h \ - include/tensorflow/c/tf_attrtype.h \ - include/tensorflow/c/tf_datatype.h \ - include/tensorflow/c/tf_status.h \ - include/tensorflow/c/tf_tensor.h \ - LICENSE \ - THIRD_PARTY_TF_C_LICENSES -rm -rf lib include diff --git a/tensorflow/tools/ci_build/rel/windows/libtensorflow_gpu.sh b/tensorflow/tools/ci_build/rel/windows/libtensorflow_gpu.sh deleted file mode 100644 index 237c9863ca5b64..00000000000000 --- a/tensorflow/tools/ci_build/rel/windows/libtensorflow_gpu.sh +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env bash -# Copyright 2019 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. -# ============================================================================== -# -# Script to produce binary release of libtensorflow (C API, Java jars etc.). - -set -ex -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" - -# Setup environment for bazel builds -source "${SCRIPT_DIR}/bazel/common_env.sh" -source "${SCRIPT_DIR}/bazel/bazel_test_lib.sh" - -# Sanity check that this is being run from the root of the git repository. -cd ${SCRIPT_DIR}/../../../.. -if [ ! -e "WORKSPACE" ]; then - echo "Must run this from the root of the bazel workspace" - echo "Currently at ${PWD}, script is at ${SCRIPT_DIR}" - exit 1 -fi - -run_configure_for_gpu_build - -# build_libtensorflow_tarball in ../builds/libtensorflow.sh -# cannot be used on Windows since it relies on pkg_tar rules. -# So we do something special here -bazel --output_user_root=${TMPDIR} build -c opt --copt=/arch:AVX --announce_rc --config=short_logs \ - :LICENSE \ - tensorflow:tensorflow.dll \ - tensorflow:tensorflow_dll_import_lib \ - tensorflow/tools/lib_package:clicenses_generate \ - tensorflow/java:tensorflow_jni.dll \ - tensorflow/tools/lib_package:jnilicenses_generate - -DIR=lib_package -rm -rf ${DIR} -mkdir -p ${DIR} - -# Zip up the .dll and the LICENSE for the JNI library. -cp bazel-bin/tensorflow/java/tensorflow_jni.dll ${DIR}/tensorflow_jni.dll -zip -j ${DIR}/libtensorflow_jni-gpu-windows-$(uname -m).zip \ - ${DIR}/tensorflow_jni.dll \ - bazel-genfiles/tensorflow/tools/lib_package/include/tensorflow/THIRD_PARTY_TF_JNI_LICENSES \ - LICENSE -rm -f ${DIR}/tensorflow_jni.dll - -# Zip up the .dll, LICENSE and include files for the C library. -mkdir -p ${DIR}/include/tensorflow/c -mkdir -p ${DIR}/include/tensorflow/c/eager -mkdir -p ${DIR}/lib -cp bazel-bin/tensorflow/tensorflow.dll ${DIR}/lib/tensorflow.dll -cp bazel-genfiles/tensorflow/tensorflow.lib ${DIR}/lib/tensorflow.lib -cp tensorflow/c/c_api.h \ - tensorflow/c/tf_attrtype.h \ - tensorflow/c/tf_datatype.h \ - tensorflow/c/tf_status.h \ - tensorflow/c/tf_tensor.h \ - ${DIR}/include/tensorflow/c -cp tensorflow/c/eager/c_api.h ${DIR}/include/tensorflow/c/eager -cp LICENSE ${DIR}/LICENSE -cp bazel-genfiles/tensorflow/tools/lib_package/THIRD_PARTY_TF_C_LICENSES ${DIR}/ -cd ${DIR} -zip libtensorflow-gpu-windows-$(uname -m).zip \ - lib/tensorflow.dll \ - lib/tensorflow.lib \ - include/tensorflow/c/eager/c_api.h \ - include/tensorflow/c/c_api.h \ - include/tensorflow/c/tf_attrtype.h \ - include/tensorflow/c/tf_datatype.h \ - include/tensorflow/c/tf_status.h \ - include/tensorflow/c/tf_tensor.h \ - LICENSE \ - THIRD_PARTY_TF_C_LICENSES -rm -rf lib include