提交 1011d6f9 编写于 作者: M Marius Muja

Moved TBB doc to the manual

上级 c2063f73
......@@ -32,39 +32,6 @@ If you want to try out the latest changes or contribute to FLANN, then it's reco
If you just want to browse the repository, you can do so by going [here](https://github.com/mariusmuja/flann).
Compiling FLANN with multithreading support
------------------------------------------
Make sure you have Intel Threading Building Blocks installed. You can get the latest version from www.threadingbuildingblocks.org. Alternatively you can also get it from package manager (this will probably not be the latest version, e.g. on Ubuntu 10.04 LTS only version 2.2 is found this way).
For CMake to be able to detect the installation of Intel TBB, you need to have a tbb.pc in one of the directories of your PKG_CONFIG_PATH, it should look somewhat like this:
_________________________________________________
tbb.pc
_________________________________________________
prefix=/usr
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${prefix}/include
Name: Threading Building Blocks
Description: Intel's parallelism library for C++
URL: http://www.threadingbuildingblocks.org/
Version: 3.0update7
Libs: -L${libdir} -ltbb
Cflags: -I${includedir}
_________________________________________________
Using multithreaded FLANN in your project
-----------------------------------------
When multithreaded FLANN is compiled and installed, all you need to do now is compile your project with the -DTBB compiler flag to enable multithreading support. For example; in CMake you can achieve this by stating "ADD_DEFINITIONS(-DTBB)" for your target.
Have a look at the "flann::Index::knnSearch" section in the manual on how to specify the number of cores for knn- and radiussearch.
Conditions of use
-----------------
......
......@@ -249,13 +249,11 @@ options use the \texttt{cmake-gui} application after \texttt{cmake} has finished
\subsection{Compiling FLANN with multithreading support}
To make use of FLANN multithreading support, it is required that Intel Threading Building Blocks is installed correctly
on your system. You can either get it from your package manager or from:
\begin{center}
\texttt{http://threadingbuildingblocks.org/}
\end{center}
on your system. You can either get it from your package manager or from: \texttt{http://threadingbuildingblocks.org/}
You also need a pkgconfig file for locating the Intel TBB install and need to specify a -DTBB compiler flag on compilation
of your project. Have a look at the readme file in the root folder of FLANN for more detailed instructions.
You also need a pkgconfig file (tbb.pc) in one of the directories in your \texttt{PKG\_CONFIG\_PATH} and need to define
the \texttt{TBB} macro on compilation of your project (for example by adding \texttt{-DTBB} to the compiler options or
if using cmake by adding \texttt{add\_definitions(-DTBB)} to your \texttt{CMakeLists.txt}).
\section{Using FLANN}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册