aboutsummaryrefslogtreecommitdiffstats
path: root/html
diff options
context:
space:
mode:
authornoodleanon <122053346+noodleanon@users.noreply.github.com>2023-01-07 14:18:09 +0000
committerGitHub <noreply@github.com>2023-01-07 14:18:09 +0000
commit50e25362794d46cd9a55c70e953a8b4126fd42f7 (patch)
treeea528f29a7c967de32f08217c50d994eebb277b3 /html
parenteadd1bf06adbd7263875640a6446d3b0184d1561 (diff)
parent151233399c4b79934bdbb7c12a97eeb6499572fb (diff)
downloadstable-diffusion-webui-gfx803-50e25362794d46cd9a55c70e953a8b4126fd42f7.tar.gz
stable-diffusion-webui-gfx803-50e25362794d46cd9a55c70e953a8b4126fd42f7.tar.bz2
stable-diffusion-webui-gfx803-50e25362794d46cd9a55c70e953a8b4126fd42f7.zip
Merge branch 'AUTOMATIC1111:master' into img2img-api-scripts
Diffstat (limited to 'html')
-rw-r--r--html/licenses.html29
1 files changed, 28 insertions, 1 deletions
diff --git a/html/licenses.html b/html/licenses.html
index 9eeaa072..570630eb 100644
--- a/html/licenses.html
+++ b/html/licenses.html
@@ -184,7 +184,7 @@ SOFTWARE.
</pre>
<h2><a href="https://github.com/JingyunLiang/SwinIR/blob/main/LICENSE">SwinIR</a></h2>
-<small>Code added by contirubtors, most likely copied from this repository.</small>
+<small>Code added by contributors, most likely copied from this repository.</small>
<pre>
Apache License
@@ -390,3 +390,30 @@ SOFTWARE.
limitations under the License.
</pre>
+<h2><a href="https://github.com/AminRezaei0x443/memory-efficient-attention/blob/main/LICENSE">Memory Efficient Attention</a></h2>
+<small>The sub-quadratic cross attention optimization uses modified code from the Memory Efficient Attention package that Alex Birch optimized for 3D tensors. This license is updated to reflect that.</small>
+<pre>
+MIT License
+
+Copyright (c) 2023 Alex Birch
+Copyright (c) 2023 Amin Rezaei
+
+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.
+</pre>
+