Merge pull request #4 from kungfujam/master

Fix one small bug and add a couple of clarifications
This commit is contained in:
Pawel Swietojanski 2015-09-28 13:51:56 +01:00
commit 339bca6510

View File

@ -39,7 +39,7 @@
"### Configuring virtual environment (the generic way)\n",
"\n",
" * `git clone https://github.com/pypa/virtualenv`\n",
" * Enter the cloned repository and type `virtualenv.py --python /usr/bin/python2.7 --no-site-packages ~/mlpractical`\n",
" * Enter the cloned repository and type `./virtualenv.py --python /usr/bin/python2.7 --no-site-packages ~/mlpractical`\n",
" * Activate the environment by typing `source ~/mlpractical/bin/activate` (to leave the virtual environment one may type `decativate`). Environments need to be activated every time ones start the new session (unless you do this explicitly in the shell starting scripts, i.e. `~/.bashrc`).\n",
"\n",
"### Configuring virtual environment (more comfy DICE wrapper; ignore if you did the generic way above)\n",
@ -76,7 +76,7 @@
"\n",
"#### OpenBlas\n",
"\n",
"To install OpenBlas library run (replace first line to be the path to the directory where you installed OpenBlas):\n",
"To install OpenBlas library run (replace first line to be the path to the directory where you want to install OpenBlas):\n",
"\n",
"```\n",
"OBDir=~/OpenBlas\n",
@ -86,7 +86,7 @@
"make PREFIX=$OBDir/lib install\n",
"```\n",
"\n",
"Once OpenBLAS is finished compiling we need to ensure the compiled shared library files in the `lib` subdirectory are available to the shared library loader. This can be done by appending the absolute path to the `lib` subdirectory to the `LD_LIBRARY_PATH` environment variable. To ensure this changes persist we will change the bash start up file `~/.bashrc` by opening it in a text editor and adding the following line\n",
"Once OpenBLAS is finished compiling we need to ensure the compiled shared library files in the `lib` subdirectory are available to the shared library loader. This can be done by appending the absolute path to the `lib` subdirectory to the `LD_LIBRARY_PATH` environment variable. To ensure this changes persist we will change the bash start up file `~/.bashrc` by opening it in a text editor (e.g. by running `gedit ~/.bashrc`) and adding the following line\n",
"\n",
"```\n",
"export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OBDir/lib\n",
@ -129,12 +129,53 @@
},
{
"cell_type": "code",
"execution_count": null,
"execution_count": 1,
"metadata": {
"collapsed": false,
"scrolled": true
},
"outputs": [],
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"\u001b[H\u001b[2Jatlas_3_10_blas_threads_info:\n",
" libraries = ['tatlas']\n",
" library_dirs = ['/usr/lib64/atlas']\n",
" define_macros = [('HAVE_CBLAS', None), ('ATLAS_INFO', '\"\\\\\"3.10.1\\\\\"\"')]\n",
" language = c\n",
" include_dirs = ['/usr/include']\n",
"lapack_opt_info:\n",
" libraries = ['tatlas', 'tatlas', 'tatlas']\n",
" library_dirs = ['/usr/lib64/atlas']\n",
" define_macros = [('ATLAS_INFO', '\"\\\\\"3.10.1\\\\\"\"')]\n",
" language = f77\n",
" include_dirs = ['/usr/include']\n",
"blas_opt_info:\n",
" libraries = ['tatlas']\n",
" library_dirs = ['/usr/lib64/atlas']\n",
" define_macros = [('HAVE_CBLAS', None), ('ATLAS_INFO', '\"\\\\\"3.10.1\\\\\"\"')]\n",
" language = c\n",
" include_dirs = ['/usr/include']\n",
"openblas_info:\n",
" NOT AVAILABLE\n",
"openblas_lapack_info:\n",
" NOT AVAILABLE\n",
"atlas_3_10_threads_info:\n",
" libraries = ['tatlas', 'tatlas', 'tatlas']\n",
" library_dirs = ['/usr/lib64/atlas']\n",
" define_macros = [('ATLAS_INFO', '\"\\\\\"3.10.1\\\\\"\"')]\n",
" language = f77\n",
" include_dirs = ['/usr/include']\n",
"lapack_mkl_info:\n",
" NOT AVAILABLE\n",
"blas_mkl_info:\n",
" NOT AVAILABLE\n",
"mkl_info:\n",
" NOT AVAILABLE\n"
]
}
],
"source": [
"%clear\n",
"import numpy\n",