Improving Visual Embeddings using Attention and Geometry Constraints