IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Meiyang/paddle 2.4 (#15177)

Browse Source 
* PaddlePaddle 2.4.1 support

* Update src/frontends/paddle/tests/requirements.txt

lowering PDPD version

* update paddlepaddle to 2.4.0

Co-authored-by: Ilya Lavrenov <ilya.lavrenov@intel.com>
This commit is contained in:
mei, yang 2023-01-18 21:48:47 +08:00 committed by GitHub
parent fad52a8dd1
commit 1794fb40a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 50 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/frontends/paddle/src/proto/framework.proto
View File

@ -156,6 +156,10 @@ message VarType {
FEED_LIST = 28;
// The data type of phi::StringTensor
PSTRING = 29;
// the data type of phi::SparseCooTensor
SPARSE_COO = 30;
// the data type of phi::SparseCsrTensor
SPARSE_CSR = 31;
}
required Type type = 1;
@ -188,6 +192,8 @@ message VarType {
optional TensorDesc string = 8;
optional TensorDesc strings = 9;
optional TensorDesc vocab = 10;
optional TensorDesc sparse_coo = 11;
optional TensorDesc sparse_csr = 12;
}
message VarDesc {

49
src/frontends/paddle/tests/op_fuzzy.cpp
View File

@ -76,30 +76,31 @@ static const std::vector<std::string> models{
std::string("conditional_block_dyn_multiple_consumers/conditional_block_dyn_multiple_consumers.pdmodel"),
std::string("conditional_block_dyn_multiple_blocks/conditional_block_dyn_multiple_blocks.pdmodel"),
std::string("conditional_block_dyn_multiple_blocks2/conditional_block_dyn_multiple_blocks2.pdmodel"),
// TensorArray case
std::string("conditional_block_concat/conditional_block_concat.pdmodel"),
std::string("conditional_block_concat_dyn/conditional_block_concat_dyn.pdmodel"),
std::string("conditional_block_concat_dyn_2axes/conditional_block_concat_dyn_2axes.pdmodel"),
std::string("conditional_block_conditional_block_concat/conditional_block_conditional_block_concat.pdmodel"),
std::string(
"conditional_block_conditional_block_concat_dyn/conditional_block_conditional_block_concat_dyn.pdmodel"),
std::string("conditional_block_slice0/conditional_block_slice0.pdmodel"),
std::string("conditional_block_slice0_dyn/conditional_block_slice0_dyn.pdmodel"),
std::string("conditional_block_slice0_else/conditional_block_slice0_else.pdmodel"),
std::string("conditional_block_slice0_scaler/conditional_block_slice0_scaler.pdmodel"),
std::string("conditional_block_slice0_scaler_dyn/conditional_block_slice0_scaler_dyn.pdmodel"),
// std::string("conditional_block_slice0_axis2/conditional_block_slice0_axis2.pdmodel"), // No such case in
// model, as paddle.concat always concat along axis 0.
// std::string("conditional_block_slice0_axis2_dyn/conditional_block_slice0_axis2_dyn.pdmodel"),
// std::string("conditional_block_slice0_axis1_axis2/conditional_block_slice0_axis1_axis2.pdmodel"),
// std::string("conditional_block_slice0_axis1_axis2_dyn/conditional_block_slice0_axis1_axis2_dyn.pdmodel"),
std::string("conditional_block_concat_false/conditional_block_concat_false.pdmodel"),
std::string("conditional_block_concat_false_dyn/conditional_block_concat_false_dyn.pdmodel"),
std::string("conditional_block_slice0_2tensorarrays/conditional_block_slice0_2tensorarrays.pdmodel"),
std::string("conditional_block_slice0_2tensorarrays_dyn/conditional_block_slice0_2tensorarrays_dyn.pdmodel"),
std::string("conditional_block_slice0_2tensorarrays_extra/conditional_block_slice0_2tensorarrays_extra.pdmodel"),
std::string(
"conditional_block_slice0_2tensorarrays_extra_dyn/conditional_block_slice0_2tensorarrays_extra_dyn.pdmodel"),
//// TensorArray case
//// Save model failed if update paddlepaddle to 2.4.0
// std::string("conditional_block_concat/conditional_block_concat.pdmodel"),
// std::string("conditional_block_concat_dyn/conditional_block_concat_dyn.pdmodel"),
// std::string("conditional_block_concat_dyn_2axes/conditional_block_concat_dyn_2axes.pdmodel"),
// std::string("conditional_block_conditional_block_concat/conditional_block_conditional_block_concat.pdmodel"),
// std::string(
// "conditional_block_conditional_block_concat_dyn/conditional_block_conditional_block_concat_dyn.pdmodel"),
// std::string("conditional_block_slice0/conditional_block_slice0.pdmodel"),
// std::string("conditional_block_slice0_dyn/conditional_block_slice0_dyn.pdmodel"),
// std::string("conditional_block_slice0_else/conditional_block_slice0_else.pdmodel"),
// std::string("conditional_block_slice0_scaler/conditional_block_slice0_scaler.pdmodel"),
// std::string("conditional_block_slice0_scaler_dyn/conditional_block_slice0_scaler_dyn.pdmodel"),
//// std::string("conditional_block_slice0_axis2/conditional_block_slice0_axis2.pdmodel"), // No such case in
//// model, as paddle.concat always concat along axis 0.
//// std::string("conditional_block_slice0_axis2_dyn/conditional_block_slice0_axis2_dyn.pdmodel"),
//// std::string("conditional_block_slice0_axis1_axis2/conditional_block_slice0_axis1_axis2.pdmodel"),
//// std::string("conditional_block_slice0_axis1_axis2_dyn/conditional_block_slice0_axis1_axis2_dyn.pdmodel"),
// std::string("conditional_block_concat_false/conditional_block_concat_false.pdmodel"),
// std::string("conditional_block_concat_false_dyn/conditional_block_concat_false_dyn.pdmodel"),
// std::string("conditional_block_slice0_2tensorarrays/conditional_block_slice0_2tensorarrays.pdmodel"),
// std::string("conditional_block_slice0_2tensorarrays_dyn/conditional_block_slice0_2tensorarrays_dyn.pdmodel"),
// std::string("conditional_block_slice0_2tensorarrays_extra/conditional_block_slice0_2tensorarrays_extra.pdmodel"),
// std::string(
// "conditional_block_slice0_2tensorarrays_extra_dyn/conditional_block_slice0_2tensorarrays_extra_dyn.pdmodel"),
std::string("conv2d_dilation_assymetric_pads_strides"),
std::string("conv2d_SAME_padding"),
std::string("conv2d_strides_assymetric_padding"),

2
src/frontends/paddle/tests/requirements.txt
View File

@ -1,5 +1,5 @@
# PaddlePaddle - generate test models
paddlepaddle==2.3.2
paddlepaddle==2.4.0
gast==0.3.3
numpy>=1.16.6,<=1.23.4
six~=1.16.0

34
src/frontends/paddle/tests/test_models/gen_scripts/generate_tensorarray.py
View File

@ -340,19 +340,21 @@ def test_conditional_block_conditional_block_concat():
test('conditional_block_conditional_block_concat_dyn', [a], [a_shape])
if __name__ == "__main__":
# 95436: sporadic failure
test_conditional_block_slice0()
#test_conditional_block_slice1()
#test_conditional_block_slice0_slice1()
test_conditional_block_slice0_scaler()
test_conditional_block_concat()
test_conditional_block_concat_false()
test_conditional_block_conditional_block_concat()
test_conditional_block_slice0_axis2()
#test_conditional_block_slice0_aixs1_axis2()
test_conditional_block_slice0_2tensorarrays()
test_conditional_block_slice0_2tensorarrays_extra()
test_conditional_block_slice0_else()
# test_conditional_block_slice0_empty()
# test_conditional_block_concat_empty()
# test_conditional_block_slice0_empty_false()
# Failure if update paddlepaddle to 2.4.0
#test_conditional_block_slice0()
#test_conditional_block_slice0_scaler()
#test_conditional_block_concat()
#test_conditional_block_concat_false()
#test_conditional_block_conditional_block_concat()
#test_conditional_block_slice0_axis2()
#test_conditional_block_slice0_2tensorarrays()
#test_conditional_block_slice0_2tensorarrays_extra()
#test_conditional_block_slice0_else()
## 95436: sporadic failure
##test_conditional_block_slice1()
##test_conditional_block_slice0_slice1()
##test_conditional_block_slice0_aixs1_axis2()
## test_conditional_block_slice0_empty()
## test_conditional_block_concat_empty()
## test_conditional_block_slice0_empty_false()
pass