From 5f124e665c5d51d478dcceb98a574988c553c393 Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Wed, 5 Jun 2024 10:49:46 +1200 Subject: [PATCH] Relicense under LANL's standard BSD-3 license (#33) --- LICENSE.md | 58 +++++++++++++++++++++++++--------------- README.md | 5 ++++ src/MathOptSymbolicAD.jl | 7 ++--- src/ThreadedBackend.jl | 7 ++--- src/nonlinear_oracle.jl | 7 ++--- test/perf/benchmark.jl | 7 ++--- test/perf/validate.jl | 7 ++--- test/runtests.jl | 7 ++--- 8 files changed, 66 insertions(+), 39 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index c7b982f..9b79155 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,22 +1,38 @@ -MathOptSymbolicAD.jl is licensed under the MIT License: +Copyright (c) 2022, Triad National Security, LLC +Copyright (c) 2022, Oscar Dowson and contributors +All rights reserved. -> Copyright (c) 2022: Oscar Dowson -> -> Permission is hereby granted, free of charge, to any person obtaining -> a copy of this software and associated documentation files (the -> "Software"), to deal in the Software without restriction, including -> without limitation the rights to use, copy, modify, merge, publish, -> distribute, sublicense, and/or sell copies of the Software, and to -> permit persons to whom the Software is furnished to do so, subject to -> the following conditions: -> -> The above copyright notice and this permission notice shall be -> included in all copies or substantial portions of the Software. -> -> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -> EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -> MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -> NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -> LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -> OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -> WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +This software was produced under U.S. Government contract 89233218CNA000001 for +Los Alamos National Laboratory (LANL), which is operated by Triad National +Security, LLC for the U.S. Department of Energy/National Nuclear Security +Administration. All rights in the program are reserved by Triad National +Security, LLC, and the U.S. Department of Energy/National Nuclear Security +Administration. The Government is granted for itself and others acting on its +behalf a nonexclusive, paid-up, irrevocable worldwide license in this material +to reproduce, prepare derivative works, distribute copies to the public, perform +publicly and display publicly, and to permit others to do so. + +This program is open source under the BSD-3 License. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +3. Neither the name of the copyright holder nor the names of its contributors + may be used to endorse or promote products derived from this software without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/README.md b/README.md index 3479d83..bd16069 100644 --- a/README.md +++ b/README.md @@ -70,3 +70,8 @@ large number of unique constraints in the model (which would require a lot of expressions to be symbolically differentiated), or if the nonlinear functions contain a large number of nonlinear terms (which would make the symbolic derivative expensive to compute). + +## License + +This software is provided under a BSD license as part of the Grid Optimization +Competition Solvers project, C19076. See LICENSE.md. diff --git a/src/MathOptSymbolicAD.jl b/src/MathOptSymbolicAD.jl index a6477d4..e1058e7 100644 --- a/src/MathOptSymbolicAD.jl +++ b/src/MathOptSymbolicAD.jl @@ -1,7 +1,8 @@ -# Copyright (c) 2022: Oscar Dowson, and contributors +# Copyright (c) 2022, Oscar Dowson and contributors +# Copyright (c) 2022, Triad National Security, LLC # -# Use of this source code is governed by an MIT-style license that can be found -# in the LICENSE.md file or at https://opensource.org/licenses/MIT. +# Use of this source code is governed by a BSD-style license that can be found +# in the LICENSE.md file. module MathOptSymbolicAD diff --git a/src/ThreadedBackend.jl b/src/ThreadedBackend.jl index e44db9a..a89133d 100644 --- a/src/ThreadedBackend.jl +++ b/src/ThreadedBackend.jl @@ -1,7 +1,8 @@ -# Copyright (c) 2022: Oscar Dowson, and contributors +# Copyright (c) 2022, Oscar Dowson and contributors +# Copyright (c) 2022, Triad National Security, LLC # -# Use of this source code is governed by an MIT-style license that can be found -# in the LICENSE.md file or at https://opensource.org/licenses/MIT. +# Use of this source code is governed by a BSD-style license that can be found +# in the LICENSE.md file. struct _ConstraintOffset index::Int diff --git a/src/nonlinear_oracle.jl b/src/nonlinear_oracle.jl index e64712f..99c3d14 100644 --- a/src/nonlinear_oracle.jl +++ b/src/nonlinear_oracle.jl @@ -1,7 +1,8 @@ -# Copyright (c) 2022: Oscar Dowson, and contributors +# Copyright (c) 2022, Oscar Dowson and contributors +# Copyright (c) 2022, Triad National Security, LLC # -# Use of this source code is governed by an MIT-style license that can be found -# in the LICENSE.md file or at https://opensource.org/licenses/MIT. +# Use of this source code is governed by a BSD-style license that can be found +# in the LICENSE.md file. abstract type _AbstractFunction end diff --git a/test/perf/benchmark.jl b/test/perf/benchmark.jl index 58aa3b0..346a712 100644 --- a/test/perf/benchmark.jl +++ b/test/perf/benchmark.jl @@ -1,7 +1,8 @@ -# Copyright (c) 2022: Oscar Dowson, and contributors +# Copyright (c) 2022, Oscar Dowson and contributors +# Copyright (c) 2022, Triad National Security, LLC # -# Use of this source code is governed by an MIT-style license that can be found -# in the LICENSE.md file or at https://opensource.org/licenses/MIT. +# Use of this source code is governed by a BSD-style license that can be found +# in the LICENSE.md file. import Ipopt import JuMP diff --git a/test/perf/validate.jl b/test/perf/validate.jl index b3d04f8..370a675 100644 --- a/test/perf/validate.jl +++ b/test/perf/validate.jl @@ -1,7 +1,8 @@ -# Copyright (c) 2022: Oscar Dowson, and contributors +# Copyright (c) 2022, Oscar Dowson and contributors +# Copyright (c) 2022, Triad National Security, LLC # -# Use of this source code is governed by an MIT-style license that can be found -# in the LICENSE.md file or at https://opensource.org/licenses/MIT. +# Use of this source code is governed by a BSD-style license that can be found +# in the LICENSE.md file. import Ipopt import PowerModels diff --git a/test/runtests.jl b/test/runtests.jl index ce4bb22..d021de7 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1,7 +1,8 @@ -# Copyright (c) 2022: Oscar Dowson, and contributors +# Copyright (c) 2022, Oscar Dowson and contributors +# Copyright (c) 2022, Triad National Security, LLC # -# Use of this source code is governed by an MIT-style license that can be found -# in the LICENSE.md file or at https://opensource.org/licenses/MIT. +# Use of this source code is governed by a BSD-style license that can be found +# in the LICENSE.md file. module RunTests