Merge pull request !2089 from yanghaoran/r1.5

Merge pull request !2088 from yanghaoran/r1.5

Merge pull request !2087 from yanghaoran/r1.5

Merge pull request !2086 from yanghaoran/r1.5

Merge pull request !2085 from yanghaoran/r1.5

Merge pull request !2084 from yanghaoran/release

Merge pull request !2083 from yanghaoran/release

Merge pull request !2077 from yanghaoran/release

Merge pull request !2076 from yanghaoran/release

Merge pull request !2065 from code_sync_0728

Merge pull request !2064 from yanghaoran/code_sync_0728

Merge pull request !2030 from lichun/master

Merge pull request !1897 from 陈华/aicpu

Merge pull request !2045 from 王涛/revert-merge-2028-master

Merge pull request !2044 from gengchao/om

Merge pull request !2028 from 赵之轩/my_dev3

Merge pull request !2026 from gengchao/om

Merge pull request !2042 from 张晓昆/trunk_ai

Merge pull request !2037 from zhaoxinxin/master

Merge pull request !2036 from 张晓昆/master

Merge pull request !2034 from zhaoxinxin/master

Merge pull request !1976 from zhaoxinxin/master

modified:   ge/graph/passes/base_pass.cc
	modified:   ge/graph/passes/base_pass.h
	modified:   ge/graph/passes/infer_base_pass.cc
	modified:   ge/graph/passes/infershape_pass.cc
	modified:   ge/graph/passes/infershape_pass.h
	modified:   ge/graph/preprocess/graph_preprocess.cc
	modified:   tests/ut/ge/graph/passes/addn_pass_unittest.cc
	modified:   tests/ut/ge/graph/passes/base_pass_unittest.cc
	modified:   tests/ut/ge/graph/passes/infershape_pass_unittest.cc

	modified:   ge/graph/passes/base_pass.cc
	modified:   ge/graph/passes/base_pass.h
	modified:   ge/graph/passes/infer_base_pass.cc
	modified:   ge/graph/passes/infershape_pass.cc
	modified:   ge/graph/passes/infershape_pass.h
	modified:   ge/graph/preprocess/graph_preprocess.cc
	modified:   tests/ut/ge/graph/passes/addn_pass_unittest.cc
	modified:   tests/ut/ge/graph/passes/base_pass_unittest.cc
	modified:   tests/ut/ge/graph/passes/infershape_pass_unittest.cc