search

posterior / distributions

Low-level primitives for collapsed Gibbs sampling in python and C++
BSD 3-Clause "New" or "Revised" License
16 stars 8 forks source link

Fixes inclusion of Eigen3 #9

Closed tdhopper closed 9 years ago

tdhopper commented 9 years ago

Fixes inclusion of Eigen3.

FindEigen3.cmake sets EIGEN3_INCLUDE_DIR not EIGEN3_INCLUDE_DIRS. This make CMakeLists.txt reference the correct variable. Also include the parent path /eigen3/... instead of the path found by FindEigen3.cmake so the #include <eigen3/Eigen/*> statements work.

Also modifies makefile to allow user to set CONDA_ROOT environmental variable (to root directory of a conda environment) which will then be used as the CMAKE_INSTALL_PREFIX. Among other things, this allows the user to use conda install eign3 for installation of Eigen3.

CONDA_ROOT can typically be set with export CONDA_ROOT=$(conda info | grep "default environment" | cut -d ":" -f2).

There's an open ticket about adding the conda env root as an environmental variable when you source it.

stephentu commented 9 years ago

@tdhopper I don't think you should overwrite their Makefile with the one auto-generated by cmake

tdhopper commented 9 years ago

Right. Fixed that.

fritzo commented 9 years ago

:+1:

tdhopper commented 9 years ago

@fritzo I don't have merge rights. Can you merge this?

fritzo commented 9 years ago

@tdhopper I sent you an invitation back when you put up the PR. Feel free to merge henceforth.

tdhopper commented 9 years ago

@fritzo I thought you had. Apparently I didn't join. I'm in now.