Merge remote-tracking branch 'origin/master' into develop

Author: searchivarius

README.md

@@ -72,4 +72,3 @@ neighbor search small world approach.](http://www.iiis.org/CDs2011/CD2011IDI/ICT
 * Amato, Giuseppe, and Pasquale Savino. 2008 Approximate similarity search in metric spaces using inverted files. [**[BibTex]**](http://dblp.uni-trier.de/rec/bibtex/conf/infoscale/AmatoS08)
 * Gonzalez, Edgar Chavez, Karina Figueroa, and Gonzalo Navarro. [Effective proximity retrieval by ordering permutations.](http://www.dcc.uchile.cl/~gnavarro/ps/tpami07.pdf) Pattern Analysis and Machine Intelligence, IEEE Transactions on 30.9 (2008): 1647-1658. [**[BibTex]**](http://dblp.uni-trier.de/rec/bibtex/journals/pami/ChavezFN08)
 
-

docs/_sources/quickstart.rst.txt

@@ -8,7 +8,12 @@ This project works with Python on version 2.7+ and 3.5+, and on Linux, OSX and t
 
 ``pip install nmslib``
 
-You may need to install Python dev-files. On Ubuntu, you can do it as follows:
+This command will attempt to install a pre-compiled binary, which can be a bit slower.
+For best performance, the library needs to be installed from sources:
+
+``pip install --no-binary :all: nmslib``
+
+For installation from sources, you may need to install Python dev-files. On Ubuntu, you can do it as follows:
 
 ``sudo apt-get install python3-dev``
 

docs/quickstart.html

@@ -172,7 +172,10 @@ <h1>Python bindings for NMSLIB<a class="headerlink" href="#python-bindings-for-n
 <h2>Installation<a class="headerlink" href="#installation" title="Permalink to this headline">¶</a></h2>
 <p>This project works with Python on version 2.7+ and 3.5+, and on Linux, OSX and the Windows operating systems. To install:</p>
 <p><code class="docutils literal notranslate"><span class="pre">pip</span> <span class="pre">install</span> <span class="pre">nmslib</span></code></p>
-<p>You may need to install Python dev-files. On Ubuntu, you can do it as follows:</p>
+<p>This command will attempt to install a pre-compiled binary, which can be a bit slower.
+For best performance, the library needs to be installed from sources:</p>
+<p><code class="docutils literal notranslate"><span class="pre">pip</span> <span class="pre">install</span> <span class="pre">--no-binary</span> <span class="pre">:all:</span> <span class="pre">nmslib</span></code></p>
+<p>For installation from sources, you may need to install Python dev-files. On Ubuntu, you can do it as follows:</p>
 <p><code class="docutils literal notranslate"><span class="pre">sudo</span> <span class="pre">apt-get</span> <span class="pre">install</span> <span class="pre">python3-dev</span></code></p>
 <p>Building on Windows requires Visual Studio 2015, see <a class="reference external" href="https://github.com/pybind/python_example#installation">this project for more information</a>.</p>
 </div>

docs/searchindex.js

@@ -8,7 +8,12 @@ This project works with Python on version 2.7+ and 3.5+, and on Linux, OSX and t
 
 ``pip install nmslib``
 
-You may need to install Python dev-files. On Ubuntu, you can do it as follows:
+This command will attempt to install a pre-compiled binary, which can be a bit slower.
+For best performance, the library needs to be installed from sources:
+
+``pip install --no-binary :all: nmslib``
+
+For installation from sources, you may need to install Python dev-files. On Ubuntu, you can do it as follows:
 
 ``sudo apt-get install python3-dev``
 

python_bindings/docs/quickstart.rst

@@ -145,19 +145,19 @@ void InfoAboutUnusedCPUFeatures() {
     if (!missing_instructions.empty()) {
 /*
 #ifndef INTEL_MKL
-      std::cout << "Your CPU supports instructions that this TensorFlow "
+      std::cerr << "Your CPU supports instructions that this TensorFlow "
                 << "binary was not compiled to use:" << missing_instructions << std::endl;
 #else
-      std::cout << "This TensorFlow binary is optimized with Intel(R) MKL-DNN "
+      std::cerr << "This TensorFlow binary is optimized with Intel(R) MKL-DNN "
                 << "to use the following CPU instructions in performance "
                 << "critical operations: " << missing_instructions << std::endl
                 << "To enable them in non-MKL-DNN operations, rebuild "
                 << "TensorFlow with the appropriate compiler flags." << std::endl;
 #endif
 */
-      std::cout << "Your CPU supports instructions that this binary "
+      std::cerr << "Your CPU supports instructions that this binary "
                 << "was not compiled to use:" << missing_instructions << std::endl;
-      std::cout << "For maximum performance, you can install NMSLIB from sources " << std::endl
+      std::cerr << "For maximum performance, you can install NMSLIB from sources " << std::endl
                 << "pip install --no-binary :all: nmslib" << std::endl; 
     }
 }