Merge pull request PaddlePaddle#16457 from tianshuo78520a/change_cdn

test=release1.3
wickai · Mar 26, 2019 · 845f36c · 845f36c
2 parents e44a25b + e307718
commit 845f36c
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 19 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -75,7 +75,7 @@ RUN curl -s -q https://glide.sh/get | sh
 # and its size is only one-third of the official one.
 # 2. Manually add ~IPluginFactory() in IPluginFactory class of NvInfer.h, otherwise, it couldn't work in paddle.
 # See https://github.com/PaddlePaddle/Paddle/issues/10129 for details.
-RUN wget -qO- http:https://paddlepaddledeps.cdn.bcebos.com/TensorRT-4.0.0.3.Ubuntu-16.04.4.x86_64-gnu.cuda-8.0.cudnn7.0.tar.gz | \
+RUN wget -qO- http:https://paddlepaddledeps.bj.bcebos.com/TensorRT-4.0.0.3.Ubuntu-16.04.4.x86_64-gnu.cuda-8.0.cudnn7.0.tar.gz | \
  tar -xz -C /usr/local && \
  cp -rf /usr/local/TensorRT/include /usr && \
  cp -rf /usr/local/TensorRT/lib /usr

diff --git a/cmake/external/boost.cmake b/cmake/external/boost.cmake
@@ -24,7 +24,7 @@ set(BOOST_PROJECT "extern_boost")
 # So we use 1.41.0 here.
 set(BOOST_VER "1.41.0")
 set(BOOST_TAR "boost_1_41_0" CACHE STRING "" FORCE)
-set(BOOST_URL "http:https://paddlepaddledeps.cdn.bcebos.com/${BOOST_TAR}.tar.gz" CACHE STRING "" FORCE)
+set(BOOST_URL "http:https://paddlepaddledeps.bj.bcebos.com/${BOOST_TAR}.tar.gz" CACHE STRING "" FORCE)
 
 MESSAGE(STATUS "BOOST_TAR: ${BOOST_TAR}, BOOST_URL: ${BOOST_URL}")
 

diff --git a/cmake/external/grpc.cmake b/cmake/external/grpc.cmake
@@ -44,7 +44,7 @@ ExternalProject_Add(
  # 3. keep only zlib, cares, protobuf, boringssl under "third_party",
  # checkout and clean other dirs under third_party
  # 4. remove .git, and package the directory.
- URL "http:https://paddlepaddledeps.cdn.bcebos.com/grpc-v1.10.x.tar.gz"
+ URL "http:https://paddlepaddledeps.bj.bcebos.com/grpc-v1.10.x.tar.gz"
  URL_MD5 "1f268a2aff6759839dccd256adcc91cf"
  PREFIX ${GRPC_SOURCES_DIR}
  UPDATE_COMMAND ""

diff --git a/cmake/external/mklml.cmake b/cmake/external/mklml.cmake
@@ -34,14 +34,14 @@ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH}" "${MKLML_ROOT}/lib")
 SET(TIME_VERSION "2019.0.1.20181227")
 IF(WIN32)
  SET(MKLML_VER "mklml_win_${TIME_VERSION}" CACHE STRING "" FORCE)
- SET(MKLML_URL "https://paddlepaddledeps.cdn.bcebos.com/${MKLML_VER}.zip" CACHE STRING "" FORCE)
+ SET(MKLML_URL "https://paddlepaddledeps.bj.bcebos.com/${MKLML_VER}.zip" CACHE STRING "" FORCE)
  SET(MKLML_LIB ${MKLML_LIB_DIR}/mklml.lib)
  SET(MKLML_IOMP_LIB ${MKLML_LIB_DIR}/libiomp5md.lib)
  SET(MKLML_SHARED_LIB ${MKLML_LIB_DIR}/mklml.dll)
  SET(MKLML_SHARED_IOMP_LIB ${MKLML_LIB_DIR}/libiomp5md.dll)
 ELSE() 
  SET(MKLML_VER "mklml_lnx_${TIME_VERSION}" CACHE STRING "" FORCE)
- SET(MKLML_URL "http:https://paddlepaddledeps.cdn.bcebos.com/${MKLML_VER}.tgz" CACHE STRING "" FORCE)
+ SET(MKLML_URL "http:https://paddlepaddledeps.bj.bcebos.com/${MKLML_VER}.tgz" CACHE STRING "" FORCE)
  SET(MKLML_LIB ${MKLML_LIB_DIR}/libmklml_intel.so)
  SET(MKLML_IOMP_LIB ${MKLML_LIB_DIR}/libiomp5.so)
  SET(MKLML_SHARED_LIB ${MKLML_LIB_DIR}/libmklml_intel.so)

diff --git a/paddle/fluid/inference/api/demo_ci/run.sh b/paddle/fluid/inference/api/demo_ci/run.sh
@@ -27,7 +27,7 @@ if [ -d "$TENSORRT_INCLUDE_DIR" -a -d "$TENSORRT_LIB_DIR" ]; then
 fi
 
 PREFIX=inference-vis-demos%2F
-URL_ROOT=http:https://paddlemodels.cdn.bcebos.com/${PREFIX}
+URL_ROOT=http:https://paddlemodels.bj.bcebos.com/${PREFIX}
 
 # download vis_demo data
 function download() {

diff --git a/paddle/fluid/inference/tests/api/CMakeLists.txt b/paddle/fluid/inference/tests/api/CMakeLists.txt
@@ -105,14 +105,14 @@ inference_analysis_api_test(test_analyzer_seq_conv1 ${SEQ_CONV1_INSTALL_DIR} ana
 # ocr
 set(OCR_INSTALL_DIR "${INFERENCE_DEMO_INSTALL_DIR}/ocr")
 if (NOT EXISTS ${OCR_INSTALL_DIR})
- inference_download_and_uncompress(${OCR_INSTALL_DIR} "http:https://paddlemodels.cdn.bcebos.com/" "inference-vis-demos%2Focr.tar.gz")
+ inference_download_and_uncompress(${OCR_INSTALL_DIR} "http:https://paddlemodels.bj.bcebos.com/" "inference-vis-demos%2Focr.tar.gz")
 endif()
 inference_analysis_api_test_with_refer_result(test_analyzer_ocr ${OCR_INSTALL_DIR} analyzer_vis_tester.cc SERIAL)
 
 # mobilenet with transpose op
 set(MOBILENET_INSTALL_DIR "${INFERENCE_DEMO_INSTALL_DIR}/mobilenet")
 if (NOT EXISTS ${MOBILENET_INSTALL_DIR})
- inference_download_and_uncompress(${MOBILENET_INSTALL_DIR} "http:https://paddlemodels.cdn.bcebos.com/" "inference-vis-demos%2Fmobilenet.tar.gz")
+ inference_download_and_uncompress(${MOBILENET_INSTALL_DIR} "http:https://paddlemodels.bj.bcebos.com/" "inference-vis-demos%2Fmobilenet.tar.gz")
 endif()
 inference_analysis_api_test_with_refer_result(test_analyzer_mobilenet_transpose ${MOBILENET_INSTALL_DIR} analyzer_vis_tester.cc SERIAL)
 

diff --git a/paddle/fluid/inference/tests/test.cmake b/paddle/fluid/inference/tests/test.cmake
@@ -1,4 +1,4 @@
-set(INFERENCE_URL "http:https://paddle-inference-dist.cdn.bcebos.com" CACHE STRING "inference download url")
+set(INFERENCE_URL "http:https://paddle-inference-dist.bj.bcebos.com" CACHE STRING "inference download url")
 set(INFERENCE_DEMO_INSTALL_DIR "${THIRD_PARTY_PATH}/inference_demo" CACHE STRING
  "A path setting inference demo download directories.")
 function (inference_download install_dir url filename)

diff --git a/python/paddle/dataset/flowers.py b/python/paddle/dataset/flowers.py
@@ -46,9 +46,9 @@
 from six.moves import cPickle as pickle
 __all__ = ['train', 'test', 'valid']
 
-DATA_URL = 'http:https://paddlemodels.cdn.bcebos.com/flowers/102flowers.tgz'
-LABEL_URL = 'http:https://paddlemodels.cdn.bcebos.com/flowers/imagelabels.mat'
-SETID_URL = 'http:https://paddlemodels.cdn.bcebos.com/flowers/setid.mat'
+DATA_URL = 'http:https://paddlemodels.bj.bcebos.com/flowers/102flowers.tgz'
+LABEL_URL = 'http:https://paddlemodels.bj.bcebos.com/flowers/imagelabels.mat'
+SETID_URL = 'http:https://paddlemodels.bj.bcebos.com/flowers/setid.mat'
 DATA_MD5 = '52808999861908f626f3c1f4e79d11fa'
 LABEL_MD5 = 'e0620be6f572b9609742df49c70aed4d'
 SETID_MD5 = 'a5357ecc9cb78c4bef273ce3793fc85c'

diff --git a/python/paddle/dataset/wmt14.py b/python/paddle/dataset/wmt14.py
@@ -15,7 +15,7 @@
 WMT14 dataset.
 The original WMT14 dataset is too large and a small set of data for set is
 provided. This module will download dataset from
-http:https://paddlepaddle.cdn.bcebos.com/demo/wmt_shrinked_data/wmt14.tgz and
+http:https://paddlepaddle.bj.bcebos.com/demo/wmt_shrinked_data/wmt14.tgz and
 parse training set and test set into paddle reader creators.
 
 """

diff --git a/python/paddle/fluid/contrib/int8_inference/README.md b/python/paddle/fluid/contrib/int8_inference/README.md
@@ -54,7 +54,7 @@ We provide the results of accuracy measurd on [Intel® Xeon® Platinum Gold Proc
 | ResNet-50 | Full ImageNet Val | 76.63% | 76.17% | 0.46% |
 | MobileNet-V1 | Full ImageNet Val | 70.78% | 70.49% | 0.29% |
 
-Please note that [Small](http:https://paddle-inference-dist.cdn.bcebos.com/int8/calibration_test_data.tar.gz "Small") is a subset of [full ImageNet validation dataset](http:https://www.image-net.org/challenges/LSVRC/2012/nnoupb/ILSVRC2012_img_val.tar "full ImageNet validation dataset"). 
+Please note that [Small](http:https://paddle-inference-dist.bj.bcebos.com/int8/calibration_test_data.tar.gz "Small") is a subset of [full ImageNet validation dataset](http:https://www.image-net.org/challenges/LSVRC/2012/nnoupb/ILSVRC2012_img_val.tar "full ImageNet validation dataset"). 
 
 Notes:
 * The accuracy measurement requires the model with `label`.

diff --git a/python/paddle/fluid/contrib/tests/test_calibration.py b/python/paddle/fluid/contrib/tests/test_calibration.py
@@ -136,7 +136,7 @@ def setUp(self):
  "full_data", False)
  else:
  data_urls.append(
- 'http:https://paddle-inference-dist.cdn.bcebos.com/int8/calibration_test_data.tar.gz'
+ 'http:https://paddle-inference-dist.bj.bcebos.com/int8/calibration_test_data.tar.gz'
  )
  data_md5s.append('1b6c1c434172cca1bf9ba1e4d7a3157d')
  self.data_cache_folder = self.download_data(data_urls, data_md5s,
@@ -189,7 +189,7 @@ def download_data(self, data_urls, data_md5s, folder_name, is_model=True):
  def download_model(self):
  # resnet50 fp32 data
  data_urls = [
- 'http:https://paddle-inference-dist.cdn.bcebos.com/int8/resnet50_int8_model.tar.gz'
+ 'http:https://paddle-inference-dist.bj.bcebos.com/int8/resnet50_int8_model.tar.gz'
  ]
  data_md5s = ['4a5194524823d9b76da6e738e1367881']
  self.model_cache_folder = self.download_data(data_urls, data_md5s,
@@ -307,7 +307,7 @@ class TestCalibrationForMobilenetv1(TestCalibrationForResnet50):
  def download_model(self):
  # mobilenetv1 fp32 data
  data_urls = [
- 'http:https://paddle-inference-dist.cdn.bcebos.com/int8/mobilenetv1_int8_model.tar.gz'
+ 'http:https://paddle-inference-dist.bj.bcebos.com/int8/mobilenetv1_int8_model.tar.gz'
  ]
  data_md5s = ['13892b0716d26443a8cdea15b3c6438b']
  self.model_cache_folder = self.download_data(data_urls, data_md5s,

diff --git a/python/paddle/fluid/tests/unittests/dist_ctr_reader.py b/python/paddle/fluid/tests/unittests/dist_ctr_reader.py
@@ -20,7 +20,7 @@
 logger = logging.getLogger("paddle")
 logger.setLevel(logging.INFO)
 
-DATA_URL = "http:https://paddle-ctr-data.cdn.bcebos.com/avazu_ctr_data.tgz"
+DATA_URL = "http:https://paddle-ctr-data.bj.bcebos.com/avazu_ctr_data.tgz"
 DATA_MD5 = "c11df99fbd14e53cd4bfa6567344b26e"
 """
 avazu_ctr_data/train.txt

diff --git a/python/paddle/fluid/tests/unittests/test_dist_transformer.py b/python/paddle/fluid/tests/unittests/test_dist_transformer.py
@@ -21,7 +21,7 @@
 
 
 def download_files():
- url_prefix = 'http:https://paddle-unittest-data.cdn.bcebos.com/dist_transformer/'
+ url_prefix = 'http:https://paddle-unittest-data.bj.bcebos.com/dist_transformer/'
  vocab_url = url_prefix + 'vocab.bpe.32000'
  vocab_md5 = 'a86d345ca6e27f6591d0dccb1b9be853'
  paddle.dataset.common.download(vocab_url, 'test_dist_transformer',