Skip to content

Commit

Permalink
Mechanical replacement of download.tensorflow.org with https equivalent.
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 259862509
  • Loading branch information
Frank Chen authored and tensorflower-gardener committed Jul 25, 2019
1 parent f6c9784 commit 57e0d1a
Show file tree
Hide file tree
Showing 19 changed files with 87 additions and 85 deletions.
10 changes: 5 additions & 5 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ http_archive(
sha256 = "7efe12a8363f09bc24d7b7a450304a15655a57a7751929b2c1593a71183bb105",
urls = [
"http://storage.googleapis.com/download.tensorflow.org/models/inception_v1.zip",
"http://download.tensorflow.org/models/inception_v1.zip",
"https://storage.googleapis.com/download.tensorflow.org/models/inception_v1.zip",
],
)

Expand All @@ -115,7 +115,7 @@ http_archive(
sha256 = "bddd81ea5c80a97adfac1c9f770e6f55cbafd7cce4d3bbe15fbeb041e6b8f3e8",
urls = [
"http://storage.googleapis.com/download.tensorflow.org/models/object_detection/ssd_mobilenet_v1_android_export.zip",
"http://download.tensorflow.org/models/object_detection/ssd_mobilenet_v1_android_export.zip",
"https://storage.googleapis.com/download.tensorflow.org/models/object_detection/ssd_mobilenet_v1_android_export.zip",
],
)

Expand All @@ -125,7 +125,7 @@ http_archive(
sha256 = "859edcddf84dddb974c36c36cfc1f74555148e9c9213dedacf1d6b613ad52b96",
urls = [
"http://storage.googleapis.com/download.tensorflow.org/models/mobile_multibox_v1a.zip",
"http://download.tensorflow.org/models/mobile_multibox_v1a.zip",
"https://storage.googleapis.com/download.tensorflow.org/models/mobile_multibox_v1a.zip",
],
)

Expand All @@ -135,7 +135,7 @@ http_archive(
sha256 = "3d374a730aef330424a356a8d4f04d8a54277c425e274ecb7d9c83aa912c6bfa",
urls = [
"http://storage.googleapis.com/download.tensorflow.org/models/stylize_v1.zip",
"http://download.tensorflow.org/models/stylize_v1.zip",
"https://storage.googleapis.com/download.tensorflow.org/models/stylize_v1.zip",
],
)

Expand All @@ -145,6 +145,6 @@ http_archive(
sha256 = "c3ec4fea3158eb111f1d932336351edfe8bd515bb6e87aad4f25dbad0a600d0c",
urls = [
"http://storage.googleapis.com/download.tensorflow.org/models/speech_commands_v0.01.zip",
"http://download.tensorflow.org/models/speech_commands_v0.01.zip",
"https://storage.googleapis.com/download.tensorflow.org/models/speech_commands_v0.01.zip",
],
)
12 changes: 6 additions & 6 deletions tensorflow/compiler/mlir/tensorflow/ir/control_flow_ops.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class TFControlType : public Type::TypeBase<TFControlType, Type> {
// tensor needs its own _tf.Enter to be made available inside the while loop.
//
// More details can be found in Tensorflow Controlflow white paper:
// http://download.tensorflow.org/paper/white_paper_tf_control_flow_implementation_2017_11_1.pdf
// https://storage.googleapis.com/download.tensorflow.org/paper/white_paper_tf_control_flow_implementation_2017_11_1.pdf
//
// This is defined in Tensorflow as:
//
Expand Down Expand Up @@ -100,7 +100,7 @@ class EnterOp
// of the operand type along with the index of the first match encountered.
//
// More details can be found in Tensorflow Controlflow white paper:
// http://download.tensorflow.org/paper/white_paper_tf_control_flow_implementation_2017_11_1.pdf
// https://storage.googleapis.com/download.tensorflow.org/paper/white_paper_tf_control_flow_implementation_2017_11_1.pdf
//
// This is defined in TensorFlow as:
//
Expand Down Expand Up @@ -130,7 +130,7 @@ class MergeOp : public Op<MergeOp, OpTrait::VariadicOperands,
// of a while loop. Each loop variable needs its own NextIteration op.
//
// More details can be found in Tensorflow Controlflow white paper:
// http://download.tensorflow.org/paper/white_paper_tf_control_flow_implementation_2017_11_1.pdf
// https://storage.googleapis.com/download.tensorflow.org/paper/white_paper_tf_control_flow_implementation_2017_11_1.pdf
//
// NextIteration op is broken into _tf.NextIteration.sink and
// _tf.NextIteration.source because NextIteration is a back-edge in Tensorflow
Expand Down Expand Up @@ -182,7 +182,7 @@ class NextIterationSinkOp
// Tensorflow while loops.
//
// More details can be found in Tensorflow Controlflow white paper:
// http://download.tensorflow.org/paper/white_paper_tf_control_flow_implementation_2017_11_1.pdf
// https://storage.googleapis.com/download.tensorflow.org/paper/white_paper_tf_control_flow_implementation_2017_11_1.pdf
//
// This is defined in Tensorflow as:
//
Expand Down Expand Up @@ -212,7 +212,7 @@ class LoopCondOp
// condition, and returns two values matching the type of the data predicate.
//
// More details can be found in Tensorflow Controlflow white paper:
// http://download.tensorflow.org/paper/white_paper_tf_control_flow_implementation_2017_11_1.pdf
// https://storage.googleapis.com/download.tensorflow.org/paper/white_paper_tf_control_flow_implementation_2017_11_1.pdf
//
// This is defined in TensorFlow as:
//
Expand Down Expand Up @@ -246,7 +246,7 @@ class SwitchOp : public Op<SwitchOp, OpTrait::AtLeastNOperands<2>::Impl,
// outside of loop. Each returned tensor needs its own _tf.Exit.
//
// More details can be found in Tensorflow Controlflow white paper:
// http://download.tensorflow.org/paper/white_paper_tf_control_flow_implementation_2017_11_1.pdf
// https://storage.googleapis.com/download.tensorflow.org/paper/white_paper_tf_control_flow_implementation_2017_11_1.pdf
//
// This is defined in Tensorflow as:
//
Expand Down
14 changes: 7 additions & 7 deletions tensorflow/compiler/mlir/tensorflow/ir/tf_executor_ops.td
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ def TfExecutor_SwitchOp : TfExecutor_Op<"Switch",

let description = [{
More details can be found in Tensorflow Control Flow white paper:
http://download.tensorflow.org/paper/white_paper_tf_control_flow_implementation_2017_11_1.pdf
https://storage.googleapis.com/download.tensorflow.org/paper/white_paper_tf_control_flow_implementation_2017_11_1.pdf

This is defined in TensorFlow as:

Expand Down Expand Up @@ -302,7 +302,7 @@ def TfExecutor_MergeOp : TfExecutor_Op<"Merge", [NoSideEffect, ControlOperandsAf

let description = [{
More details can be found in Tensorflow Control Flow white paper:
http://download.tensorflow.org/paper/white_paper_tf_control_flow_implementation_2017_11_1.pdf
https://storage.googleapis.com/download.tensorflow.org/paper/white_paper_tf_control_flow_implementation_2017_11_1.pdf

This is defined in TensorFlow as:

Expand Down Expand Up @@ -339,7 +339,7 @@ def TfExecutor_EnterOp : TfExecutor_Op<"Enter",

let description = [{
More details can be found in Tensorflow Control Flow white paper:
http://download.tensorflow.org/paper/white_paper_tf_control_flow_implementation_2017_11_1.pdf
https://storage.googleapis.com/download.tensorflow.org/paper/white_paper_tf_control_flow_implementation_2017_11_1.pdf

Each tensor needs its own tf_executor.Enter to be made available inside a
while loop.
Expand Down Expand Up @@ -390,7 +390,7 @@ def TfExecutor_NextIterationSourceOp : TfExecutor_Op<"NextIteration.Source", [No
of a while loop. Each loop variable needs its own NextIteration op.

More details can be found in Tensorflow Control Flow white paper:
http://download.tensorflow.org/paper/white_paper_tf_control_flow_implementation_2017_11_1.pdf
https://storage.googleapis.com/download.tensorflow.org/paper/white_paper_tf_control_flow_implementation_2017_11_1.pdf

In the TF executor dialect, the NextIteration op is broken into
tf_executor.NextIteration.sink and tf_executor.NextIteration.source because
Expand Down Expand Up @@ -447,7 +447,7 @@ def TfExecutor_NextIterationSinkOp : TfExecutor_Op<"NextIteration.Sink"> {
of a while loop. Each loop variable needs its own NextIteration op.

More details can be found in Tensorflow Control Flow white paper:
http://download.tensorflow.org/paper/white_paper_tf_control_flow_implementation_2017_11_1.pdf
https://storage.googleapis.com/download.tensorflow.org/paper/white_paper_tf_control_flow_implementation_2017_11_1.pdf

In the TF executor dialect, the NextIteration op is broken into
tf_executor.NextIteration.sink and tf_executor.NextIteration.source because
Expand Down Expand Up @@ -507,7 +507,7 @@ def TfExecutor_ExitOp : TfExecutor_Op<"Exit",

let description = [{
More details can be found in Tensorflow Control Flow white paper:
http://download.tensorflow.org/paper/white_paper_tf_control_flow_implementation_2017_11_1.pdf
https://storage.googleapis.com/download.tensorflow.org/paper/white_paper_tf_control_flow_implementation_2017_11_1.pdf

This is defined in Tensorflow as:

Expand Down Expand Up @@ -579,7 +579,7 @@ def TfExecutor_LoopCondOp : TfExecutor_Op<"LoopCond", [NoSideEffect]> {

let description = [{
More details can be found in Tensorflow Control Flow white paper:
http://download.tensorflow.org/paper/white_paper_tf_control_flow_implementation_2017_11_1.pdf
https://storage.googleapis.com/download.tensorflow.org/paper/white_paper_tf_control_flow_implementation_2017_11_1.pdf

This is defined in Tensorflow as:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
"source": [
"# Download the file\n",
"path_to_zip = tf.keras.utils.get_file(\n",
" 'spa-eng.zip', origin='http://download.tensorflow.org/data/spa-eng.zip', \n",
" 'spa-eng.zip', origin='https://storage.googleapis.com/download.tensorflow.org/data/spa-eng.zip', \n",
" extract=True)\n",
"\n",
"path_to_file = os.path.dirname(path_to_zip)+\"/spa-eng/spa.txt\""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
'INCEPTION_DEFAULT_IMAGE_SIZE',
]

INCEPTION_URL = 'http://download.tensorflow.org/models/frozen_inception_v1_2015_12_05.tar.gz'
INCEPTION_URL = 'https://storage.googleapis.com/download.tensorflow.org/models/frozen_inception_v1_2015_12_05.tar.gz'
INCEPTION_FROZEN_GRAPH = 'inceptionv1_for_inception_score.pb'
INCEPTION_INPUT = 'Mul:0'
INCEPTION_OUTPUT = 'logits:0'
Expand Down Expand Up @@ -123,7 +123,7 @@ def preprocess_image(images,
"""Prepare a batch of images for evaluation.
This is the preprocessing portion of the graph from
http://download.tensorflow.org/models/image/imagenet/inception-2015-12-05.tgz.
https://storage.googleapis.com/download.tensorflow.org/models/image/imagenet/inception-2015-12-05.tgz.
Note that it expects Tensors in [0, 255]. This function maps pixel values to
[-1, 1] and resizes to match the InceptionV1 network.
Expand Down
2 changes: 1 addition & 1 deletion tensorflow/contrib/makefile/download_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ replace_by_sed 's#static uint32x2_t p2ui_CONJ_XOR = vld1_u32( conj_XOR_DATA );#s
replace_by_sed 's#static uint64x2_t p2ul_CONJ_XOR = vld1q_u64( p2ul_conj_XOR_DATA );#static uint64x2_t p2ul_CONJ_XOR;// = vld1q_u64( p2ul_conj_XOR_DATA ); - Removed by script#' \
"${DOWNLOADS_DIR}/eigen/Eigen/src/Core/arch/NEON/Complex.h"
# TODO(satok): Remove this once protobuf/autogen.sh is fixed.
replace_by_sed 's#https://googlemock.googlecode.com/files/gmock-1.7.0.zip#http://download.tensorflow.org/deps/gmock-1.7.0.zip#' \
replace_by_sed 's#https://googlemock.googlecode.com/files/gmock-1.7.0.zip#https://storage.googleapis.com/download.tensorflow.org/deps/gmock-1.7.0.zip#' \
"${DOWNLOADS_DIR}/protobuf/autogen.sh"
cat "third_party/eigen3/gebp_neon.patch" | patch "${DOWNLOADS_DIR}/eigen/Eigen/src/Core/products/GeneralBlockPanelKernel.h"

Expand Down
6 changes: 4 additions & 2 deletions tensorflow/examples/android/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ on API >= 14 devices.

## Prebuilt Components:

The fastest path to trying the demo is to download the [prebuilt demo APK](http://download.tensorflow.org/deps/tflite/TfLiteCameraDemo.apk).
The fastest path to trying the demo is to download the [prebuilt demo APK](https://storage.googleapis.com/download.tensorflow.org/deps/tflite/TfLiteCameraDemo.apk).

Also available are precompiled native libraries, and a jcenter package that you
may simply drop into your own applications. See
Expand Down Expand Up @@ -109,7 +109,9 @@ protobuf compilation.

NOTE: Bazel does not currently support building for Android on Windows. Full
support for gradle/cmake builds is coming soon, but in the meantime we suggest
that Windows users download the [prebuilt demo APK](http://download.tensorflow.org/deps/tflite/TfLiteCameraDemo.apk) instead.
that Windows users download the
[prebuilt demo APK](https://storage.googleapis.com/download.tensorflow.org/deps/tflite/TfLiteCameraDemo.apk)
instead.

##### Install Bazel and Android Prerequisites

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ def main(_):
'--data_url',
type=str,
# pylint: disable=line-too-long
default='http://download.tensorflow.org/data/speech_commands_v0.01.tar.gz',
default='https://storage.googleapis.com/download.tensorflow.org/data/speech_commands_v0.01.tar.gz',
# pylint: enable=line-too-long
help='Location of speech training data')
parser.add_argument(
Expand Down
2 changes: 1 addition & 1 deletion tensorflow/examples/speech_commands/train.py
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ def main(_):
'--data_url',
type=str,
# pylint: disable=line-too-long
default='http://download.tensorflow.org/data/speech_commands_v0.02.tar.gz',
default='https://storage.googleapis.com/download.tensorflow.org/data/speech_commands_v0.02.tar.gz',
# pylint: enable=line-too-long
help='Location of speech training data archive on the web.')
parser.add_argument(
Expand Down
4 changes: 2 additions & 2 deletions tensorflow/lite/examples/ios/download_models.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
set -ex

SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
FLOAT_MODEL_URL="http://download.tensorflow.org/models/mobilenet_v1_2018_02_22/mobilenet_v1_1.0_224.tgz"
QUANTIZED_MODEL_URL="http://download.tensorflow.org/models/mobilenet_v1_2018_08_02/mobilenet_v1_1.0_224_quant.tgz"
FLOAT_MODEL_URL="https://storage.googleapis.com/download.tensorflow.org/models/mobilenet_v1_2018_02_22/mobilenet_v1_1.0_224.tgz"
QUANTIZED_MODEL_URL="https://storage.googleapis.com/download.tensorflow.org/models/mobilenet_v1_2018_08_02/mobilenet_v1_1.0_224_quant.tgz"
DOWNLOADS_DIR=$(mktemp -d)

cd "$SCRIPT_DIR"
Expand Down
2 changes: 1 addition & 1 deletion tensorflow/lite/examples/python/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ a good demonstration of a model trained to recognize 1,000 different objects.
# Get photo
curl https://raw.githubusercontent.com/tensorflow/tensorflow/master/tensorflow/lite/examples/label_image/testdata/grace_hopper.bmp > /tmp/grace_hopper.bmp
# Get model
curl http://download.tensorflow.org/models/mobilenet_v1_2018_02_22/mobilenet_v1_1.0_224.tgz | tar xzv -C /tmp
curl https://storage.googleapis.com/download.tensorflow.org/models/mobilenet_v1_2018_02_22/mobilenet_v1_1.0_224.tgz | tar xzv -C /tmp
# Get labels
curl https://storage.googleapis.com/download.tensorflow.org/models/mobilenet_v1_1.0_224_frozen.tgz | tar xzv -C /tmp mobilenet_v1_1.0_224/labels.txt
Expand Down
Loading

0 comments on commit 57e0d1a

Please sign in to comment.