summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorEvan Shelhamer <shelhamer@imaginarynumber.net>2017-02-17 00:23:45 (GMT)
committerGitHub <noreply@github.com>2017-02-17 00:23:45 (GMT)
commitc5fad40d336883feb64cb0405abd4f56579faa83 (patch)
tree553591b077e5a4a56d89adfe01522748b4a4bd1f /docs
parentc510e335de00870486bbbe9082296b226322fb50 (diff)
parent8c041a7cf3e571b175cfd8859f1af5f067f8cd7a (diff)
downloadcaffeonacl-c5fad40d336883feb64cb0405abd4f56579faa83.zip
caffeonacl-c5fad40d336883feb64cb0405abd4f56579faa83.tar.gz
caffeonacl-c5fad40d336883feb64cb0405abd4f56579faa83.tar.bz2
Merge pull request #3893 from rscohn2/patch-1
[docs] info about MKL 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 6b2cd3b..2e55802 100644
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -64,7 +64,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`