diff options
| author |  Patrick Nguyen <drpng@google.com> | 2016-10-20 21:14:42 -0700 |
|---|---|---|
| committer | Patrick Nguyen <drpng@google.com> | 2016-10-20 21:14:42 -0700 |
| commit | 38607332e04f0ac32828f8ffe5f2fea3c64a22d1 (patch) | |
| tree | 84ae6ba87535fb88d87736f09f0bd4f2cc7e2efd /tensorflow/tools/swig | |
| parent | 550bd6d4e855d06faee89bb3745bf39a930183df (diff) | |
| parent | fb62931fefbd94eef16b17022cd4f057ed8cabbb (diff) | |
Merge commit for internal changes
* Same as backward-merge:
- .gitignore: merged.
- tensorflow/contrib/distributions/python/ops/beta.py
* contrib/cmake: keep HEAD and /MP option.
* port.cc: keep both includes.
* tensor_bundle/BUILD: keep additional no-warning flag.
* md files: override gitbub with internal change.
* tensorflow/stream_executor/dso_loader.cc: delete unused dynload_flags.
* tensorflow/tools/pip_package/simple_console_for_windows.py: keep version without carriage returns
* tensorflow/configure: keep ours (136269932)
* tensorflow.bzl: keep ours (136269932), all 3 places.
Diffstat (limited to 'tensorflow/tools/swig')
| -rwxr-xr-x | tensorflow/tools/swig/swig.sh | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/tensorflow/tools/swig/swig.sh b/tensorflow/tools/swig/swig.sh deleted file mode 100755 index 941c4b20e9..0000000000 --- a/tensorflow/tools/swig/swig.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash -# Copyright 2015 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. -# ============================================================================== - -# If possible, read swig path out of "swig_path" generated by configure -SWIG=swig -SWIG_PATH=tensorflow/tools/swig/swig_path -if [ -e $SWIG_PATH ]; then - SWIG=`cat $SWIG_PATH` -fi - -# If this line fails, rerun configure to set the path to swig correctly -"$SWIG" "$@" |