Skip to content

Commit

Permalink
Merge branch 'release-updates-dev' into 'develop'
Browse files Browse the repository at this point in the history
Release updates

See merge request ecpcitest/exasgd/resolve!42
  • Loading branch information
pelesh committed Oct 13, 2023
2 parents 4d6e99d + c9e20e8 commit 3672542
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 18 deletions.
49 changes: 35 additions & 14 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,22 +1,43 @@
Copyright (c) 2023, UT-Battelle, LLC, and Battelle Memorial Institute
All rights reserved
HyKKT version 0.1
ReSolve version 1.0

License:

Subject to the conditions of this License, UT-Battelle, LLC (the “Licensor”) hereby grants, free of charge, to any person (the “Licensee”) 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 Licensor 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.”

4. Licensee agrees to unconditionally assign to Licensor all rights in any changes or modifications to, or derivative works of the Software. Licensee agrees to furnish the Licensor within a reasonable time a copy of any changes or modifications to, or derivative works of the Software according to the instructions found on the following web site:

https://github.com/ORNL/hykkt
Subject to the conditions of this License, UT-Battelle, LLC (the “Licensor”)
hereby grants, free of charge, to any person (the “Licensee”) 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 Licensor 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.”

4. Licensee agrees to unconditionally assign to Licensor all rights in any
changes or modifications to, or derivative works of the Software. Licensee
agrees to furnish the Licensor within a reasonable time a copy of any changes
or modifications to, or derivative works of the Software according to the
instructions found on the following web site:

https://github.com/ORNL/resolve


******************************************************************************
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# ReSolve

ReSolve is a library of GPU-resident linear solver. It is very much work in progres. When completed, it will contain iterative and direct linear solvers designed to run on NVIDIA and AMD GPUs, as well as CPU devices.
ReSolve is a library of GPU-resident linear solver. It contains iterative and direct linear solvers designed to run on NVIDIA and AMD GPUs, as well as on CPU devices.

## Getting started

Dependencies:
- KLU, AMD and COLAMD libraries from SuiteSparse
- CUDA >= 11.4
- CMake >= 3.20
- CMake >= 3.22

To build it:
```shell
Expand Down Expand Up @@ -103,10 +103,10 @@ cmake -B build --preset cluster
```

## Support
For any questions or to report a bug please submit a [GitLab issue](https://code.ornl.gov/ecpcitest/exasgd/resolve/-/issues).
For any questions or to report a bug please submit a [GitHub issue](https://github.com/ORNL/ReSolve/issues).

## Authors and acknowledgment
Primary author of this project is Kasia &#346;wirydowicz <[email protected]>.
Primary authors of this project are Kasia &#346;wirydowicz <[email protected]> and Slaven Peles <[email protected]>.

Development of this coede was supported by the Exascale Computing Project (ECP), Project Number: 17-SC-20-SC, a collaborative effort of two DOE organizations—the Office of Science and the National Nuclear Security Administration—responsible for the planning and preparation of a capable exascale ecosystem—including software, applications, hardware, advanced system engineering, and early testbed platforms—to support the nation's exascale computing imperative.

Expand Down

0 comments on commit 3672542

Please sign in to comment.