Created by: hshen14

The commit is to enable Conv and batch norm by default. Conv + batch norm is mathematically equal to the original program, not related with any device. So, moving the optimization out of use_mkldnn is the right way.