Merge pull request !1860 from 王强/master

Merge pull request !1866 from liudingyan/master

From: @HW_KK
Reviewed-by: @xchu42,@wqtshg
Signed-off-by: @wqtshg

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

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

From: @chen-hua-baker
Reviewed-by: @wqtshg,@ji_chen
Signed-off-by: @ji_chen

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

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

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

From: @jiming6
Reviewed-by: @xchu42,@zhangxiaokun9
Signed-off-by: @wqtshg

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

From: @wangzhengjun3
Reviewed-by: @wqtshg,@ji_chen
Signed-off-by: @ji_chen

Merge pull request !1771 from 王笑天/master

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:

Merge pull request !1724 from liudingyan/master

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

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