Merge branch 'master' of https://github.com/yjxiong/caffe

Author: yjxiong

docs/installation.md

@@ -59,7 +59,7 @@ The main requirements are `numpy` and `boost.python` (provided by boost). `panda
 
 You can install the dependencies with
 
-    pip install -r /path/to/caffe/python/requirements.txt
+    for req in $(cat requirements.txt); do sudo pip install $req; done
 
 but we highly recommend first installing the [Anaconda](https://store.continuum.io/cshop/anaconda/) Python distribution, which provides most of the necessary packages, as well as the `hdf5` library dependency.
 

python/requirements.txt

@@ -1,14 +1,15 @@
 Cython>=0.19.2
-h5py>=2.2.0
+numpy>=1.7.1
+scipy>=0.13.2
+scikit-image>=0.9.3
+scikit-learn>=0.14.1
+matplotlib>=1.3.1
 ipython>=1.1.0
+h5py>=2.2.0
 leveldb>=0.191
-matplotlib>=1.3.1
 networkx>=1.8.1
 nose>=1.3.0
-numpy>=1.7.1
 pandas>=0.12.0
+python-dateutil>=1.4,<2
 protobuf>=2.5.0
 python-gflags>=2.0
-scikit-image>=0.9.3
-scikit-learn>=0.14.1
-scipy>=0.13.2