Skip to content

Commit

Permalink
Add tests
Browse files Browse the repository at this point in the history
  • Loading branch information
shreyas-arvindekar committed Mar 5, 2024
1 parent 72fcf3f commit 7491a42
Show file tree
Hide file tree
Showing 28 changed files with 1,145 additions and 109 deletions.
12 changes: 9 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,17 @@ if(${status} EQUAL 0)
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/build/doxygen_spell_check.py xml ${CMAKE_SOURCE_DIR}/modules/nestor/test/standards_exceptions
DEPENDS ${IMP_kernel_DOC}
${IMP_cgal_DOC}
${IMP_mmcif_DOC}
${IMP_algebra_DOC}
${IMP_display_DOC}
${IMP_score_functor_DOC}
${IMP_statistics_DOC}
${IMP_core_DOC}
${IMP_container_DOC} ${headers} ${docs} ${examples} ${CMAKE_SOURCE_DIR}/modules/nestor/README.md ${IMP_nestor_TAG_DEPENDS}
${IMP_container_DOC}
${IMP_atom_DOC}
${IMP_em_DOC}
${IMP_saxs_DOC}
${IMP_isd_DOC} ${headers} ${docs} ${examples} ${CMAKE_SOURCE_DIR}/modules/nestor/README.md ${IMP_nestor_TAG_DEPENDS}
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/doxygen/nestor/
COMMENT "Running doxygen on nestor")

Expand All @@ -90,8 +96,8 @@ ${IMP_container_DOC} ${headers} ${docs} ${examples} ${CMAKE_SOURCE_DIR}/modules/
endif(IMP_DOXYGEN_FOUND)

if(0 EQUAL 0)
list(APPEND imp_nestor_libs ${IMP_kernel_LIBRARY};${IMP_cgal_LIBRARY};${IMP_algebra_LIBRARY};${IMP_display_LIBRARY};${IMP_score_functor_LIBRARY};${IMP_core_LIBRARY};${IMP_container_LIBRARY})
list(APPEND imp_nestor_libs ${BOOST.FILESYSTEM_LIBRARIES};${BOOST.PROGRAMOPTIONS_LIBRARIES};${BOOST.SYSTEM_LIBRARIES};${GPERFTOOLS_LIBRARIES};${TCMALLOC_HEAPPROFILER_LIBRARIES};${TCMALLOC_HEAPCHECKER_LIBRARIES};${BOOST.RANDOM_LIBRARIES};${NUMPY_LIBRARIES};${CGAL_LIBRARIES};${ANN_LIBRARIES};${HDF5_LIBRARIES};${PYTHON-IHM_LIBRARIES};${ROBIN_MAP_LIBRARIES};${GOOGLE_DENSE_HASH_MAP_LIBRARIES})
list(APPEND imp_nestor_libs ${IMP_kernel_LIBRARY};${IMP_cgal_LIBRARY};${IMP_mmcif_LIBRARY};${IMP_algebra_LIBRARY};${IMP_display_LIBRARY};${IMP_score_functor_LIBRARY};${IMP_statistics_LIBRARY};${IMP_core_LIBRARY};${IMP_container_LIBRARY};${IMP_atom_LIBRARY};${IMP_em_LIBRARY};${IMP_saxs_LIBRARY};${IMP_isd_LIBRARY})
list(APPEND imp_nestor_libs ${BOOST.FILESYSTEM_LIBRARIES};${BOOST.PROGRAMOPTIONS_LIBRARIES};${BOOST.SYSTEM_LIBRARIES};${GPERFTOOLS_LIBRARIES};${TCMALLOC_HEAPPROFILER_LIBRARIES};${TCMALLOC_HEAPCHECKER_LIBRARIES};${BOOST.RANDOM_LIBRARIES};${NUMPY_LIBRARIES};${CGAL_LIBRARIES};${ANN_LIBRARIES};${HDF5_LIBRARIES};${PYTHON-IHM_LIBRARIES};${ROBIN_MAP_LIBRARIES};${GOOGLE_DENSE_HASH_MAP_LIBRARIES};${BOOST.REGEX_LIBRARIES})
list(REMOVE_DUPLICATES imp_nestor_libs)

add_custom_command(
Expand Down
427 changes: 427 additions & 0 deletions LICENSE

Large diffs are not rendered by default.

113 changes: 105 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,111 @@
\brief New module created by make-module.py on Mon Mar 4 17:26:41 2024
[![PubMed](https://salilab.org/imp-systems/static/images/pubmed.png)](https://pubmed.ncbi.nlm.nih.gov/xyz/) #TODO: Replace xyz with PubMed ID

Fill in this file with a description of your module.
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.10360718.svg)](https://doi.org/10.5281/zenodo.10360718)

# Info

_Author(s)_: (full names of author(s))
# **NestOR: Nested Sampling-based Optimization of Representation for Integrative Structural Modeling**

_Maintainer_: (GitHub name of active maintainer)
![graphical_abstract_nestor](https://github.com/isblab/nestor/assets/8314735/74b4aa65-1f64-45e1-89ac-5bcb69ecb27d)

_License_: None
## **Installation:**
### **Dependencies:**
* IMP (compiled from the source code). See [IMP installation](https://github.com/salilab/imp)
* Python libraries: `numpy`, `mergedeep`, `mpi4py`, `matplotlib`, `pyyaml`

_Publications_:
- None
### **NestOR installation:**
1. Compile IMP from the souce code to your choice of directory
2. Clone this repository and replace `imp/modules/nestor/` with it
2. **_(deprecated)_** Replace the `macros.py` in `imp/modules/pmi/pyext/src/` with the `macros.py` in the current repository. Make sure the file is named `macros.py` in the destination directory. Similarly, replace the restraints directory in `imp/modules/pmi/pyext/src/` with the restraints directory in the present repository.
**_#TODO: Remove deprecated point_**

## **Running NestOR:**

### Inputs

(See also `examples/`)
1. Split the crosslinks into sampling and evidence calculation subsets using `python pyext/src/xl_datasplitter.py {path}` where, path refers to the path of the target crosslinking file.
2. Make the modeling script in the form as shown in the `examples/modeling.py`. One will also need to make separate topology files for different candidate representations.
_* Make sure that the restraints that are to be used to inform the likelihood have `weight=0`, and these are added to a separate list that is passed to the replica exchange macro as `nestor_restraints` argument_.
_* Ensure the modeling script looks similar to the one in `example/`. Specifically, ensure that the modeling instructions are enclosed in a function that is called so that the terminal stdout of the modeling is not returned to the terminal. One can use `contextlib` as shown in the example._
4. Set appropriate parameters in the `nestor_params.yaml` file.

### Run command

1. Run the NestOR wrapper as follows:
```python pyext/src/wrapper_v5.py {nestor_param_path} {mode}```
where, `nestor_param_path` refers to the absolute path to the `nestor_params.yaml`file and mode refers to the mode of representation (`manual`/`topology`). The default choice is topology (does not need to be mentioned), If the representation is defined in the modeling script, use manual argument.

2. Run the following command:
```python figure_scripts/plot_evidence_proctime_together.py {path} {name}```
where, `path` refers to the parent_dir in NestOR params file and `name` refers to the name of the assembly for which the representations is being optimized.

**Note**

_One_ `NestOR run` corresponds to the set of all nested sampling runs for all candidate representations._
One can also compare results from `NestOR runs` with different parameter settings by running `python pyext/src/compare_runs_v2_w_pyplot.py {comparison_title} run_set1 run_set2 ...` where comparison_title is the title for the runs to be compared, run_set1 and run_set2 are the NestOR runs to be compared.

## Outputs

### Plots

Step 1 in the Run command above, _i.e._ one NestOR run generates these plots:

1. **Evidence**: The plot (`*_params_evidence_errorbarplot.png`) shows the mean values of evidence for all the candidate representations along with errorbars showing the standard error on the mean.
2. **MCMC per-step time**: The plot (`*_params_persteptime.png`) shows the time required to sample one MCMC step per run. This is computed as `(time taken for iteration 0)/((number of initial frames)*(number of MCMC steps per frame))`

Step 2 in the `Run command` above generates this additional plot.

3. **Evidence and MCMC per-step time per representation** : The plot (`*sterr_evi_and_proctime.png`) compares evidences and their sampling efficiency across representations.

### Output YAML file

This file is generated upon completion of step 1 in the `Run command` above.

## Choice of NestOR parameters

**Evidence related:**
- log_estimated_evidence: `float`
_The estimated evidence value represented as natural logarithm of the estimated evidence_
- obtained_information: `float`
_Information obtained from the nested sampling run_
- analytical_uncertainty: `float`
_The analytical uncertainty associated with evidence estimation for a run by nested sampling_

**Efficiency related**
- mcmc_step_time: `float`
_Time taken per MCMC step. This is computed as `(time taken for iteration 0)/((number of initial frames)*(number of MCMC steps per frame))`_
- nestor_process_time: `float`
_Wall clock time taken by a nested sampling run to finish, represented in seconds_

**Termination related**
- exit_code: `int` (0, 11, 12, 13)
_Exit code for a nested sampling run_
- termination_mode: `str`
_Cause for run termination_
- failed_iter: `int`
_Number of times Replica Exchange failed to obtain a sample from constrained prior in the current iteration of nested sampling_
- last_iter: `int`
_Iteration count (number of iterations) when nested sampling terminated_
- plateau_hits: `int`
_Number of consecutive times the nested sampling protocol detected a plateau in the estimated evidence_

**Exit codes:**
- Exit code 0: Run terminated normally.
- Exit code 11: Run terminated due to either a shuffle configuration error or NaN was encountered in the likelihoods. The run will be restarted automatically.
- Exit code 12: Run terminated as NestOR ran out of maximum allowed iterations. The run will not be restarted.
- Exit code 13: Run terminated due to *Math domain error* in analytical uncertainty calculation. This happened probably because the run terminated too early resulting in a negative value for H.

**_If a run terminates with `exit code = 12`, the run is considered incomplete (and is not rerun) and its results are not considered valid, i.e. these are not plotted and not used to infer optimal representation. Results from runs with exit codes 0 and 13 are used to infer the optimal representation_**


## **Information**
**Author(s):** Shreyas Arvindekar, Aditi Pathak, Kartik Majila, Shruthi Viswanath
**Date**: April 7th, 2023
**License:** [CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/)
This work is licensed under the Creative Commons Attribution-ShareAlike 4.0
International License.
**Last known good IMP version:** `not tested`
**Testable:** Yes
**Parallelizeable:** Yes
**Publications:** Arvindekar, S, Pathak., A.S., Majila. K.M., Viswanath, S. Optimizing representations for integrative structural modeling using bayesian model selection. DOI: [10.1093/bioinformatics/btae106](https://doi.org/10.1093/bioinformatics/btae106).
**_#TODO: Make the publication in appropriate format_**
6 changes: 4 additions & 2 deletions benchmark/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ include_directories(SYSTEM ${ANN_INCLUDE_PATH}
${BOOST.FILESYSTEM_INCLUDE_PATH}
${BOOST.PROGRAMOPTIONS_INCLUDE_PATH}
${BOOST.RANDOM_INCLUDE_PATH}
${BOOST.REGEX_INCLUDE_PATH}
${BOOST.SYSTEM_INCLUDE_PATH}
${CGAL_INCLUDE_PATH}
${GOOGLE_DENSE_HASH_MAP_INCLUDE_PATH}
Expand All @@ -19,6 +20,7 @@ link_directories(${ANN_LINK_PATH}
${BOOST.FILESYSTEM_LINK_PATH}
${BOOST.PROGRAMOPTIONS_LINK_PATH}
${BOOST.RANDOM_LINK_PATH}
${BOOST.REGEX_LINK_PATH}
${BOOST.SYSTEM_LINK_PATH}
${CGAL_LINK_PATH}
${GOOGLE_DENSE_HASH_MAP_LINK_PATH}
Expand All @@ -37,7 +39,7 @@ include(Files.cmake)

set(IMP_TEST_ARGUMENTS "--run_quick_test" "--deprecation_exceptions")
set(IMP_LINK_LIBRARIES IMP.nestor-lib
${IMP_kernel_LIBRARY};${IMP_cgal_LIBRARY};${IMP_algebra_LIBRARY};${IMP_display_LIBRARY};${IMP_score_functor_LIBRARY};${IMP_core_LIBRARY};${IMP_container_LIBRARY} ${IMP_benchmark_LIBRARY}
${BOOST.FILESYSTEM_LIBRARIES};${BOOST.PROGRAMOPTIONS_LIBRARIES};${BOOST.SYSTEM_LIBRARIES};${GPERFTOOLS_LIBRARIES};${TCMALLOC_HEAPPROFILER_LIBRARIES};${TCMALLOC_HEAPCHECKER_LIBRARIES};${BOOST.RANDOM_LIBRARIES};${NUMPY_LIBRARIES};${CGAL_LIBRARIES};${ANN_LIBRARIES};${HDF5_LIBRARIES};${PYTHON-IHM_LIBRARIES};${ROBIN_MAP_LIBRARIES};${GOOGLE_DENSE_HASH_MAP_LIBRARIES})
${IMP_kernel_LIBRARY};${IMP_cgal_LIBRARY};${IMP_mmcif_LIBRARY};${IMP_algebra_LIBRARY};${IMP_display_LIBRARY};${IMP_score_functor_LIBRARY};${IMP_statistics_LIBRARY};${IMP_core_LIBRARY};${IMP_container_LIBRARY};${IMP_atom_LIBRARY};${IMP_em_LIBRARY};${IMP_saxs_LIBRARY};${IMP_isd_LIBRARY} ${IMP_benchmark_LIBRARY}
${BOOST.FILESYSTEM_LIBRARIES};${BOOST.PROGRAMOPTIONS_LIBRARIES};${BOOST.SYSTEM_LIBRARIES};${GPERFTOOLS_LIBRARIES};${TCMALLOC_HEAPPROFILER_LIBRARIES};${TCMALLOC_HEAPCHECKER_LIBRARIES};${BOOST.RANDOM_LIBRARIES};${NUMPY_LIBRARIES};${CGAL_LIBRARIES};${ANN_LIBRARIES};${HDF5_LIBRARIES};${PYTHON-IHM_LIBRARIES};${ROBIN_MAP_LIBRARIES};${GOOGLE_DENSE_HASH_MAP_LIBRARIES};${BOOST.REGEX_LIBRARIES})

imp_add_tests("IMP.nestor" ${PROJECT_BINARY_DIR}/benchmark/nestor IMP_nestor_BENCHMARKS benchmark ${pyfiles} ${cppfiles})
6 changes: 4 additions & 2 deletions bin/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ include_directories(SYSTEM ${ANN_INCLUDE_PATH}
${BOOST.FILESYSTEM_INCLUDE_PATH}
${BOOST.PROGRAMOPTIONS_INCLUDE_PATH}
${BOOST.RANDOM_INCLUDE_PATH}
${BOOST.REGEX_INCLUDE_PATH}
${BOOST.SYSTEM_INCLUDE_PATH}
${CGAL_INCLUDE_PATH}
${GOOGLE_DENSE_HASH_MAP_INCLUDE_PATH}
Expand All @@ -19,6 +20,7 @@ link_directories(${ANN_LINK_PATH}
${BOOST.FILESYSTEM_LINK_PATH}
${BOOST.PROGRAMOPTIONS_LINK_PATH}
${BOOST.RANDOM_LINK_PATH}
${BOOST.REGEX_LINK_PATH}
${BOOST.SYSTEM_LINK_PATH}
${CGAL_LINK_PATH}
${GOOGLE_DENSE_HASH_MAP_LINK_PATH}
Expand All @@ -39,8 +41,8 @@ foreach (bin ${cppfiles})
GET_FILENAME_COMPONENT(name ${bin} NAME_WE)
add_executable(IMP.nestor-${name} ${bin})
target_link_libraries(IMP.nestor-${name} IMP.nestor-lib
${IMP_kernel_LIBRARY};${IMP_cgal_LIBRARY};${IMP_algebra_LIBRARY};${IMP_display_LIBRARY};${IMP_score_functor_LIBRARY};${IMP_core_LIBRARY};${IMP_container_LIBRARY}
${BOOST.FILESYSTEM_LIBRARIES};${BOOST.PROGRAMOPTIONS_LIBRARIES};${BOOST.SYSTEM_LIBRARIES};${GPERFTOOLS_LIBRARIES};${TCMALLOC_HEAPPROFILER_LIBRARIES};${TCMALLOC_HEAPCHECKER_LIBRARIES};${BOOST.RANDOM_LIBRARIES};${NUMPY_LIBRARIES};${CGAL_LIBRARIES};${ANN_LIBRARIES};${HDF5_LIBRARIES};${PYTHON-IHM_LIBRARIES};${ROBIN_MAP_LIBRARIES};${GOOGLE_DENSE_HASH_MAP_LIBRARIES})
${IMP_kernel_LIBRARY};${IMP_cgal_LIBRARY};${IMP_mmcif_LIBRARY};${IMP_algebra_LIBRARY};${IMP_display_LIBRARY};${IMP_score_functor_LIBRARY};${IMP_statistics_LIBRARY};${IMP_core_LIBRARY};${IMP_container_LIBRARY};${IMP_atom_LIBRARY};${IMP_em_LIBRARY};${IMP_saxs_LIBRARY};${IMP_isd_LIBRARY}
${BOOST.FILESYSTEM_LIBRARIES};${BOOST.PROGRAMOPTIONS_LIBRARIES};${BOOST.SYSTEM_LIBRARIES};${GPERFTOOLS_LIBRARIES};${TCMALLOC_HEAPPROFILER_LIBRARIES};${TCMALLOC_HEAPCHECKER_LIBRARIES};${BOOST.RANDOM_LIBRARIES};${NUMPY_LIBRARIES};${CGAL_LIBRARIES};${ANN_LIBRARIES};${HDF5_LIBRARIES};${PYTHON-IHM_LIBRARIES};${ROBIN_MAP_LIBRARIES};${GOOGLE_DENSE_HASH_MAP_LIBRARIES};${BOOST.REGEX_LIBRARIES})
set_target_properties(IMP.nestor-${name} PROPERTIES
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
OUTPUT_NAME ${name})
Expand Down
6 changes: 3 additions & 3 deletions dependencies.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
required_modules = 'container:core'
required_dependencies = ''
optional_dependencies = ''
required_modules = "container:core:isd:mmcif"
required_dependencies = ""
optional_dependencies = ""
6 changes: 4 additions & 2 deletions examples/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ include_directories(SYSTEM ${ANN_INCLUDE_PATH}
${BOOST.FILESYSTEM_INCLUDE_PATH}
${BOOST.PROGRAMOPTIONS_INCLUDE_PATH}
${BOOST.RANDOM_INCLUDE_PATH}
${BOOST.REGEX_INCLUDE_PATH}
${BOOST.SYSTEM_INCLUDE_PATH}
${CGAL_INCLUDE_PATH}
${GOOGLE_DENSE_HASH_MAP_INCLUDE_PATH}
Expand All @@ -19,6 +20,7 @@ link_directories(${ANN_LINK_PATH}
${BOOST.FILESYSTEM_LINK_PATH}
${BOOST.PROGRAMOPTIONS_LINK_PATH}
${BOOST.RANDOM_LINK_PATH}
${BOOST.REGEX_LINK_PATH}
${BOOST.SYSTEM_LINK_PATH}
${CGAL_LINK_PATH}
${GOOGLE_DENSE_HASH_MAP_LINK_PATH}
Expand All @@ -34,7 +36,7 @@ include(Files.cmake)

set(IMP_TEST_ARGUMENTS "--run_quick_test" "--deprecation_exceptions")
set(IMP_LINK_LIBRARIES IMP.nestor-lib
${IMP_kernel_LIBRARY};${IMP_cgal_LIBRARY};${IMP_algebra_LIBRARY};${IMP_display_LIBRARY};${IMP_score_functor_LIBRARY};${IMP_core_LIBRARY};${IMP_container_LIBRARY}
${BOOST.FILESYSTEM_LIBRARIES};${BOOST.PROGRAMOPTIONS_LIBRARIES};${BOOST.SYSTEM_LIBRARIES};${GPERFTOOLS_LIBRARIES};${TCMALLOC_HEAPPROFILER_LIBRARIES};${TCMALLOC_HEAPCHECKER_LIBRARIES};${BOOST.RANDOM_LIBRARIES};${NUMPY_LIBRARIES};${CGAL_LIBRARIES};${ANN_LIBRARIES};${HDF5_LIBRARIES};${PYTHON-IHM_LIBRARIES};${ROBIN_MAP_LIBRARIES};${GOOGLE_DENSE_HASH_MAP_LIBRARIES})
${IMP_kernel_LIBRARY};${IMP_cgal_LIBRARY};${IMP_mmcif_LIBRARY};${IMP_algebra_LIBRARY};${IMP_display_LIBRARY};${IMP_score_functor_LIBRARY};${IMP_statistics_LIBRARY};${IMP_core_LIBRARY};${IMP_container_LIBRARY};${IMP_atom_LIBRARY};${IMP_em_LIBRARY};${IMP_saxs_LIBRARY};${IMP_isd_LIBRARY}
${BOOST.FILESYSTEM_LIBRARIES};${BOOST.PROGRAMOPTIONS_LIBRARIES};${BOOST.SYSTEM_LIBRARIES};${GPERFTOOLS_LIBRARIES};${TCMALLOC_HEAPPROFILER_LIBRARIES};${TCMALLOC_HEAPCHECKER_LIBRARIES};${BOOST.RANDOM_LIBRARIES};${NUMPY_LIBRARIES};${CGAL_LIBRARIES};${ANN_LIBRARIES};${HDF5_LIBRARIES};${PYTHON-IHM_LIBRARIES};${ROBIN_MAP_LIBRARIES};${GOOGLE_DENSE_HASH_MAP_LIBRARIES};${BOOST.REGEX_LIBRARIES})

imp_add_tests("IMP.nestor" ${PROJECT_BINARY_DIR}/doc/examples/nestor IMP_nestor_EXAMPLES example ${pyfiles} ${cppfiles})
2 changes: 1 addition & 1 deletion examples/Files.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
set(pyfiles "")
set(pyfiles "nude_modeling.py")
set(cppfiles "")
set(cudafiles "")
9 changes: 9 additions & 0 deletions pyext/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ include_directories(SYSTEM ${ANN_INCLUDE_PATH}
${BOOST.FILESYSTEM_INCLUDE_PATH}
${BOOST.PROGRAMOPTIONS_INCLUDE_PATH}
${BOOST.RANDOM_INCLUDE_PATH}
${BOOST.REGEX_INCLUDE_PATH}
${BOOST.SYSTEM_INCLUDE_PATH}
${CGAL_INCLUDE_PATH}
${GOOGLE_DENSE_HASH_MAP_INCLUDE_PATH}
Expand All @@ -40,6 +41,7 @@ link_directories(${ANN_LINK_PATH}
${BOOST.FILESYSTEM_LINK_PATH}
${BOOST.PROGRAMOPTIONS_LINK_PATH}
${BOOST.RANDOM_LINK_PATH}
${BOOST.REGEX_LINK_PATH}
${BOOST.SYSTEM_LINK_PATH}
${CGAL_LINK_PATH}
${GOOGLE_DENSE_HASH_MAP_LINK_PATH}
Expand All @@ -61,6 +63,7 @@ set(swig_path ${ANN_SWIG_PATH}
${BOOST.FILESYSTEM_SWIG_PATH}
${BOOST.PROGRAMOPTIONS_SWIG_PATH}
${BOOST.RANDOM_SWIG_PATH}
${BOOST.REGEX_SWIG_PATH}
${BOOST.SYSTEM_SWIG_PATH}
${CGAL_SWIG_PATH}
${GOOGLE_DENSE_HASH_MAP_SWIG_PATH}
Expand Down Expand Up @@ -120,11 +123,17 @@ target_link_libraries(IMP.nestor-python

set(IMP_nestor_PYTHON ${source} IMP.nestor-python ${wrap_py} ${IMP_kernel_PYTHON}
${IMP_cgal_PYTHON}
${IMP_mmcif_PYTHON}
${IMP_algebra_PYTHON}
${IMP_display_PYTHON}
${IMP_score_functor_PYTHON}
${IMP_statistics_PYTHON}
${IMP_core_PYTHON}
${IMP_container_PYTHON}
${IMP_atom_PYTHON}
${IMP_em_PYTHON}
${IMP_saxs_PYTHON}
${IMP_isd_PYTHON}
CACHE INTERNAL "" FORCE)

INSTALL(TARGETS IMP.nestor-python DESTINATION ${CMAKE_INSTALL_PYTHONDIR})
Expand Down
2 changes: 1 addition & 1 deletion pyext/src/Files.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
set(pyfiles "nestor.py")
set(pyfiles "compare_runs_v2_w_pyplot.py;nestor.py;plot_evidence_proctime_together.py;wrapper_v6.py;xl_datasplitter.py")
set(cppfiles "")
set(cudafiles "")
Loading

0 comments on commit 7491a42

Please sign in to comment.