resolve conflict in data parallel model
* master: (201 commits)
  Add cost inference to ConvGradient and WeightedSum operators (pytorch#10744)
  Move collapse dims into a single place (pytorch#11272)
  Fix some more warnings (pytorch#11257)
  Fix the batchnorm onnx exporting when affine=False
  Improve error message to include return types too (pytorch#11245)
  Check doxygen output in travis (pytorch#11124)
  Accept more numpy scalars as doubles (pytorch#9659)
  Fixed log message (pytorch#10874)
  Fix to distribution.__repr__ with lazy attributes (pytorch#11263)
  Add import export step to end to end tests
  Add complex hooks for out of tree complex implementation. (pytorch#11216)
  Unify opt flag for cmake codegen (pytorch#11227)
  nomnigraph - fix memory error in NN subgraph matchOp (pytorch#11127)
  Port PackedSequences functions to C++ (pytorch#11224)
  Treat numerical differences as warnings instead of errors when tracing (pytorch#11246)
  add a Float16UniformFill (pytorch#11123)
  Implement torch.tensordot (pytorch#10025)
  keep net type info when generating model complete net (pytorch#11032)
  Get rid of some uses of type() (pytorch#11215)
  Reorganize methods in Type, add CPUTypeDefault/CUDATypeDefault (pytorch#11205)
  ...

Summary:
Fix Windows build failure after #10744 landed.
Pull Request resolved: #11312

Reviewed By: mingzhe09088

Differential Revision: D9669907

Pulled By: orionr

fbshipit-source-id: d717ec4f8fdf17acf334528d7838b88c5c50e9c3

…#10744)

Summary:
Pull Request resolved: pytorch#10744

As title

Reviewed By: jspark1105

Differential Revision: D9436387

fbshipit-source-id: 578b7a6d98843d57e3f8f4c564727e9cadbedd78

Summary:
Fix Windows build failure after pytorch#10744 landed.
Pull Request resolved: pytorch#11312

Reviewed By: mingzhe09088

Differential Revision: D9669907

Pulled By: orionr

fbshipit-source-id: d717ec4f8fdf17acf334528d7838b88c5c50e9c3