Skip to content

Cookbook entry #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 32 commits into
base: ANI-Integration-Check
Choose a base branch
from
Open

Cookbook entry #6

wants to merge 32 commits into from

Conversation

manangoel99
Copy link
Owner

This PR represents the final changes for integrating ANI into rdkit including the ANI ForceField forward pass and backward pass using numerical differentiation along with the corresponding python wrappers and ForceFieldHelpers function.
The corresponding Cookbook entry has also been made in Docs/Book/Cookbook.rst from lines 1819 to 1881.
All ANI components are built as separate libraries in CMake and weights for the model are pulled from a different repository during the build. This code passes all CI builds.
ANI builds for windows have been disabled which can be seen in CMakeLists.txt from lines 384 to 412.

manangoel99 and others added 30 commits August 16, 2020 09:56
- Pass variable in which AEV is to be stored as reference
- Added edge case handling in which no atoms lie within the cutoff radius of each other
… the atom along + and - x, y and axes and finding derivative by first principle
- Added tests for ANI Convenience functions
- Added python wrappers and python tests for the convenience functions
Added if condition to build Eigen Serializer only if eigen is present
Changed weights to use portable archives
Added CMake instructions to fetch the weights from supporting repository
Added condition in CMake to not build ANI and EigenSerializer when using windows
Made displacement a constant in numeric differentiation
Added use of std::unique_ptr in ForceFieldHelpers convenience functions
* Fixes rdkit#3365

* update expected inchi results

Note that this actually increases the number of failures with one of the tests.
That's because I believe the expected InChIs to be wrong and these new results to be correct.
CMakeLists.txt Outdated
if(NOT WIN32)
target_compile_definitions(rdkit_base INTERFACE "-DRDK_HAS_EIGEN3" "-DRDK_BUILD_ANI")
target_link_libraries(rdkit_base INTERFACE Eigen3::Eigen)
set(ANIParamsDir "${CMAKE_CURRENT_SOURCE_DIR}/Code/ForceField/ANI/Params")

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we move the part of this that deals with downloading and extracting the parameters to Code/ForceField/ANI/CMakeLists.txt?

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where should I move it to?

Changed CMakeLists.txt to pull weights to Data/ANIParams
Changed Cookbook entry to fix code rendering
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants