修改model
Merge branch 'master' of https://github.com/metecyu/flexflow.git

Conflicts:
	abc1.log