Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "odl-cpp-utils"]
path = odl_cpp_utils
url = https://github.com/odlgroup/odl-cpp-utils.git
[submodule "pybind11"]
path = pybind11
url = https://github.com/odlgroup/pybind11.git
10 changes: 1 addition & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -71,19 +71,11 @@ else()
endif()
endif()

# Python bindings
set(Boost_USE_SHARED_LIBS ON)
set(Boost_USE_MULTITHREADED ON)
find_package(Boost COMPONENTS
python
REQUIRED)
include_directories(${Boost_INCLUDE_DIRS})
link_directories(${Boost_LIBRARY_DIRS})

# Find python
find_package(PythonLibs REQUIRED)
find_package(PythonInterp REQUIRED)
include_directories(${PYTHON_INCLUDE_DIRS})
include_directories("pybind11/include")

# Find numpy
find_package(Numpy REQUIRED)
Expand Down
17 changes: 9 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,24 +62,25 @@ Current external dependencies are
#####Python
The building block of ODL, ODLpp needs access to both python and numpy header files and compiled files to link against.

#####Boost
General library with C++ code. This project specifically uses [Boost.Python](http://www.boost.org/doc/libs/1_58_0/libs/python/doc/index.html) to handle the python bindings.
[Python webpage](https://www.python.org/)

[Boost webpage](http://www.boost.org/)
[Prebuilt boost (windows)](http://boost.teeks99.com/), this version uses python 2.7
#####Numpy
Backend used for easy interfacing of numerical data.

[Numpy webpage](http://www.numpy.org/)

#####CUDA
Used for GPU accelerated versions of algorithms. The code uses C++11 features in device code, so CUDA 7.0 is required. CUDA 6.5 may work on some platforms (notably windows). It should as of now compile with compute capbability >2.0, in the future certain features require higher compute capability may be added.

[CUDA](https://developer.nvidia.com/cuda-downloads)
[CUDA webpage](https://developer.nvidia.com/cuda-downloads)

### Included
These are distributed with this project.

#####Catch
A header only framework for automated testing. Currently shipped with the repository as a single include.
#####PyBind11
Library for creating python bindings for c++ code.

[Catch webpage](https://github.com/philsquared/Catch)
[PyBind11 github](https://github.com/wjakob/pybind11)

Troublefinding
--------------
Expand Down
1 change: 0 additions & 1 deletion external/README.md

This file was deleted.

Loading