From 3431de3c8bad82eb5bf43c0067e932d62abb9565 Mon Sep 17 00:00:00 2001 From: pelesh Date: Mon, 9 Mar 2026 12:11:42 -0400 Subject: [PATCH 1/7] Add setuptools to python packages needed for sphinx docs. --- .github/workflows/documentation.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index c320c2367..f81990fb6 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -14,13 +14,14 @@ jobs: submodules: true - uses: actions/setup-python@v4 with: - python-version: '3.12' + python-version: '3.12' - name: Install pip dependencies run: pip3 install --no-cache-dir \ sphinx \ docutils \ sphinx_rtd_theme \ breathe \ + setuptools \ m2r2 - name: Install apt packages uses: awalsh128/cache-apt-pkgs-action@latest From d1d440a4bca53c3822aa99f88600b7a1bbfd8091 Mon Sep 17 00:00:00 2001 From: pelesh Date: Mon, 9 Mar 2026 12:25:41 -0400 Subject: [PATCH 2/7] Update Python requirements for building docs. --- docs/requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index e4a9e26ac..f070b271b 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,5 +1,6 @@ docutils +setuptools sphinx==6.2.1 sphinx-rtd-theme==1.2.2 -breathe +breathe m2r2 From ac1ae3a0b351211b05d78824bd552ad18282a551 Mon Sep 17 00:00:00 2001 From: pelesh Date: Mon, 9 Mar 2026 12:34:17 -0400 Subject: [PATCH 3/7] Update conf.py for Sphinx docs. --- .devcontainer/Dockerfile | 1 + docs/conf.py | 1 + 2 files changed, 2 insertions(+) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 5770ab57a..0c2bdb183 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -5,6 +5,7 @@ FROM python:3.13.0a1-alpine RUN pip3 install --no-cache-dir \ sphinx \ docutils \ + setuptools \ sphinx_rtd_theme \ breathe \ m2r2 diff --git a/docs/conf.py b/docs/conf.py index 4534d06ce..702a359c3 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -44,6 +44,7 @@ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom # ones. extensions = [ + 'setuptools', 'sphinx.ext.graphviz', 'sphinx.ext.autodoc', 'sphinx.ext.doctest', From e1fb19acc4dd33f1c1b9efdb5161f5a3c5e90463 Mon Sep 17 00:00:00 2001 From: pelesh Date: Mon, 9 Mar 2026 13:16:30 -0400 Subject: [PATCH 4/7] Try to build docs without m2r2 --- docs/conf.py | 6 +++--- docs/sphinx/license.rst | 3 ++- docs/sphinx/notice.rst | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 702a359c3..e7a22ce1d 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -44,15 +44,15 @@ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom # ones. extensions = [ - 'setuptools', + #'setuptools', 'sphinx.ext.graphviz', 'sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinxcontrib.jquery', 'sphinx.ext.todo', 'sphinx.ext.coverage', - 'sphinx.ext.mathjax', - 'm2r2' + 'sphinx.ext.mathjax'#, + #'m2r2' ] # The main toctree document. diff --git a/docs/sphinx/license.rst b/docs/sphinx/license.rst index 73ae42ae2..11bc339ea 100644 --- a/docs/sphinx/license.rst +++ b/docs/sphinx/license.rst @@ -2,4 +2,5 @@ License ******* -.. include:: ../../LICENSE +.. + .. include:: ../../LICENSE diff --git a/docs/sphinx/notice.rst b/docs/sphinx/notice.rst index 6153012f7..754bb23ae 100644 --- a/docs/sphinx/notice.rst +++ b/docs/sphinx/notice.rst @@ -1,4 +1,5 @@ Notice ******* -.. include:: ../../NOTICE +.. + .. include:: ../../NOTICE From b06b6ee0666fc7d39731c4bb0938ed4f866c0b7f Mon Sep 17 00:00:00 2001 From: pelesh Date: Mon, 9 Mar 2026 19:57:04 -0400 Subject: [PATCH 5/7] [skip ci] Fix warnings in Sphinx documentation --- docs/index.rst | 4 +- docs/sphinx/developer_guide/build_system.rst | 6 ++- docs/sphinx/developer_guide/documentation.rst | 35 ++++++------- .../sphinx/developer_guide/git_guidelines.rst | 10 ++-- docs/sphinx/license.rst | 50 +++++++++++++++++++ docs/sphinx/notice.rst | 32 ++++++++++++ 6 files changed, 111 insertions(+), 26 deletions(-) diff --git a/docs/index.rst b/docs/index.rst index a1efa9603..5496c0f83 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1,6 +1,6 @@ -******* +********* Re::Solve -******* +********* Re::Solve is an open-source library that provides GPU-resident linear solvers. It contains iterative and direct solvers designed to run on NVIDIA and AMD diff --git a/docs/sphinx/developer_guide/build_system.rst b/docs/sphinx/developer_guide/build_system.rst index 71fb1cc54..f2cd4fcb1 100644 --- a/docs/sphinx/developer_guide/build_system.rst +++ b/docs/sphinx/developer_guide/build_system.rst @@ -1,6 +1,8 @@ +Build System +================ -CMake Build System ------------------- +CMake Configuration +------------------- Our ``cmake`` folder contains some basic CMake modules that help manage resolve: diff --git a/docs/sphinx/developer_guide/documentation.rst b/docs/sphinx/developer_guide/documentation.rst index 55dcc2a97..0d1affe74 100644 --- a/docs/sphinx/developer_guide/documentation.rst +++ b/docs/sphinx/developer_guide/documentation.rst @@ -46,7 +46,7 @@ Prerequisites Build Container -^^^^^^^^^^^^^ +^^^^^^^^^^^^^^^ The build info for this container is in `.devcontainer/`. There is a Dockerfile and json file associated with the configuration. @@ -71,40 +71,41 @@ Devcontainer Configuration ---------------------------- ``Dockerfile`` -~~~~~~~~~~~~~~ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Installs pip and apt dependencies in Python container for doc development. ``devcontainer.json`` -~~~~~~~~~~~~~~~~~~~~~~ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Configures devcontainer through devcontainer features and sets up extensions. ``renderDocs.sh`` -~~~~~~~~~~~~~~~~~~ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Small shell script that renders documentation and hosts it for quick development. + GitHub Actions ---------------------------- This is a quick summary of the workflows performed in each GitHub Action. For more information see the ``.github/workflows`` folder where each file is located. ``documentation.yml`` -~~~~~~~~~~~~~~~~~~~~~~ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ``ornl_ascent_mirror.yml`` -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Pushes to ORNL GitLab and triggers CI/CD pipelines there that are posted back to GitHub through commit messages. ``ornl_crusher_mirror.yml`` -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Pushes to ORNL Crusher GitLab... ``pnnl_mirror.yml`` -~~~~~~~~~~~~~~~~~~~~ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Pushes to PNNL GitLab... @@ -114,32 +115,32 @@ GitLab Pipelines This is a quick summary of the workflows performed in each GitLab Pipeline. For more information see the ``yml`` file for each associated pipeline. ``ornl/crusher.gitlab-ci.yml`` -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Defines CI/CD for Crusher at ORNL. ``.gitlab-ci.yml`` -~~~~~~~~~~~~~~~~~~~~ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Located in the root git directory, this defines the CI/CD pipelines for Ascent at ORNL. ``pnnl/.gitlab-ci.yml`` -~~~~~~~~~~~~~~~~~~~~~~~~ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Since single GitLab repo triggers many pipelines as downstream dependents, we need a core config file to kick all of these builds off. ``pnnl/base.gitlab-ci.yml`` -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Describes core config shared across each job. This could be in ``pnnl/.gitlab-ci.yml`` but we keep it separate for clarity. ``pnnl/deception.gitlab-ci.yml`` -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Deception specific CI. ``pnnl/incline.gitlab-ci.yml`` -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Incline specific CI. @@ -147,7 +148,7 @@ Quick How-To guides ------------------- Re-build Spack tcl modules on CI platforms -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ You can rebuild dependencies and spack tcl modules on CI platforms by doing the following using automated CI/CD: @@ -184,7 +185,7 @@ Each cluster also supports submitting this job to the job scheduler by doing the * ``sbatch ./buildsystem/spack//install.sh`` to submit the workflow to the job scheduler Update Re::Solve spack package -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ In order to test any modifications to the spack package, it is suggested that you use the above automated workflows to make testing as seamless as possible. @@ -202,7 +203,7 @@ Typically this is done as a part of the release process, so also make sure that Note that spack enforces it's own styling, so consider leveraging spack-bot in order to help out. Comment ``@spackbot help`` to get a list of commands, such as ``@spackbot fix style`` to have it try and automatically style your PR for you! Refresh GitHub/GitLab Secrets -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ There are several secrets throughout CI/CD: diff --git a/docs/sphinx/developer_guide/git_guidelines.rst b/docs/sphinx/developer_guide/git_guidelines.rst index 5bc5f8f7a..673ee0289 100644 --- a/docs/sphinx/developer_guide/git_guidelines.rst +++ b/docs/sphinx/developer_guide/git_guidelines.rst @@ -23,25 +23,25 @@ with respect to `develop` to keep it up to date. Creating a GitHub Issue ------------- +----------------------- When creating an issue, check that it is not a duplicate. Provide a clear and concise description, using the issue template. GitHub Pull Requests ------------- +-------------------- When creating a pull request (PR), make sure to select the correct base branch. If there are merge conflicts, use ``git rebase`` to resolve them before requesting a review. Detail changes made in your PR in the description. -^^^^^^^^^^^^^^^^^^ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 1. What new features were added? 2. What bugs were fixed? 3. What tests were added? When reviewing a PR consider the following: -^^^^^^^^^^^^^^^^^^ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 1. Does the PR address the issue? 2. Do existing and new tests pass on all supported platforms? 3. Is the code clean, readable, and properly documented? @@ -57,7 +57,7 @@ Add a comment to the PR with the minor concern and request the author to address Major concern options: -^^^^^^^^^^^^^^^^^^ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 1. Suggest a change with the Github suggest feature within the PR for the author to commit before merging. 2. Request the author to make the change and wait to approve the merge. 3. Branch off the PR, make the change, and submit a new PR with the change. Make the assignee the author of the current PR and request the author to merge the new PR. diff --git a/docs/sphinx/license.rst b/docs/sphinx/license.rst index 11bc339ea..22f9ca5e0 100644 --- a/docs/sphinx/license.rst +++ b/docs/sphinx/license.rst @@ -2,5 +2,55 @@ License ******* +Copyright (c) 2023, UT-Battelle, LLC and Battelle Memorial Institute. +All rights reserved. + +ReSolve version 1.0 + + +Open Source License: + +Subject to the conditions of this License, UT-Battelle, LLC and Battelle +Memorial Institute hereby grant, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), a +perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable +copyright license to use, copy, modify, merge, publish, distribute, and/or +sublicense copies of the Software. + +1. Redistributions of Software must retain the above open source license grant, +copyright and license notices, this list of conditions, and the disclaimer +listed below. Changes or modifications to, or derivative works of the +Software must be noted with comments and the contributor and organization’s +name. If the Software is protected by a proprietary trademark owned by +UT-Battelle, LLC or Battelle Memorial Institute or the Department of Energy, +then derivative works of the Software may not be distributed using the +trademark without the prior written approval of the trademark owner. + +2. Neither the names of Licensor nor the Department of Energy may be used to +endorse or promote products derived from this Software without their specific +prior written permission. + +3. The Software, with or without modification, must include the following +acknowledgment: "This product includes software produced by UT-Battelle, LLC +under Contract No. DE-AC05-00OR22725 and Battelle Memorial Institute under +Contract No. DE-AC05-76RL01830 with the Department of Energy.” + + + +------------------------------------------------------------------------------- + +DISCLAIMER: + +UT-BATTELLE, LLC, BATTELLE MEMORIAL INSTITUTE, AND THE GOVERNMENT MAKE NO +REPRESENTATIONS AND DISCLAIM ALL WARRANTIES, BOTH EXPRESSED AND IMPLIED. +THERE ARE NO EXPRESS OR IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR +A PARTICULAR PURPOSE, OR THAT THE USE OF THE SOFTWARE WILL NOT INFRINGE ANY +PATENT, COPYRIGHT, TRADEMARK, OR OTHER PROPRIETARY RIGHTS, OR THAT THE SOFTWARE +WILL ACCOMPLISH THE INTENDED RESULTS OR THAT THE SOFTWARE OR ITS USE WILL NOT +RESULT IN INJURY OR DAMAGE. THE USER ASSUMES RESPONSIBILITY FOR ALL +LIABILITIES, PENALTIES, FINES, CLAIMS, CAUSES OF ACTION, AND COSTS AND +EXPENSES, CAUSED BY, RESULTING FROM OR ARISING OUT OF, IN WHOLE OR IN PART +THE USE, STORAGE OR DISPOSAL OF THE SOFTWARE. + .. .. include:: ../../LICENSE diff --git a/docs/sphinx/notice.rst b/docs/sphinx/notice.rst index 754bb23ae..e1bcee7a8 100644 --- a/docs/sphinx/notice.rst +++ b/docs/sphinx/notice.rst @@ -1,5 +1,37 @@ Notice ******* +Disclaimer: + +This material was prepared as an account of work sponsored by an agency of the +United States Government. Neither the United States Government nor the United +States Department of Energy, nor UT-Battelle, nor Battelle Memorial Institute +nor any of their employees, nor any jurisdiction or organization that has +cooperated in the development of these materials, makes any warranty, express +or implied, or assumes any legal liability or responsibility for the accuracy, +completeness, or usefulness or any information, apparatus, product, software, +or process disclosed, or represents that its use would not infringe privately +owned rights. + +Reference herein to any specific commercial product, process, or service by +trade name, trademark, manufacturer, or otherwise does not necessarily +constitute or imply its endorsement, recommendation, or favoring by the United +States Government or any agency thereof, or UT Batelle or Battelle Memorial +Institute. The views and opinions of authors expressed herein do not +necessarily state or reflect those of the United States Government or any +agency thereof. + +OAK RIDGE NATIONAL LABORATORY +operated by UT-BATTELLE for the +UNITED STATES DEPARTMENT OF ENERGY +under Contract DE-AC05-00OR22725 + +and + +PACIFIC NORTHWEST NATIONAL LABORATORY +operated by BATTELLE MEMORIAL INSTITUTE for the +UNITED STATES DEPARTMENT OF ENERGY +under Contract DE-AC05-76RL01830 + .. .. include:: ../../NOTICE From 441f714f4ecbb271ac20e98037be035e4ca52dc2 Mon Sep 17 00:00:00 2001 From: pelesh Date: Mon, 9 Mar 2026 20:03:59 -0400 Subject: [PATCH 6/7] [skip ci] More Sphinx warnings fixed. --- docs/sphinx/user_guide/index.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/sphinx/user_guide/index.rst b/docs/sphinx/user_guide/index.rst index 63bddd11c..fb232652a 100644 --- a/docs/sphinx/user_guide/index.rst +++ b/docs/sphinx/user_guide/index.rst @@ -42,7 +42,7 @@ and then try some of Re::Solve's `examples `__. Re::Solve General API Description ---------------------------- +--------------------------------- Users are encouraged to look at the examples and tests for guidance on how to use the library. When there is any conflict between the examples/tests and this documentation, the examples/tests are correct. Solver Subroutines -~~~~~~~~~~~~~~~~~~~~ +^^^^^^^^^^^^^^^^^^^^^^^^ For direct solvers, the following functions are provided and must be called in this order: @@ -167,7 +167,7 @@ Subsequent systems only require calls to ``refactorize()`` and ``solve()`` if th Note some examples do not reuse the factorization from the 0-th iteration because the numeric sparsity structure changes and that's how the matrices are stored. In a practical application, the sparsity structure is likely to remain the same. If it does not, it is the user's responsibility to reallocate memory and call ``analyze()`` and ``factorize()`` again. The user should enforce that symbolic nonzeros are stored explicitly, even if they are numerically zero. Function Requirements -~~~~~~~~~~~~~~~~~~~~ +^^^^^^^^^^^^^^^^^^^^^^^^ Functions must be used as in the examples and tests: @@ -187,7 +187,7 @@ Functions in ReSolve that take pointers as arguments will have the following req * Pointers that are marked as const must point to memory that is readable. Memory Synchronization -~~~~~~~~~~~~~~~~~~~~ +^^^^^^^^^^^^^^^^^^^^^^^^ * For CPU solvers, memory is always in sync. * For GPU solvers, the user must synchronize memory manually. From 7a3929685a3b1a33996f718cbf93b1c799d60ff5 Mon Sep 17 00:00:00 2001 From: pelesh Date: Thu, 12 Mar 2026 11:34:13 -0400 Subject: [PATCH 7/7] Try license and notice as before --- docs/sphinx/license.rst | 53 +---------------------------------------- docs/sphinx/notice.rst | 35 +-------------------------- 2 files changed, 2 insertions(+), 86 deletions(-) diff --git a/docs/sphinx/license.rst b/docs/sphinx/license.rst index 22f9ca5e0..73ae42ae2 100644 --- a/docs/sphinx/license.rst +++ b/docs/sphinx/license.rst @@ -2,55 +2,4 @@ License ******* -Copyright (c) 2023, UT-Battelle, LLC and Battelle Memorial Institute. -All rights reserved. - -ReSolve version 1.0 - - -Open Source License: - -Subject to the conditions of this License, UT-Battelle, LLC and Battelle -Memorial Institute hereby grant, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), a -perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable -copyright license to use, copy, modify, merge, publish, distribute, and/or -sublicense copies of the Software. - -1. Redistributions of Software must retain the above open source license grant, -copyright and license notices, this list of conditions, and the disclaimer -listed below. Changes or modifications to, or derivative works of the -Software must be noted with comments and the contributor and organization’s -name. If the Software is protected by a proprietary trademark owned by -UT-Battelle, LLC or Battelle Memorial Institute or the Department of Energy, -then derivative works of the Software may not be distributed using the -trademark without the prior written approval of the trademark owner. - -2. Neither the names of Licensor nor the Department of Energy may be used to -endorse or promote products derived from this Software without their specific -prior written permission. - -3. The Software, with or without modification, must include the following -acknowledgment: "This product includes software produced by UT-Battelle, LLC -under Contract No. DE-AC05-00OR22725 and Battelle Memorial Institute under -Contract No. DE-AC05-76RL01830 with the Department of Energy.” - - - -------------------------------------------------------------------------------- - -DISCLAIMER: - -UT-BATTELLE, LLC, BATTELLE MEMORIAL INSTITUTE, AND THE GOVERNMENT MAKE NO -REPRESENTATIONS AND DISCLAIM ALL WARRANTIES, BOTH EXPRESSED AND IMPLIED. -THERE ARE NO EXPRESS OR IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR -A PARTICULAR PURPOSE, OR THAT THE USE OF THE SOFTWARE WILL NOT INFRINGE ANY -PATENT, COPYRIGHT, TRADEMARK, OR OTHER PROPRIETARY RIGHTS, OR THAT THE SOFTWARE -WILL ACCOMPLISH THE INTENDED RESULTS OR THAT THE SOFTWARE OR ITS USE WILL NOT -RESULT IN INJURY OR DAMAGE. THE USER ASSUMES RESPONSIBILITY FOR ALL -LIABILITIES, PENALTIES, FINES, CLAIMS, CAUSES OF ACTION, AND COSTS AND -EXPENSES, CAUSED BY, RESULTING FROM OR ARISING OUT OF, IN WHOLE OR IN PART -THE USE, STORAGE OR DISPOSAL OF THE SOFTWARE. - -.. - .. include:: ../../LICENSE +.. include:: ../../LICENSE diff --git a/docs/sphinx/notice.rst b/docs/sphinx/notice.rst index e1bcee7a8..6153012f7 100644 --- a/docs/sphinx/notice.rst +++ b/docs/sphinx/notice.rst @@ -1,37 +1,4 @@ Notice ******* -Disclaimer: - -This material was prepared as an account of work sponsored by an agency of the -United States Government. Neither the United States Government nor the United -States Department of Energy, nor UT-Battelle, nor Battelle Memorial Institute -nor any of their employees, nor any jurisdiction or organization that has -cooperated in the development of these materials, makes any warranty, express -or implied, or assumes any legal liability or responsibility for the accuracy, -completeness, or usefulness or any information, apparatus, product, software, -or process disclosed, or represents that its use would not infringe privately -owned rights. - -Reference herein to any specific commercial product, process, or service by -trade name, trademark, manufacturer, or otherwise does not necessarily -constitute or imply its endorsement, recommendation, or favoring by the United -States Government or any agency thereof, or UT Batelle or Battelle Memorial -Institute. The views and opinions of authors expressed herein do not -necessarily state or reflect those of the United States Government or any -agency thereof. - -OAK RIDGE NATIONAL LABORATORY -operated by UT-BATTELLE for the -UNITED STATES DEPARTMENT OF ENERGY -under Contract DE-AC05-00OR22725 - -and - -PACIFIC NORTHWEST NATIONAL LABORATORY -operated by BATTELLE MEMORIAL INSTITUTE for the -UNITED STATES DEPARTMENT OF ENERGY -under Contract DE-AC05-76RL01830 - -.. - .. include:: ../../NOTICE +.. include:: ../../NOTICE