-
Notifications
You must be signed in to change notification settings - Fork 0
Pyberny addition #3
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
Merged
Merged
Changes from all commits
Commits
Show all changes
57 commits
Select commit
Hold shift + click to select a range
c6af382
Initial commit using cookiecutter to generate plugin template.
jlheflin 313f15d
Added PyBernyOpt.py and __init__.py
jlheflin 4146ec8
Removed scripting text at top of PyBernyOpt
jlheflin 68d7614
Removed structurefinder_mm.cpp and added structurefinder_mm.py for Mo…
jlheflin 6e0b3dd
Removed structurefinder_mm.py and moved python module structurefinder…
jlheflin fca3d17
Mirrored file structure of FriendZone
jlheflin e9d44ee
PyBernyOpt.py now returns the energy as well as the xyz string of the…
jlheflin c6a3b71
Changed wording on self.input in __init__.py to reflect the correct i…
jlheflin b3374d8
Rename PyBernyOpt.py to pybernyopt.py
ryanmrichard 5d0f334
Delete default_toolchain.cmake
ryanmrichard 46e5ace
Made it so that the xyz string that is made is generated by a loop ov…
jlheflin 423ec3d
more aligned with nwx
ryanmrichard 853fc8c
Merge pull request #4 from NWChemEx/refactor
jlheflin 907b88a
Committing clang-format changes
github-actions[bot] 4ba4214
Restructured to nwx style, added __init__.py files for structurefinde…
jlheflin 1fcb570
Fixed typo
jlheflin 5488415
Committing clang-format changes
github-actions[bot] 8377697
Adjusted __init__.py files to reflect that of FriendZone
jlheflin 80542aa
Fixed indentation issue
jlheflin 0e4b3ca
address jwaldrop's comments
ryanmrichard 1978f02
Delete src/python/structurefinder/pybernyopt.py
ryanmrichard e1e0524
add exception
ryanmrichard 4a86be4
Merge branch 'pyberny_addition' of https://github.com/nwchemex/struct…
ryanmrichard 54ba7c9
Committing clang-format changes
github-actions[bot] 2b63ee8
Made suggested changes to test_pybernyop.py and the pyberny __init__.…
jlheflin 2c73442
Adjusted __init__.py in pybery to make it work
jlheflin a20f551
Committing clang-format changes
github-actions[bot] 4613bc4
Adjusted __init__.py to include the correct submodule 'Energy and Gra…
jlheflin 40c921b
Resolve conflict
jlheflin df33484
Committing clang-format changes
github-actions[bot] 6f68017
Change property type from TotalEnergy to EnergyNuclearGradientStdVectorD
jlheflin 96a6432
Resolve conflict
jlheflin 69ec4bc
Committing clang-format changes
github-actions[bot] 49c9c72
Fix missing modules in pyberny __init__.py
jlheflin 71e2f35
Committing clang-format changes
github-actions[bot] 6a1c6dd
This does not fix anything, but if 'pointset1' is replaced by 'chemis…
jlheflin 6761af5
Committing clang-format changes
github-actions[bot] 81fcb06
Reverted changes
jlheflin 276a0bd
Committing clang-format changes
github-actions[bot] bb561b6
Fixed missing TotalEnergy import
jlheflin 9800bc3
Made suggested change from 'pointset1' to geom.molecule.nuclei
jlheflin d1206c1
Made suggested changes regarding removal of incorrectly specified cod…
jlheflin 69d06f6
Added PointSetD() to gradient calculation and fixed string output
jlheflin ad568ea
Committing clang-format changes
github-actions[bot] 477e58f
Added diagnostic printing and removed dependency of FriendZone
jlheflin 591ba2d
Fixed merge conflicts
jlheflin 8f420ab
Added parameters to allow tests to be passed for PyBerny optimization.
jlheflin 1746d1b
Committing clang-format changes
github-actions[bot] fceb006
Adjusted test files
jlheflin 84d379d
Added NWChemEx as a dependency for integration test
jlheflin 8582fac
made changes so StructureFinder can build
jlheflin 8c1b483
added LJ Potential Module Directory
jlheflin 4b1df13
Committing clang-format changes
github-actions[bot] 1d3a9b8
consulted the Oracle on how to use EnergyNuclearGradientStdVectorD
jlheflin b56b164
Committing clang-format changes
github-actions[bot] aa6ff96
me when the Py is Berny
jlheflin 00a20c9
made changes to workflows and CMakeLists.txt for docs
jlheflin File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| # Copyright 2021 NWChemEx-Project | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| # | ||
| header: | ||
| license: | ||
| spdx-id: Apache-2.0 | ||
| copyright-owner: NWChemEx Community | ||
|
|
||
| paths-ignore: | ||
| - .github/ | ||
| - LICENSE | ||
| - version.txt | ||
| - docs/source/nitpick_exceptions | ||
|
|
||
| comment: never |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| # Copyright 2024 NWChemEx Community | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| # | ||
|
|
||
| name: .github Merge Workflow | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - master | ||
|
|
||
| jobs: | ||
| Common-Merge: | ||
| uses: NWChemEx/.github/.github/workflows/common_merge.yaml@master | ||
| with: | ||
| doc_target: '' | ||
| generate_module_docs: true | ||
| secrets: inherit |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| # Copyright 2024 NWChemEx Community | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| # | ||
|
|
||
| name: .github Pull Request Workflow | ||
|
|
||
| on: | ||
| pull_request: | ||
| branches: | ||
| - master | ||
|
|
||
| jobs: | ||
| Common-Pull-Request: | ||
| uses: NWChemEx/.github/.github/workflows/common_pull_request.yaml@master | ||
| with: | ||
| config_file: '.github/.licenserc.yaml' | ||
| source_dir: '' | ||
| compilers: '["gcc-11", "clang-14"]' | ||
| doc_target: '' | ||
| secrets: inherit |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| # Copyright 2024 NWChemEx Community | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| __pycache__/ | ||
| build/ | ||
| venv/ | ||
| install/ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| # Copyright 2024 NWChemEx Community | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| cmake_minimum_required(VERSION 3.14) | ||
|
|
||
| ## Set Project and Version | ||
| file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/version.txt" VERSION) | ||
| project(structurefinder VERSION "${VERSION}" LANGUAGES CXX) | ||
|
|
||
| ## Get CMaize | ||
| include(cmake/get_nwx_cmake.cmake) | ||
| include(nwx_versions) | ||
| include(get_cmaize) | ||
|
|
||
| ## Paths ## | ||
| set(${PROJECT_NAME}_INC_DIR "${CMAKE_CURRENT_LIST_DIR}/include/${PROJECT_NAME}") | ||
| set(${PROJECT_NAME}_SRC_DIR "${CMAKE_CURRENT_LIST_DIR}/src/${PROJECT_NAME}") | ||
| set(${PROJECT_NAME}_TESTS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/tests") | ||
| set(${PROJECT_NAME}_PYTHON_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/python") | ||
| set(${PROJECT_NAME}_PYTHON_TEST_DIR "${${PROJECT_NAME}_TESTS_DIR}/python") | ||
|
|
||
| ## Options ## | ||
| cmaize_option_list( | ||
| BUILD_TESTING OFF "Should the tests be built?" | ||
| BUILD_PYBIND11_PYBINDINGS ON "Use Pybind11 to build Python bindings?" | ||
| ) | ||
|
|
||
| ## Find or build dependencies ## | ||
| cmaize_find_or_build_dependency( | ||
| simde | ||
| URL github.com/NWChemEx/SimDE | ||
| VERSION master | ||
| BUILD_TARGET simde | ||
| FIND_TARGET nwx::simde | ||
| CMAKE_ARGS BUILD_TESTING=OFF | ||
| BUILD_PYBIND11_PYBINDINGS=${BUILD_PYBIND11_PYBINDINGS} | ||
| BUILD_DOCS=OFF | ||
| ) | ||
|
|
||
| cmaize_find_or_build_dependency( | ||
| pyberny | ||
| PACKAGE_MANAGER pip | ||
| ) | ||
|
|
||
| ## Add libraries ## | ||
| add_library(${PROJECT_NAME} INTERFACE) | ||
| target_link_libraries(${PROJECT_NAME} INTERFACE simde pyberny) | ||
|
|
||
| ## Build tests ## | ||
| if("${BUILD_TESTING}") | ||
| include(CTest) | ||
| include(nwx_pybind11) | ||
|
|
||
| ## Add Tests ## | ||
| cmaize_find_or_build_dependency( | ||
| nwchemex | ||
| URL github.com/NWChemEx/NWChemEx | ||
| BUILD_TARGET nwchemex | ||
| FIND_TARGET nwx::nwchemex | ||
| CMAKE_ARGS BUILD_TESTING=OFF | ||
| BUILD_FULL_CHEMCACHE=OFF | ||
| ) | ||
|
|
||
| nwx_pybind11_tests( | ||
| py_${PROJECT_NAME} | ||
| "${${PROJECT_NAME}_PYTHON_TEST_DIR}/unit_tests/test_${PROJECT_NAME}.py" | ||
| DEPENDS nwchemex | ||
| SUBMODULES simde chemist pluginplay parallelzone friendzone chemcache nwchemex | ||
| ) | ||
|
|
||
| endif() | ||
|
|
||
| ## Add package ## | ||
| install( | ||
| DIRECTORY "${${PROJECT_NAME}_PYTHON_DIR}/${PROJECT_NAME}" | ||
| DESTINATION "${NWX_MODULE_DIRECTORY}" | ||
| ) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,18 @@ | ||
| <!-- | ||
| ~ Copyright 2024 NWChemEx Community | ||
| ~ | ||
| ~ Licensed under the Apache License, Version 2.0 (the "License"); | ||
| ~ you may not use this file except in compliance with the License. | ||
| ~ You may obtain a copy of the License at | ||
| ~ | ||
| ~ http://www.apache.org/licenses/LICENSE-2.0 | ||
| ~ | ||
| ~ Unless required by applicable law or agreed to in writing, software | ||
| ~ distributed under the License is distributed on an "AS IS" BASIS, | ||
| ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| ~ See the License for the specific language governing permissions and | ||
| ~ limitations under the License. | ||
| --> | ||
|
|
||
| # StructureFinder | ||
| Repo for geometry optimization, transition states, etc. Much of this repo will be Python based, providing interfaces to geomeTRIC, pyBerny, ASE NEB, etc. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| # Copyright 2024 NWChemEx Community | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| function(get_cmaize) | ||
|
|
||
| if("${CMAIZE_VERSION}" STREQUAL "") | ||
| set(CMAIZE_VERSION ca0f41e6d42829f9afb3c02f68ba4030fff6fee7 ) | ||
| endif() | ||
|
|
||
| # Store whether we are building tests or not, then turn off the tests | ||
| if(BUILD_TESTING) | ||
| set(build_testing_old "${BUILD_TESTING}") | ||
| endif() | ||
| set(BUILD_TESTING OFF CACHE BOOL "" FORCE) | ||
|
|
||
| # Download CMakePP and bring it into scope | ||
| include(FetchContent) | ||
| FetchContent_Declare( | ||
| cmaize | ||
| GIT_REPOSITORY https://github.com/CMakePP/CMaize | ||
| GIT_TAG ${CMAIZE_VERSION} | ||
| ) | ||
| FetchContent_MakeAvailable(cmaize) | ||
|
|
||
| # Restore the previous value, if set | ||
| # Unset otherwise | ||
| if(build_testing_old) | ||
| set(BUILD_TESTING "${build_testing_old}" CACHE BOOL "" FORCE) | ||
| else() | ||
| unset(BUILD_TESTING CACHE) | ||
| endif() | ||
| endfunction() | ||
|
|
||
| # Call the function we just wrote to get CMaize | ||
| get_cmaize() | ||
|
|
||
| # Include CMaize | ||
| include(cmaize/cmaize) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| # Copyright 2024 NWChemEx Community | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| include_guard() | ||
|
|
||
| macro(get_nwx_cmake) | ||
| include(FetchContent) | ||
| FetchContent_Declare( | ||
| nwx_cmake | ||
| GIT_REPOSITORY https://github.com/NWChemEx/NWXCMake | ||
| ) | ||
| FetchContent_MakeAvailable(nwx_cmake) | ||
| set( | ||
| CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${nwx_cmake_SOURCE_DIR}/cmake" | ||
| CACHE STRING "" | ||
| FORCE | ||
| ) | ||
| endmacro() | ||
|
|
||
| get_nwx_cmake() |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| # Copyright 2024 NWChemEx Community | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| # Minimal makefile for Sphinx documentation | ||
| # | ||
|
|
||
| # You can set these variables from the command line. | ||
| SPHINXOPTS = | ||
| SPHINXBUILD = sphinx-build | ||
| SPHINXPROJ = structurefinder | ||
| SOURCEDIR = source | ||
| BUILDDIR = build | ||
|
|
||
| # Put it first so that "make" without argument is like "make help". | ||
| help: | ||
| @$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) | ||
|
|
||
| .PHONY: help Makefile | ||
|
|
||
| # Catch-all target: route all unknown targets to Sphinx using the new | ||
| # "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS). | ||
| %: Makefile | ||
| @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| <!-- | ||
| ~ Copyright 2024 NWChemEx Community | ||
| ~ | ||
| ~ Licensed under the Apache License, Version 2.0 (the "License"); | ||
| ~ you may not use this file except in compliance with the License. | ||
| ~ You may obtain a copy of the License at | ||
| ~ | ||
| ~ http://www.apache.org/licenses/LICENSE-2.0 | ||
| ~ | ||
| ~ Unless required by applicable law or agreed to in writing, software | ||
| ~ distributed under the License is distributed on an "AS IS" BASIS, | ||
| ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| ~ See the License for the specific language governing permissions and | ||
| ~ limitations under the License. | ||
| --> | ||
|
|
||
| General instructions for building documentation found throughout the NWChemEx project are available at: | ||
| https://github.com/NWChemEx/NWChemEx/blob/master/docs/README.md |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| sphinx==v7.2.6 | ||
| sphinx_rtd_theme==1.3.0 | ||
| sphinxcontrib-bibtex | ||
| sphinx_tabs | ||
| sphinx-autoapi |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.