summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorrscohn2 <rscohn2@gmail.com>2016-03-26 10:00:26 -0400
committerrscohn2 <rscohn2@gmail.com>2016-03-26 10:00:26 -0400
commit8c041a7cf3e571b175cfd8859f1af5f067f8cd7a (patch)
tree6b1d1a9b9d304e639d0aef6c230643a298fecc91 /docs
parentbe163be0ea5befada208dbf0db29e6fa5811dc86 (diff)
downloadcaffe-8c041a7cf3e571b175cfd8859f1af5f067f8cd7a.tar.gz
caffe-8c041a7cf3e571b175cfd8859f1af5f067f8cd7a.tar.bz2
caffe-8c041a7cf3e571b175cfd8859f1af5f067f8cd7a.zip
Update info about MKL licensing
The instructions say that MKL is free for students, but as of 8/2015, MKL is free for everyone with community licensing.
Diffstat (limited to 'docs')
-rw-r--r--docs/installation.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/installation.md b/docs/installation.md
index 89316458..e273034f 100644
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -52,7 +52,7 @@ Caffe requires BLAS as the backend of its matrix and vector computations.
There are several implementations of this library. The choice is yours:
* [ATLAS](http://math-atlas.sourceforge.net/): free, open source, and so the default for Caffe.
-* [Intel MKL](http://software.intel.com/en-us/intel-mkl): commercial and optimized for Intel CPUs, with a free trial and [student](http://software.intel.com/en-us/intel-education-offerings) licenses.
+* [Intel MKL](http://software.intel.com/en-us/intel-mkl): commercial and optimized for Intel CPUs, with [free](https://registrationcenter.intel.com/en/forms/?productid=2558) licenses.
1. Install MKL.
2. Set up MKL environment (Details: [Linux](https://software.intel.com/en-us/node/528499), [OS X](https://software.intel.com/en-us/node/528659)). Example: *source /opt/intel/mkl/bin/mklvars.sh intel64*
3. Set `BLAS := mkl` in `Makefile.config`