Skip to content
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
4 changes: 2 additions & 2 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ AlwaysBreakBeforeMultilineStrings: false
AlwaysBreakTemplateDeclarations: true
BinPackArguments: true
BinPackParameters: true
BraceWrapping:
BraceWrapping:
AfterClass: false
AfterControlStatement: false
AfterEnum: false
Expand Down Expand Up @@ -65,7 +65,7 @@ DisableFormat: false
ExperimentalAutoDetectBinPacking: false
FixNamespaceComments: true
ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]
IncludeCategories:
IncludeCategories:
- Regex: '^"'
Priority: 1
- Regex: '^<'
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/pull_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
check_formatting:
uses: NWChemEx/.github/.github/workflows/check_formatting.yaml@master
with:
license_config: ".github/.licenserc.yaml"
license_config: ".licenserc.yaml"

test_nwx_docs:
uses: NWChemEx/.github/.github/workflows/test_nwx_docs.yaml@master
Expand All @@ -35,4 +35,3 @@ jobs:
uses: NWChemEx/.github/.github/workflows/test_nwx_library.yaml@master
with:
compilers: '["gcc-11", "clang-14"]'

1 change: 1 addition & 0 deletions .github/.licenserc.yaml → .licenserc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@ header:
- src/scf/common/
- src/scf/scf/
- LICENSE
- build/

comment: never
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ nwx_add_pybind11_module(
DEPENDS "${PROJECT_NAME}"
)

if("${BUILD_TESTING}")
if("${BUILD_TESTING}")
include(CTest)
set(PYTHON_TEST_DIR "${NUX_TESTS_DIR}/python")
set(CXX_TEST_DIR "${NUX_TESTS_DIR}/cxx")
Expand All @@ -81,7 +81,7 @@ if("${BUILD_TESTING}")
nwx_pybind11_tests(
py_integration_test_${PROJECT_NAME}
"${PYTHON_TEST_DIR}/integration_tests/run_integration_tests.py"
SUBMODULES nwchemex nux chemcache simde chemist pluginplay
SUBMODULES nwchemex nux chemcache simde chemist pluginplay
parallelzone scf friendzone
)
endif()
Expand Down
2 changes: 1 addition & 1 deletion cmake/get_nwx_cmake.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ macro(get_nwx_cmake)
)
endmacro()

get_nwx_cmake()
get_nwx_cmake()
71 changes: 41 additions & 30 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,14 @@
# http://www.sphinx-doc.org/en/master/config

import os

import git

# -- Project information -----------------------------------------------------

project = u'SCF'
copyright = u'2024, NWChemEx Team'
author = u'NWChemEx Team'
project = "SCF"
copyright = "2024, NWChemEx Team"
author = "NWChemEx Team"

##############################################################################
# Shouldn't need to change anything below this point #
Expand Down Expand Up @@ -61,48 +62,48 @@

# If your documentation needs a minimal Sphinx version, state it here.
#
needs_sphinx = '7.2.6'
needs_sphinx = "7.2.6"

# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = [
'sphinx.ext.autodoc',
'sphinx.ext.mathjax',
'sphinx.ext.githubpages',
'sphinx.ext.autosummary',
'sphinx_rtd_theme',
"sphinx.ext.autodoc",
"sphinx.ext.mathjax",
"sphinx.ext.githubpages",
"sphinx.ext.autosummary",
"sphinx_rtd_theme",
# 'sphinxcontrib.bibtex',
'sphinx_tabs.tabs',
'sphinx.ext.intersphinx',
"sphinx_tabs.tabs",
"sphinx.ext.intersphinx",
]

# Add any paths that contain templates here, relative to this directory.
#templates_path = ['_templates']
# templates_path = ['_templates']

# The suffix(es) of source filenames.
# You can specify multiple suffix as a list of string:
#
# source_suffix = ['.rst', '.md']
source_suffix = '.rst'
source_suffix = ".rst"

# The master toctree document.
master_doc = 'index'
master_doc = "index"

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
#
# This is also used if you do content translation via gettext catalogs.
# Usually you set "language" from the command line for these cases.
language = 'en'
language = "en"

# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
# This pattern also affects html_static_path and html_extra_path .
exclude_patterns = []

# The name of the Pygments (syntax highlighting) style to use.
pygments_style = 'sphinx'
pygments_style = "sphinx"

numfig = True
numfig_secnum_depth = 0
Expand All @@ -112,20 +113,20 @@
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
#
html_theme = 'sphinx_rtd_theme'
html_theme = "sphinx_rtd_theme"

# html_logo = "assets/logo.png"

# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
# documentation.
#
html_theme_options = {'logo_only': True}
html_theme_options = {"logo_only": True}

# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
#html_static_path = ['_static']
# html_static_path = ['_static']

# Custom sidebar templates, must be a dictionary that maps document names
# to template names.
Expand All @@ -140,23 +141,20 @@
# -- Options for HTMLHelp output ---------------------------------------------

# Output file base name for HTML help builder.
htmlhelp_basename = project + 'doc'
htmlhelp_basename = project + "doc"

# -- Options for LaTeX output ------------------------------------------------

latex_elements = {
# The paper size ('letterpaper' or 'a4paper').
#
# 'papersize': 'letterpaper',

# The font size ('10pt', '11pt' or '12pt').
#
# 'pointsize': '10pt',

# Additional stuff for the LaTeX preamble.
#
# 'preamble': '',

# Latex figure (float) alignment
#
# 'figure_align': 'htbp',
Expand All @@ -166,30 +164,43 @@
# (source start file, target name, title,
# author, documentclass [howto, manual, or own class]).
latex_documents = [
(master_doc, project + '.tex', project + ' Documentation', author,
'manual'),
(
master_doc,
project + ".tex",
project + " Documentation",
author,
"manual",
),
]

# -- Options for manual page output ------------------------------------------

# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [(master_doc, project.lower(), project + ' Documentation',
[author], 1)]
man_pages = [
(master_doc, project.lower(), project + " Documentation", [author], 1)
]

# -- Options for Texinfo output ----------------------------------------------

# Grouping the document tree into Texinfo files. List of tuples
# (source start file, target name, title, author,
# dir menu entry, description, category)
texinfo_documents = [
(master_doc, project, project + ' Documentation', author, project,
'One line description of project.', 'Miscellaneous'),
(
master_doc,
project,
project + " Documentation",
author,
project,
"One line description of project.",
"Miscellaneous",
),
]

# -- Extension configuration -------------------------------------------------

# -- Options for intersphinx extension ---------------------------------------

# Example configuration for intersphinx: refer to the Python standard library.
intersphinx_mapping = {'python': ('https://docs.python.org/3', None)}
intersphinx_mapping = {"python": ("https://docs.python.org/3", None)}
2 changes: 1 addition & 1 deletion docs/source/module_api/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ Module API

.. toctree::
:maxdepth: 1
:caption: Packages
:caption: Packages
4 changes: 2 additions & 2 deletions src/cxx/nux/bo_approximation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const auto desc = R"(
Born-Oppenheimer Hamiltonian Driver
-----------------------------------

This module defines the algorithm used throughout NWChemEx to convert a
This module defines the algorithm used throughout NWChemEx to convert a
ChemicalSystem object into a Hamiltonian object using the Born-Oppenheimer
approximation.

Expand Down Expand Up @@ -87,4 +87,4 @@ MODULE_RUN(BOApproximation) {
return pt::wrap_results(rv, H);
}

} // namespace nux
} // namespace nux
2 changes: 1 addition & 1 deletion src/python/nux/export_nux.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ namespace nux {

EXPORT_PLUGIN(nux, m) {}

} // namespace nux
} // namespace nux
2 changes: 1 addition & 1 deletion tests/cxx/test_nux.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ ResultType make_h2() {
static_assert(std::is_same_v<ResultType, nuclei>);
}
}
} // namespace test_nux
} // namespace test_nux
2 changes: 1 addition & 1 deletion tests/cxx/unit_tests/bo_approximation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -100,4 +100,4 @@ TEST_CASE("BOApproximation") {
H_corr.emplace_back(1.0, std::make_unique<V_nn_type>(nuclei, nuclei));
REQUIRE(H == H_corr);
}
}
}
2 changes: 1 addition & 1 deletion tests/cxx/unit_tests/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ int main(int argc, char* argv[]) {
int res = Catch::Session().run(argc, argv);

return res;
}
}
2 changes: 1 addition & 1 deletion tests/cxx/unit_tests/nux.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ TEST_CASE("load_plugin") {
pluginplay::ModuleManager mm;
nux::load_modules(mm);
REQUIRE(mm.size() > 0);
}
}
8 changes: 4 additions & 4 deletions tests/python/integration_tests/run_integration_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
# 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.
import nux
import parallelzone as pz
import sys
import os
import sys
import unittest

if __name__ == '__main__':
import parallelzone as pz

if __name__ == "__main__":
rv = pz.runtime.RuntimeView()

my_dir = os.path.dirname(os.path.realpath(__file__))
Expand Down
6 changes: 3 additions & 3 deletions tests/python/integration_tests/test_nux/test_plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.

from pluginplay import ModuleManager
import nux
import unittest

import nux
from pluginplay import ModuleManager


class TestLoadModules(unittest.TestCase):

def test_load_modules(self):
self.assertGreater(self.mm.size(), 0)

Expand Down
2 changes: 1 addition & 1 deletion tests/python/test_nux.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@


def h_nucleus(x, y, z):
return chemist.Nucleus('H', 1, 1836.15, x, y, z)
return chemist.Nucleus("H", 1, 1836.15, x, y, z)


def h2_nuclei():
Expand Down
8 changes: 4 additions & 4 deletions tests/python/unit_tests/run_unit_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
# 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.
import nux
import parallelzone as pz
import sys
import os
import sys
import unittest

if __name__ == '__main__':
import parallelzone as pz

if __name__ == "__main__":
rv = pz.runtime.RuntimeView()

my_dir = os.path.dirname(os.path.realpath(__file__))
Expand Down
34 changes: 0 additions & 34 deletions tests/python/unit_tests/test_nux/test_bo_approximation.py

This file was deleted.

Loading