Skip to content
This repository has been archived by the owner on Sep 11, 2023. It is now read-only.

Covartools cpp #1147

Merged
merged 10 commits into from
Aug 23, 2017
Merged
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
5 changes: 2 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@ project (pyemma)
add_subdirectory(pybind11)


pybind11_add_module(regspace_clustering pyemma/coordinates/clustering/src/clustering_module.cpp
pybind11_add_module(regspace_clustering pyemma/_ext/variational/estimators/covar_c/covartools.cpp
)

include_directories(pyemma/coordinates/clustering/include
/home/mi/marscher/miniconda/lib/python3.6/site-packages/mdtraj/core/lib/
include_directories(pyemma/_ext/variational/covar_c/

)
4 changes: 3 additions & 1 deletion doc/source/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ your Python installation to at least version 3.5.
- msm: fix setting of dt_model for BayesianMSM. This bug led to wrongly scaled time units for mean first passage times,
correlation and relaxation times as well for timescales for this estimator. #1116
- coordinates: Added the covariance property of time-lagged to CovarianceLagged. #1125
- coordinates: clustering code modernized in C++ with pybind11 interface. #
- coordinates: clustering code modernized in C++ with pybind11 interface. #1142
- variational: covartools code modernized in C++ with pybind11 interface. #1147


2.4 (05-19-2017)
----------------
Expand Down
360 changes: 0 additions & 360 deletions pyemma/_ext/variational/estimators/covar_c/_covartools.c

This file was deleted.

Loading