From 840cf780e43f36dcdf0adc1797bc63570d3fd1d1 Mon Sep 17 00:00:00 2001 From: Xin Pan Date: Wed, 27 Feb 2019 10:56:04 +0800 Subject: [PATCH 1/3] add deprecation warning. test=develop --- python/paddle/fluid/parallel_executor.py | 5 +++++ python/paddle/fluid/transpiler/inference_transpiler.py | 2 ++ .../fluid/transpiler/memory_optimization_transpiler.py | 2 ++ 3 files changed, 9 insertions(+) diff --git a/python/paddle/fluid/parallel_executor.py b/python/paddle/fluid/parallel_executor.py index 889156ff74..fa8d5ef5d3 100644 --- a/python/paddle/fluid/parallel_executor.py +++ b/python/paddle/fluid/parallel_executor.py @@ -92,6 +92,11 @@ class ParallelExecutor(object): num_trainers=1, trainer_id=0, scope=None): + sys.stderr.write( + 'ParallelExecutor is deprecated. ' + 'Please use CompiledProgram and Executor. CompiledProgram ' + 'is a central place for optimization and Executor is the ' + 'unified executor. Example can be found in compiler.py.\n') # step1: get places, the places are used in run too. self._places = [] if use_cuda: diff --git a/python/paddle/fluid/transpiler/inference_transpiler.py b/python/paddle/fluid/transpiler/inference_transpiler.py index cc7f5ec90c..fea10d7c3b 100644 --- a/python/paddle/fluid/transpiler/inference_transpiler.py +++ b/python/paddle/fluid/transpiler/inference_transpiler.py @@ -15,6 +15,7 @@ from __future__ import print_function import os +import sys import numpy as np from .. import core from ..framework import Program @@ -50,6 +51,7 @@ class InferenceTranspiler(object): place (Place): inference place scope (Scope|None): inference Scope ''' + sys.stderr.write('InferenceTranspiler is deprecated.\n') if not isinstance(program, Program): raise TypeError("program should be as Program type") if not isinstance(place, core.CPUPlace) and not isinstance( diff --git a/python/paddle/fluid/transpiler/memory_optimization_transpiler.py b/python/paddle/fluid/transpiler/memory_optimization_transpiler.py index ee8cde441f..f3c7b3d63b 100755 --- a/python/paddle/fluid/transpiler/memory_optimization_transpiler.py +++ b/python/paddle/fluid/transpiler/memory_optimization_transpiler.py @@ -15,6 +15,7 @@ from __future__ import print_function import six +import sys from collections import defaultdict, MutableSet from .. import core from ... import compat as cpt @@ -509,6 +510,7 @@ def memory_optimize(input_program, Returns: None """ + sys.stderr.write('memory_optimize is deprecated.\n') def to_name_str(var): if isinstance(var, Variable): From 4d80db838a679b0144f8569fa461fd07b0dc2295 Mon Sep 17 00:00:00 2001 From: Xin Pan Date: Wed, 27 Feb 2019 10:56:52 +0800 Subject: [PATCH 2/3] have no time for cmake/externel test=develop --- paddle/scripts/paddle_build.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/paddle/scripts/paddle_build.sh b/paddle/scripts/paddle_build.sh index 33e0ec4ee2..855a8d3565 100755 --- a/paddle/scripts/paddle_build.sh +++ b/paddle/scripts/paddle_build.sh @@ -431,8 +431,7 @@ function assert_api_spec_approvals() { BRANCH="develop" fi - API_FILES=("cmake/external" - "paddle/fluid/API.spec" + API_FILES=("paddle/fluid/API.spec" "paddle/fluid/framework/operator.h" "paddle/fluid/framework/tensor.h" "paddle/fluid/framework/lod_tensor.h" From 0c277ac6e997ff0704a65cf450bf35761203f998 Mon Sep 17 00:00:00 2001 From: Xin Pan Date: Wed, 27 Feb 2019 11:48:16 +0800 Subject: [PATCH 3/3] polish test=develop --- paddle/scripts/paddle_build.sh | 1 + python/paddle/fluid/transpiler/inference_transpiler.py | 4 +++- .../paddle/fluid/transpiler/memory_optimization_transpiler.py | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/paddle/scripts/paddle_build.sh b/paddle/scripts/paddle_build.sh index 855a8d3565..e1e65d50c4 100755 --- a/paddle/scripts/paddle_build.sh +++ b/paddle/scripts/paddle_build.sh @@ -432,6 +432,7 @@ function assert_api_spec_approvals() { fi API_FILES=("paddle/fluid/API.spec" + "python/paddle/fluid/parallel_executor.py" "paddle/fluid/framework/operator.h" "paddle/fluid/framework/tensor.h" "paddle/fluid/framework/lod_tensor.h" diff --git a/python/paddle/fluid/transpiler/inference_transpiler.py b/python/paddle/fluid/transpiler/inference_transpiler.py index fea10d7c3b..8a527e72fb 100644 --- a/python/paddle/fluid/transpiler/inference_transpiler.py +++ b/python/paddle/fluid/transpiler/inference_transpiler.py @@ -51,7 +51,9 @@ class InferenceTranspiler(object): place (Place): inference place scope (Scope|None): inference Scope ''' - sys.stderr.write('InferenceTranspiler is deprecated.\n') + sys.stderr.write("InferenceTranspiler is deprecated since it's not " + "safe. Users should be " + "responsible for constructing the inference program\n") if not isinstance(program, Program): raise TypeError("program should be as Program type") if not isinstance(place, core.CPUPlace) and not isinstance( diff --git a/python/paddle/fluid/transpiler/memory_optimization_transpiler.py b/python/paddle/fluid/transpiler/memory_optimization_transpiler.py index f3c7b3d63b..c434423bae 100755 --- a/python/paddle/fluid/transpiler/memory_optimization_transpiler.py +++ b/python/paddle/fluid/transpiler/memory_optimization_transpiler.py @@ -510,7 +510,8 @@ def memory_optimize(input_program, Returns: None """ - sys.stderr.write('memory_optimize is deprecated.\n') + sys.stderr.write('memory_optimize is deprecated. ' + 'Use CompiledProgram and Executor\n') def to_name_str(var): if isinstance(var, Variable):