@ -54,7 +54,7 @@ std::string num2str(T a) {
}
} // namespace
bool Impl : : Init ( ) {
bool Native PaddlePredictor: : Init ( ) {
VLOG ( 3 ) < < " Predictor::init() " ;
// TODO(panyx0718): Should CPU vs GPU device be decided by id?
@ -96,14 +96,14 @@ bool PaddlePredictorImpl::Init() {
return true ;
}
bool Impl : : Run ( const std : : vector < PaddleTensor > & inputs ,
std : : vector < PaddleTensor > * output_data ) {
bool Native PaddlePredictor: : Run ( const std : : vector < PaddleTensor > & inputs ,
std : : vector < PaddleTensor > * output_data ) {
VLOG ( 3 ) < < " Predictor::predict " ;
Timer timer ;
timer . tic ( ) ;
// set feed variable
std : : map < std : : string , const paddle: : framework: : LoDTensor * > feed_targets ;
std : : vector < paddle: : framework: : LoDTensor > feeds ;
std : : map < std : : string , const : : LoDTensor * > feed_targets ;
std : : vector < : : LoDTensor > feeds ;
if ( ! SetFeed ( inputs , & feeds ) ) {
LOG ( ERROR ) < < " fail to set feed " ;
return false ;
@ -112,8 +112,8 @@ bool PaddlePredictorImpl::Run(const std::vector<PaddleTensor> &inputs,
feed_targets [ feed_target_names_ [ i ] ] = & feeds [ i ] ;
}
// get fetch variable
std : : map < std : : string , paddle: : framework: : LoDTensor * > fetch_targets ;
std : : vector < paddle: : framework: : LoDTensor > fetchs ;
std : : map < std : : string , : : LoDTensor * > fetch_targets ;
std : : vector < : : LoDTensor > fetchs ;
fetchs . resize ( fetch_target_names_ . size ( ) ) ;
for ( size_t i = 0 ; i < fetch_target_names_ . size ( ) ; + + i ) {
fetch_targets [ fetch_target_names_ [ i ] ] = & fetchs [ i ] ;
@ -133,76 +133,33 @@ bool PaddlePredictorImpl::Run(const std::vector<PaddleTensor> &inputs,
return true ;
}
std : : unique_ptr < PaddlePredictor > Impl : : Clone ( ) {
std : : unique_ptr < PaddlePredictor > Native PaddlePredictor: : Clone ( ) {
VLOG ( 3 ) < < " Predictor::clone " ;
std : : unique_ptr < PaddlePredictor > cls ( new PaddlePredictorImpl ( config_ ) ) ;
if ( ! cls - > InitShared ( ) ) {
LOG ( ERROR ) < < " fail to call InitShared " ;
std : : unique_ptr < PaddlePredictor > cls ( new NativePaddlePredictor ( config_ ) ) ;
if ( ! dynamic_cast < NativePaddlePredictor * > ( cls . get ( ) ) - > Init ( ) ) {
LOG ( ERROR ) < < " fail to call Init " ;
return nullptr ;
}
// fix manylinux compile error.
return std : : move ( cls ) ;
}
// TODO(panyx0718): Consider merge with Init()?
bool PaddlePredictorImpl : : InitShared ( ) {
VLOG ( 3 ) < < " Predictor::init_shared " ;
// 1. Define place, executor, scope
if ( this - > config_ . device > = 0 ) {
place_ = paddle : : platform : : CUDAPlace ( ) ;
} else {
place_ = paddle : : platform : : CPUPlace ( ) ;
}
this - > executor_ . reset ( new paddle : : framework : : Executor ( this - > place_ ) ) ;
this - > scope_ . reset ( new paddle : : framework : : Scope ( ) ) ;
// Initialize the inference program
if ( ! this - > config_ . model_dir . empty ( ) ) {
// Parameters are saved in separate files sited in
// the specified `dirname`.
this - > inference_program_ = paddle : : inference : : Load (
this - > executor_ . get ( ) , this - > scope_ . get ( ) , this - > config_ . model_dir ) ;
} else if ( ! this - > config_ . prog_file . empty ( ) & &
! this - > config_ . param_file . empty ( ) ) {
// All parameters are saved in a single file.
// The file names should be consistent with that used
// in Python API `fluid.io.save_inference_model`.
this - > inference_program_ =
paddle : : inference : : Load ( this - > executor_ . get ( ) ,
this - > scope_ . get ( ) ,
this - > config_ . prog_file ,
this - > config_ . param_file ) ;
}
this - > ctx_ = this - > executor_ - > Prepare ( * this - > inference_program_ , 0 ) ;
// 3. create variables
// TODO(panyx0718): why test share_variables.
if ( config_ . share_variables ) {
this - > executor_ - > CreateVariables (
* this - > inference_program_ , this - > scope_ . get ( ) , 0 ) ;
}
// 4. Get the feed_target_names and fetch_target_names
this - > feed_target_names_ = this - > inference_program_ - > GetFeedTargetNames ( ) ;
this - > fetch_target_names_ = this - > inference_program_ - > GetFetchTargetNames ( ) ;
return true ;
}
bool PaddlePredictorImpl : : SetFeed (
const std : : vector < PaddleTensor > & inputs ,
std : : vector < paddle : : framework : : LoDTensor > * feeds ) {
bool NativePaddlePredictor : : SetFeed ( const std : : vector < PaddleTensor > & inputs ,
std : : vector < framework : : LoDTensor > * feeds ) {
VLOG ( 3 ) < < " Predictor::set_feed " ;
if ( inputs . size ( ) ! = feed_target_names_ . size ( ) ) {
LOG ( ERROR ) < < " wrong feed input size. " ;
return false ;
}
for ( size_t i = 0 ; i < feed_target_names_ . size ( ) ; + + i ) {
paddle : : framework : : LoDTensor input ;
paddle : : framework : : DDim ddim =
paddle : : framework : : make_ddim ( inputs [ i ] . shape ) ;
framework : : LoDTensor input ;
framework : : DDim ddim = framework : : make_ddim ( inputs [ i ] . shape ) ;
void * input_ptr ;
if ( inputs [ i ] . dtype = = PaddleDType : : INT64 ) {
input_ptr =
input . mutable_data < int64_t > ( ddim , paddle : : platform : : CPUPlace ( ) ) ;
input_ptr = input . mutable_data < int64_t > ( ddim , platform : : CPUPlace ( ) ) ;
} else if ( inputs [ i ] . dtype = = PaddleDType : : FLOAT32 ) {
input_ptr = input . mutable_data < float > ( ddim , p addle: : p latform: : CPUPlace ( ) ) ;
input_ptr = input . mutable_data < float > ( ddim , platform : : CPUPlace ( ) ) ;
} else {
LOG ( ERROR ) < < " unsupported feed type " < < inputs [ i ] . dtype ;
return false ;
@ -213,13 +170,12 @@ bool PaddlePredictorImpl::SetFeed(
inputs [ i ] . data . data ,
inputs [ i ] . data . length ) ;
feeds - > push_back ( input ) ;
LOG ( ERROR ) < < " Actual feed type " < < feeds - > back ( ) . type ( ) . name ( ) ;
}
return true ;
}
bool Impl : : GetFetch (
const std : : vector < paddle: : framework: : LoDTensor > & fetchs ,
bool Native PaddlePredictor: : GetFetch (
const std : : vector < : : LoDTensor > & fetchs ,
std : : vector < PaddleTensor > * outputs ) {
VLOG ( 3 ) < < " Predictor::get_fetch " ;
outputs - > resize ( fetchs . size ( ) ) ;
@ -284,27 +240,30 @@ bool PaddlePredictorImpl::GetFetch(
return true ;
}
std : : unique_ptr < PaddlePredictorImpl > CreatePaddlePredictorImpl (
const VisConfig & config ) {
VLOG ( 3 ) < < " create PaddlePredictorImpl " ;
// 1. GPU memeroy
std : : vector < std : : string > flags ;
if ( config . fraction_of_gpu_memory > = 0.0f | |
config . fraction_of_gpu_memory < = 0.95f ) {
flags . push_back ( " dummpy " ) ;
std : : string flag = " --fraction_of_gpu_memory_to_use= " +
num2str < float > ( config . fraction_of_gpu_memory ) ;
flags . push_back ( flag ) ;
VLOG ( 3 ) < < " set flag: " < < flag ;
framework : : InitGflags ( flags ) ;
template < >
std : : unique_ptr < PaddlePredictor >
CreatePaddlePredictor < NativeConfig , PaddlePredictor : : EngineKind : : kNative > (
const NativeConfig & config ) {
VLOG ( 3 ) < < " create NativePaddlePredictor " ;
if ( config . use_gpu ) {
// 1. GPU memeroy
std : : vector < std : : string > flags ;
if ( config . fraction_of_gpu_memory > = 0.0f | |
config . fraction_of_gpu_memory < = 0.95f ) {
flags . push_back ( " dummpy " ) ;
std : : string flag = " --fraction_of_gpu_memory_to_use= " +
num2str < float > ( config . fraction_of_gpu_memory ) ;
flags . push_back ( flag ) ;
VLOG ( 3 ) < < " set flag: " < < flag ;
framework : : InitGflags ( flags ) ;
}
}
std : : unique_ptr < PaddlePredictorImpl > predictor (
new PaddlePredictorImpl ( config ) ) ;
if ( ! predictor - > Init ( ) ) {
std : : unique_ptr < PaddlePredictor > predictor ( new NativePaddlePredictor ( config ) ) ;
if ( ! dynamic_cast < NativePaddlePredictor * > ( predictor . get ( ) ) - > Init ( ) ) {
return nullptr ;
}
return ;
return std: : move ( predictor) ;
}
} // namespace paddle
tangwei12
7 years ago