Signed-off-by: zhupuxu <zhupuxu@huawei.com>

Merge pull request !1771 from 王笑天/master

From: @wei-gangqiang
Reviewed-by: 
Signed-off-by:

From: @dimitri_rose
Reviewed-by: @tangqunzhang,@wqtshg
Signed-off-by: @wqtshg

From: @isaacxr
Reviewed-by: @wqtshg,@zhangxiaokun9
Signed-off-by:

From: @zhangxiaokun9
Reviewed-by: @xchu42,@ji_chen
Signed-off-by: @ji_chen

From: @jiming6
Reviewed-by: 
Signed-off-by:

From: @zhao_zhixuan
Reviewed-by: 
Signed-off-by:

From: @lichun30
Reviewed-by: @xchu42
Signed-off-by:

Merge pull request !1724 from liudingyan/master

From: @dimitri_rose
Reviewed-by: @ji_chen,@wangxiaotian22
Signed-off-by: @ji_chen

From: @liu-kang33
Reviewed-by: 
Signed-off-by:

From: @dimitri_rose
Reviewed-by: @zhangxiaokun9
Signed-off-by:

From: @hugo1
Reviewed-by: @wqtshg,@wangxiaotian22
Signed-off-by: @wqtshg

modified:   ge/ir_build/option_utils.cc

	modified:   ge/graph/preprocess/graph_preprocess.cc
	modified:   ge/ir_build/option_utils.cc

	modified:   ge/graph/preprocess/graph_preprocess.cc
	modified:   ge/ir_build/option_utils.cc
	modified:   tests/ut/ge/graph/preprocess/graph_preprocess_unittest.cc

From: @ding_fei_fei
Reviewed-by: @liucunwei,@majorzhang
Signed-off-by: @liucunwei