-
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
Changes from 20 commits
c6af382
313f15d
4146ec8
68d7614
6e0b3dd
fca3d17
e9d44ee
c6a3b71
b3374d8
5d0f334
46e5ace
423ec3d
853fc8c
907b88a
4ba4214
1fcb570
5488415
8377697
80542aa
0e4b3ca
1978f02
e1e0524
4a86be4
54ba7c9
2b63ee8
2c73442
a20f551
4613bc4
40c921b
df33484
6f68017
96a6432
69ec4bc
49c9c72
71e2f35
6a1c6dd
6761af5
81fcb06
276a0bd
bb561b6
9800bc3
d1206c1
69d06f6
ad568ea
477e58f
591ba2d
8f420ab
1746d1b
fceb006
84d379d
8582fac
8c1b483
4b1df13
1d3a9b8
b56b164
aa6ff96
00a20c9
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| # 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 | ||
|
|
||
| comment: never |
| 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: 'structure_finder_cxx_api' | ||
| generate_module_docs: true | ||
| secrets: inherit | ||
| 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: 'structure_finder_cxx_api' | ||||||
ryanmrichard marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||||||
| doc_target: 'structure_finder_cxx_api' | |
| doc_target: '' |
Try this. You don't have C++ source, so there's no reason to call Doxygen.
Also, the point of git commit messages are to: record what you did, and provide succinct updates to others following the development. If you want to be cheeky that's fine, but try to make them somewhat descriptive.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks. I will also add better commit messages in the future.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| # 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/ |
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,79 @@ | ||||||||||||||||||||||||||||||||||||||||
| # 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_cmaize.cmake) | ||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||
| ## 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") | ||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||
ryanmrichard marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||||||||||||||||||||||||||||||||||||
| ## 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} | ||||||||||||||||||||||||||||||||||||||||
| ) | ||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||
| cmaize_find_or_build_dependency( | ||||||||||||||||||||||||||||||||||||||||
| pyberny | ||||||||||||||||||||||||||||||||||||||||
| PACKAGE_MANAGER pip | ||||||||||||||||||||||||||||||||||||||||
| ) | ||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||
| # Builds C++ API documentation | ||||||||||||||||||||||||||||||||||||||||
| include(nwx_cxx_api_docs) | ||||||||||||||||||||||||||||||||||||||||
| nwx_cxx_api_docs("${${PROJECT_NAME}_INC_DIR}" "${${PROJECT_NAME}_SRC_DIR}") | ||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||
| # Builds C++ API documentation | |
| include(nwx_cxx_api_docs) | |
| nwx_cxx_api_docs("${${PROJECT_NAME}_INC_DIR}" "${${PROJECT_NAME}_SRC_DIR}") |
No C++ docs to build.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| nwx_pybind11_tests( | |
| py_${PROJECT_NAME} | |
| "${${PROJECT_NAME}_PYTHON_TEST_DIR}/unit_tests/test_${PROJECT_NAME}.py" | |
| SUBMODULES simde chemist pluginplay parallelzone | |
| ) | |
| cmaize_find_or_build_dependency( | |
| nwchemex | |
| URL github.com/NWChemEx/NWChemEx | |
| BUILD_TARGET nwchemex | |
| FIND_TARGET nwx::nwchemex | |
| CMAKE_ARGS BUILD_TESTING=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 | |
| ) |
Try this for your CI error. Your unit test depends on NWChemEx (which also means it's technically an integration test) so you need to install NWChemEx and link to it.
| 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. |
| 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 v1.1.0 ) | ||
| 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) |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| # 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) |
| 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 |
| 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 |
Uh oh!
There was an error while loading. Please reload this page.