提交 5e7bfd4e 编写于 作者: L luotao1

Merge branch 'develop' into anakin_ner

......@@ -554,7 +554,7 @@ function gen_capi_package() {
function gen_fluid_inference_lib() {
mkdir -p ${PADDLE_ROOT}/build
cd ${PADDLE_ROOT}/build
if [ ${WITH_C_API:-OFF} == "OFF" ] ; then
if [[ ${WITH_C_API:-OFF} == "OFF" && ${WITH_INFERENCE:-ON} == "ON" ]] ; then
cat <<EOF
========================================
Deploying fluid inference library ...
......@@ -569,7 +569,7 @@ EOF
}
function test_fluid_inference_lib() {
if [ ${WITH_C_API:-OFF} == "OFF" ] ; then
if [[ ${WITH_C_API:-OFF} == "OFF" && ${WITH_INFERENCE:-ON} == "ON" ]] ; then
cat <<EOF
========================================
Testing fluid inference library ...
......
......@@ -18,6 +18,7 @@ import paddle
import paddle.fluid as fluid
import paddle.fluid.core as core
import numpy
import six
import os
import cifar10_small_test_set
......@@ -177,4 +178,7 @@ if __name__ == '__main__':
for parallel in (False, True):
if use_cuda and not core.is_compiled_with_cuda():
continue
main(use_cuda=use_cuda, parallel=parallel)
# TODO(minqiyang): remove this line after fixing the deletion
# order problem of Scope in ParallelExecutor in manylinux
if six.PY2:
main(use_cuda=use_cuda, parallel=parallel)
......@@ -18,6 +18,7 @@ import paddle
import paddle.fluid as fluid
import paddle.fluid.core as core
import numpy
import six
import os
import cifar10_small_test_set
......@@ -151,4 +152,7 @@ if __name__ == '__main__':
for parallel in (False, True):
if use_cuda and not core.is_compiled_with_cuda():
continue
main(use_cuda=use_cuda, parallel=parallel)
# TODO(minqiyang): remove this line after fixing the deletion
# order problem of Scope in ParallelExecutor in manylinux
if six.PY2:
main(use_cuda=use_cuda, parallel=parallel)
......@@ -18,6 +18,7 @@ import argparse
import paddle.fluid as fluid
import paddle.fluid.core as core
import paddle
import six
import sys
import numpy
import unittest
......@@ -154,4 +155,7 @@ if __name__ == '__main__':
for parallel in (False, True):
if use_cuda and not core.is_compiled_with_cuda():
continue
main(use_cuda=use_cuda, parallel=parallel)
# TODO(minqiyang): remove this line after fixing the deletion
# order problem of Scope in ParallelExecutor in manylinux
if six.PY2:
main(use_cuda=use_cuda, parallel=parallel)
......@@ -18,6 +18,7 @@ import argparse
import paddle.fluid as fluid
import paddle.fluid.core as core
import paddle
import six
import sys
import numpy
import unittest
......@@ -136,4 +137,7 @@ if __name__ == '__main__':
for parallel in (False, True):
if use_cuda and not core.is_compiled_with_cuda():
continue
main(use_cuda=use_cuda, parallel=parallel)
# TODO(minqiyang): remove this line after fixing the deletion
# order problem of Scope in ParallelExecutor in manylinux
if six.PY2:
main(use_cuda=use_cuda, parallel=parallel)
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册