Merge pull request #526 from microsoft/staging

Syncing master <-> staging

.gitignore

@@ -116,7 +116,6 @@ output.ipynb
 # don't save any data
 classification/data/*
 /data/*
-!/data/misc
 !contrib/action_recognition/r2p1d/**
 !contrib/crowd_counting/crowdcounting/data/
 !scenarios/action_recognition/data
@@ -142,4 +141,4 @@ classification/FAQ.html
 classification/.DS_Store
 .DS_Store
 
-*.h5
+*.h5

NOTICE.txt

@@ -500,3 +500,29 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+--
+
+https://github.com/layumi/Person_reID_baseline_pytorch
+
+
+MIT License
+
+Copyright (c) 2018 Zhedong Zheng
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,5 +1,11 @@
 <img src="scenarios/media/logo_cvbp.png" align="right" alt="" width="300"/>
 
+```diff
++ March 27: Released v1.1 with new and improved
++ functionality for image retrieval, object detection, 
++ keypoint detection and action recognition. 
++ For additional details, please refer to our releases page.
+```
 
 # Computer Vision
 

environment.yml

@@ -1,4 +1,3 @@
-# 
 # To create the conda environment:
 # $ conda env create -f environment.yml
 # 
@@ -36,7 +35,10 @@ dependencies:
 - pre-commit>=1.14.4
 - pyyaml>=5.1.2
 - requests>=2.22.0
+- einops==0.1.0
+- cytoolz
 - pip:
+ - decord==0.3.5
  - nvidia-ml-py3
  - nteract-scrapbook
  - azureml-sdk[notebooks,contrib]>=1.0.30