Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
机器未来
Paddle
提交
de3b70a1
P
Paddle
项目概览
机器未来
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
de3b70a1
编写于
3月 25, 2019
作者:
L
liuwei1031
提交者:
GitHub
3月 25, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix cdn issue, test=develop (#16423)
* fix cdn issue, test=develop * fix cdn issue, test=develop
上级
c64d9593
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
16 addition
and
16 deletion
+16
-16
cmake/external/boost.cmake
cmake/external/boost.cmake
+1
-1
cmake/external/grpc.cmake
cmake/external/grpc.cmake
+1
-1
cmake/external/mklml.cmake
cmake/external/mklml.cmake
+2
-2
paddle/fluid/inference/api/demo_ci/run.sh
paddle/fluid/inference/api/demo_ci/run.sh
+1
-1
paddle/fluid/inference/tests/api/CMakeLists.txt
paddle/fluid/inference/tests/api/CMakeLists.txt
+2
-2
paddle/fluid/inference/tests/test.cmake
paddle/fluid/inference/tests/test.cmake
+1
-1
python/paddle/dataset/flowers.py
python/paddle/dataset/flowers.py
+3
-3
python/paddle/fluid/contrib/tests/test_calibration.py
python/paddle/fluid/contrib/tests/test_calibration.py
+3
-3
python/paddle/fluid/tests/unittests/dist_ctr_reader.py
python/paddle/fluid/tests/unittests/dist_ctr_reader.py
+1
-1
python/paddle/fluid/tests/unittests/test_dist_transformer.py
python/paddle/fluid/tests/unittests/test_dist_transformer.py
+1
-1
未找到文件。
cmake/external/boost.cmake
浏览文件 @
de3b70a1
...
@@ -24,7 +24,7 @@ set(BOOST_PROJECT "extern_boost")
...
@@ -24,7 +24,7 @@ set(BOOST_PROJECT "extern_boost")
# So we use 1.41.0 here.
# So we use 1.41.0 here.
set
(
BOOST_VER
"1.41.0"
)
set
(
BOOST_VER
"1.41.0"
)
set
(
BOOST_TAR
"boost_1_41_0"
CACHE STRING
""
FORCE
)
set
(
BOOST_TAR
"boost_1_41_0"
CACHE STRING
""
FORCE
)
set
(
BOOST_URL
"http://paddlepaddledeps.
cdn
.bcebos.com/
${
BOOST_TAR
}
.tar.gz"
CACHE STRING
""
FORCE
)
set
(
BOOST_URL
"http://paddlepaddledeps.
bj
.bcebos.com/
${
BOOST_TAR
}
.tar.gz"
CACHE STRING
""
FORCE
)
MESSAGE
(
STATUS
"BOOST_TAR:
${
BOOST_TAR
}
, BOOST_URL:
${
BOOST_URL
}
"
)
MESSAGE
(
STATUS
"BOOST_TAR:
${
BOOST_TAR
}
, BOOST_URL:
${
BOOST_URL
}
"
)
...
...
cmake/external/grpc.cmake
浏览文件 @
de3b70a1
...
@@ -44,7 +44,7 @@ ExternalProject_Add(
...
@@ -44,7 +44,7 @@ ExternalProject_Add(
# 3. keep only zlib, cares, protobuf, boringssl under "third_party",
# 3. keep only zlib, cares, protobuf, boringssl under "third_party",
# checkout and clean other dirs under third_party
# checkout and clean other dirs under third_party
# 4. remove .git, and package the directory.
# 4. remove .git, and package the directory.
URL
"http://paddlepaddledeps.
cdn
.bcebos.com/grpc-v1.10.x.tar.gz"
URL
"http://paddlepaddledeps.
bj
.bcebos.com/grpc-v1.10.x.tar.gz"
URL_MD5
"1f268a2aff6759839dccd256adcc91cf"
URL_MD5
"1f268a2aff6759839dccd256adcc91cf"
PREFIX
${
GRPC_SOURCES_DIR
}
PREFIX
${
GRPC_SOURCES_DIR
}
UPDATE_COMMAND
""
UPDATE_COMMAND
""
...
...
cmake/external/mklml.cmake
浏览文件 @
de3b70a1
...
@@ -34,7 +34,7 @@ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH}" "${MKLML_ROOT}/lib")
...
@@ -34,7 +34,7 @@ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH}" "${MKLML_ROOT}/lib")
SET
(
TIME_VERSION
"2019.0.1.20181227"
)
SET
(
TIME_VERSION
"2019.0.1.20181227"
)
IF
(
WIN32
)
IF
(
WIN32
)
SET
(
MKLML_VER
"mklml_win_
${
TIME_VERSION
}
"
CACHE STRING
""
FORCE
)
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_LIB
${
MKLML_LIB_DIR
}
/mklml.lib
)
SET
(
MKLML_IOMP_LIB
${
MKLML_LIB_DIR
}
/libiomp5md.lib
)
SET
(
MKLML_IOMP_LIB
${
MKLML_LIB_DIR
}
/libiomp5md.lib
)
SET
(
MKLML_SHARED_LIB
${
MKLML_LIB_DIR
}
/mklml.dll
)
SET
(
MKLML_SHARED_LIB
${
MKLML_LIB_DIR
}
/mklml.dll
)
...
@@ -43,7 +43,7 @@ ELSE()
...
@@ -43,7 +43,7 @@ ELSE()
#TODO(intel-huying):
#TODO(intel-huying):
# Now enable Erf function in mklml library temporarily, it will be updated as offical version later.
# Now enable Erf function in mklml library temporarily, it will be updated as offical version later.
SET
(
MKLML_VER
"Glibc225_vsErf_mklml_lnx_
${
TIME_VERSION
}
"
CACHE STRING
""
FORCE
)
SET
(
MKLML_VER
"Glibc225_vsErf_mklml_lnx_
${
TIME_VERSION
}
"
CACHE STRING
""
FORCE
)
SET
(
MKLML_URL
"http://paddlepaddledeps.
cdn
.bcebos.com/
${
MKLML_VER
}
.tgz"
CACHE STRING
""
FORCE
)
SET
(
MKLML_URL
"http://paddlepaddledeps.
bj
.bcebos.com/
${
MKLML_VER
}
.tgz"
CACHE STRING
""
FORCE
)
SET
(
MKLML_LIB
${
MKLML_LIB_DIR
}
/libmklml_intel.so
)
SET
(
MKLML_LIB
${
MKLML_LIB_DIR
}
/libmklml_intel.so
)
SET
(
MKLML_IOMP_LIB
${
MKLML_LIB_DIR
}
/libiomp5.so
)
SET
(
MKLML_IOMP_LIB
${
MKLML_LIB_DIR
}
/libiomp5.so
)
SET
(
MKLML_SHARED_LIB
${
MKLML_LIB_DIR
}
/libmklml_intel.so
)
SET
(
MKLML_SHARED_LIB
${
MKLML_LIB_DIR
}
/libmklml_intel.so
)
...
...
paddle/fluid/inference/api/demo_ci/run.sh
浏览文件 @
de3b70a1
...
@@ -27,7 +27,7 @@ if [ -d "$TENSORRT_INCLUDE_DIR" -a -d "$TENSORRT_LIB_DIR" ]; then
...
@@ -27,7 +27,7 @@ if [ -d "$TENSORRT_INCLUDE_DIR" -a -d "$TENSORRT_LIB_DIR" ]; then
fi
fi
PREFIX
=
inference-vis-demos%2F
PREFIX
=
inference-vis-demos%2F
URL_ROOT
=
http://paddlemodels.
cdn
.bcebos.com/
${
PREFIX
}
URL_ROOT
=
http://paddlemodels.
bj
.bcebos.com/
${
PREFIX
}
# download vis_demo data
# download vis_demo data
function
download
()
{
function
download
()
{
...
...
paddle/fluid/inference/tests/api/CMakeLists.txt
浏览文件 @
de3b70a1
...
@@ -115,14 +115,14 @@ inference_analysis_test(test_analyzer_transformer SRCS analyzer_transformer_test
...
@@ -115,14 +115,14 @@ inference_analysis_test(test_analyzer_transformer SRCS analyzer_transformer_test
# ocr
# ocr
set
(
OCR_INSTALL_DIR
"
${
INFERENCE_DEMO_INSTALL_DIR
}
/ocr"
)
set
(
OCR_INSTALL_DIR
"
${
INFERENCE_DEMO_INSTALL_DIR
}
/ocr"
)
if
(
NOT EXISTS
${
OCR_INSTALL_DIR
}
)
if
(
NOT EXISTS
${
OCR_INSTALL_DIR
}
)
inference_download_and_uncompress
(
${
OCR_INSTALL_DIR
}
"http://paddlemodels.
cdn
.bcebos.com/"
"inference-vis-demos%2Focr.tar.gz"
)
inference_download_and_uncompress
(
${
OCR_INSTALL_DIR
}
"http://paddlemodels.
bj
.bcebos.com/"
"inference-vis-demos%2Focr.tar.gz"
)
endif
()
endif
()
inference_analysis_api_test_with_refer_result
(
test_analyzer_ocr
${
OCR_INSTALL_DIR
}
analyzer_vis_tester.cc SERIAL
)
inference_analysis_api_test_with_refer_result
(
test_analyzer_ocr
${
OCR_INSTALL_DIR
}
analyzer_vis_tester.cc SERIAL
)
# mobilenet with transpose op
# mobilenet with transpose op
set
(
MOBILENET_INSTALL_DIR
"
${
INFERENCE_DEMO_INSTALL_DIR
}
/mobilenet"
)
set
(
MOBILENET_INSTALL_DIR
"
${
INFERENCE_DEMO_INSTALL_DIR
}
/mobilenet"
)
if
(
NOT EXISTS
${
MOBILENET_INSTALL_DIR
}
)
if
(
NOT EXISTS
${
MOBILENET_INSTALL_DIR
}
)
inference_download_and_uncompress
(
${
MOBILENET_INSTALL_DIR
}
"http://paddlemodels.
cdn
.bcebos.com/"
"inference-vis-demos%2Fmobilenet.tar.gz"
)
inference_download_and_uncompress
(
${
MOBILENET_INSTALL_DIR
}
"http://paddlemodels.
bj
.bcebos.com/"
"inference-vis-demos%2Fmobilenet.tar.gz"
)
endif
()
endif
()
inference_analysis_api_test_with_refer_result
(
test_analyzer_mobilenet_transpose
${
MOBILENET_INSTALL_DIR
}
analyzer_vis_tester.cc SERIAL
)
inference_analysis_api_test_with_refer_result
(
test_analyzer_mobilenet_transpose
${
MOBILENET_INSTALL_DIR
}
analyzer_vis_tester.cc SERIAL
)
...
...
paddle/fluid/inference/tests/test.cmake
浏览文件 @
de3b70a1
include
(
ExternalProject
)
include
(
ExternalProject
)
set
(
INFERENCE_URL
"http://paddle-inference-dist.
cdn
.bcebos.com"
CACHE STRING
"inference download url"
)
set
(
INFERENCE_URL
"http://paddle-inference-dist.
bj
.bcebos.com"
CACHE STRING
"inference download url"
)
set
(
INFERENCE_DEMO_INSTALL_DIR
"
${
THIRD_PARTY_PATH
}
/inference_demo"
CACHE STRING
set
(
INFERENCE_DEMO_INSTALL_DIR
"
${
THIRD_PARTY_PATH
}
/inference_demo"
CACHE STRING
"A path setting inference demo download directories."
)
"A path setting inference demo download directories."
)
...
...
python/paddle/dataset/flowers.py
浏览文件 @
de3b70a1
...
@@ -46,9 +46,9 @@ import six
...
@@ -46,9 +46,9 @@ import six
from
six.moves
import
cPickle
as
pickle
from
six.moves
import
cPickle
as
pickle
__all__
=
[
'train'
,
'test'
,
'valid'
]
__all__
=
[
'train'
,
'test'
,
'valid'
]
DATA_URL
=
'http://paddlemodels.
cdn
.bcebos.com/flowers/102flowers.tgz'
DATA_URL
=
'http://paddlemodels.
bj
.bcebos.com/flowers/102flowers.tgz'
LABEL_URL
=
'http://paddlemodels.
cdn
.bcebos.com/flowers/imagelabels.mat'
LABEL_URL
=
'http://paddlemodels.
bj
.bcebos.com/flowers/imagelabels.mat'
SETID_URL
=
'http://paddlemodels.
cdn
.bcebos.com/flowers/setid.mat'
SETID_URL
=
'http://paddlemodels.
bj
.bcebos.com/flowers/setid.mat'
DATA_MD5
=
'52808999861908f626f3c1f4e79d11fa'
DATA_MD5
=
'52808999861908f626f3c1f4e79d11fa'
LABEL_MD5
=
'e0620be6f572b9609742df49c70aed4d'
LABEL_MD5
=
'e0620be6f572b9609742df49c70aed4d'
SETID_MD5
=
'a5357ecc9cb78c4bef273ce3793fc85c'
SETID_MD5
=
'a5357ecc9cb78c4bef273ce3793fc85c'
...
...
python/paddle/fluid/contrib/tests/test_calibration.py
浏览文件 @
de3b70a1
...
@@ -136,7 +136,7 @@ class TestCalibrationForResnet50(unittest.TestCase):
...
@@ -136,7 +136,7 @@ class TestCalibrationForResnet50(unittest.TestCase):
"full_data"
,
False
)
"full_data"
,
False
)
else
:
else
:
data_urls
.
append
(
data_urls
.
append
(
'http://paddle-inference-dist.
cdn
.bcebos.com/int8/calibration_test_data.tar.gz'
'http://paddle-inference-dist.
bj
.bcebos.com/int8/calibration_test_data.tar.gz'
)
)
data_md5s
.
append
(
'1b6c1c434172cca1bf9ba1e4d7a3157d'
)
data_md5s
.
append
(
'1b6c1c434172cca1bf9ba1e4d7a3157d'
)
self
.
data_cache_folder
=
self
.
download_data
(
data_urls
,
data_md5s
,
self
.
data_cache_folder
=
self
.
download_data
(
data_urls
,
data_md5s
,
...
@@ -189,7 +189,7 @@ class TestCalibrationForResnet50(unittest.TestCase):
...
@@ -189,7 +189,7 @@ class TestCalibrationForResnet50(unittest.TestCase):
def
download_model
(
self
):
def
download_model
(
self
):
# resnet50 fp32 data
# resnet50 fp32 data
data_urls
=
[
data_urls
=
[
'http://paddle-inference-dist.
cdn
.bcebos.com/int8/resnet50_int8_model.tar.gz'
'http://paddle-inference-dist.
bj
.bcebos.com/int8/resnet50_int8_model.tar.gz'
]
]
data_md5s
=
[
'4a5194524823d9b76da6e738e1367881'
]
data_md5s
=
[
'4a5194524823d9b76da6e738e1367881'
]
self
.
model_cache_folder
=
self
.
download_data
(
data_urls
,
data_md5s
,
self
.
model_cache_folder
=
self
.
download_data
(
data_urls
,
data_md5s
,
...
@@ -307,7 +307,7 @@ class TestCalibrationForMobilenetv1(TestCalibrationForResnet50):
...
@@ -307,7 +307,7 @@ class TestCalibrationForMobilenetv1(TestCalibrationForResnet50):
def
download_model
(
self
):
def
download_model
(
self
):
# mobilenetv1 fp32 data
# mobilenetv1 fp32 data
data_urls
=
[
data_urls
=
[
'http://paddle-inference-dist.
cdn
.bcebos.com/int8/mobilenetv1_int8_model.tar.gz'
'http://paddle-inference-dist.
bj
.bcebos.com/int8/mobilenetv1_int8_model.tar.gz'
]
]
data_md5s
=
[
'13892b0716d26443a8cdea15b3c6438b'
]
data_md5s
=
[
'13892b0716d26443a8cdea15b3c6438b'
]
self
.
model_cache_folder
=
self
.
download_data
(
data_urls
,
data_md5s
,
self
.
model_cache_folder
=
self
.
download_data
(
data_urls
,
data_md5s
,
...
...
python/paddle/fluid/tests/unittests/dist_ctr_reader.py
浏览文件 @
de3b70a1
...
@@ -20,7 +20,7 @@ logging.basicConfig()
...
@@ -20,7 +20,7 @@ logging.basicConfig()
logger
=
logging
.
getLogger
(
"paddle"
)
logger
=
logging
.
getLogger
(
"paddle"
)
logger
.
setLevel
(
logging
.
INFO
)
logger
.
setLevel
(
logging
.
INFO
)
DATA_URL
=
"http://paddle-ctr-data.
cdn
.bcebos.com/avazu_ctr_data.tgz"
DATA_URL
=
"http://paddle-ctr-data.
bj
.bcebos.com/avazu_ctr_data.tgz"
DATA_MD5
=
"c11df99fbd14e53cd4bfa6567344b26e"
DATA_MD5
=
"c11df99fbd14e53cd4bfa6567344b26e"
"""
"""
avazu_ctr_data/train.txt
avazu_ctr_data/train.txt
...
...
python/paddle/fluid/tests/unittests/test_dist_transformer.py
浏览文件 @
de3b70a1
...
@@ -21,7 +21,7 @@ from test_dist_base import TestDistBase
...
@@ -21,7 +21,7 @@ from test_dist_base import TestDistBase
def
download_files
():
def
download_files
():
url_prefix
=
'http://paddle-unittest-data.
cdn
.bcebos.com/dist_transformer/'
url_prefix
=
'http://paddle-unittest-data.
bj
.bcebos.com/dist_transformer/'
vocab_url
=
url_prefix
+
'vocab.bpe.32000'
vocab_url
=
url_prefix
+
'vocab.bpe.32000'
vocab_md5
=
'a86d345ca6e27f6591d0dccb1b9be853'
vocab_md5
=
'a86d345ca6e27f6591d0dccb1b9be853'
paddle
.
dataset
.
common
.
download
(
vocab_url
,
'test_dist_transformer'
,
paddle
.
dataset
.
common
.
download
(
vocab_url
,
'test_dist_transformer'
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录