Work

ring-c · ring-c · commit 10c3c54554ac · 2024-08-31T23:05:23.000+05:00
Former-commit-id: ff0589e
diff --git a/nvidia.sh b/nvidia.sh
@@ -0,0 +1,2 @@
+sudo modprobe --remove nvidia-uvm
+sudo modprobe nvidia-uvm
diff --git a/pkg/generate/index.html b/pkg/generate/index.html
@@ -15,21 +15,25 @@
 
 <body>
 
-<table>
-    <tr>
-        <td style="text-align: right; width: 286px; vertical-align: top;">
-            <form id="main-form">
+<form id="main-form">
+    <table style="width: 100%;">
+        <tr>
+            <td style="text-align: right; width: 286px; vertical-align: top;">
                 <label>
                     Prompt:<br/>
-                    <textarea name="prompt" cols="30" rows="30"></textarea>
+                    <textarea name="prompt" cols="30" rows="48"></textarea>
                 </label><br/>
 
                 <div style="text-align: right;">
                     <span id="status"></span>&nbsp;<button type="submit">Send</button>
                 </div>
+            </td>
 
-                <hr/>
+            <td id="preview" style="vertical-align: top;">
+                &nbsp;
+            </td>
 
+            <td style="text-align: right; width: 286px; vertical-align: top;">
                 <label>
                     Negative prompt:<br/>
                     <textarea name="negative_prompt" cols="30" rows="4"></textarea>
@@ -46,15 +50,11 @@
                 </label><br/>
 
                 <label>
-                    Width:
-                    <input type="number" name="width" value="1024"/>
-                </label><br/>
+                    Size:
+                    <input type="number" name="width" value="1024" style="width: 100px;"/>x
+                    <input type="number" name="height" value="768" style="width: 100px;"/>
 
-                <label>
-                    Height:
-                    <input type="number" name="height" value="768"/>
                 </label><br/>
-
                 <label>
                     CFG scale:
                     <input type="number" name="cfg_scale" value="7"/>
@@ -100,16 +100,11 @@
 
                 <label>
                     <textarea name="loras" cols="30" rows="4"></textarea>
-                </label><br/>
-            </form>
-        </td>
-
-        <td id="preview" style="vertical-align: top;">
-            &nbsp;
-        </td>
-    </tr>
-</table>
-
+                </label>
+            </td>
+        </tr>
+    </table>
+</form>
 
 <script type="text/javascript">
     const form = document.getElementById("main-form")
@@ -202,6 +197,9 @@
         form.addEventListener("submit", formSend);
         document.addEventListener("keydown", handleShortcut);
 
+
+        // getModels()
+
         if (typeof Storage !== "undefined") {
             if (typeof localStorage["main-form-data"] !== "undefined") {
                 const stored = JSON.parse(localStorage.getItem('main-form-data'));
@@ -239,6 +237,20 @@
         document.getElementById("status").textContent = status
         document.title = "GWD - " + status
     }
+
+
+    function getModels() {
+        let xhr = new XMLHttpRequest();
+        xhr.open("GET", "/models", true);
+        xhr.setRequestHeader("Content-Type", "application/json");
+        xhr.onreadystatechange = function () {
+            if (xhr.readyState === 4 && xhr.status === 200) {
+
+            }
+        }
+
+        xhr.send()
+    }
 </script>
 </body>
 </html>
diff --git a/pkg/generate/init.go b/pkg/generate/init.go
@@ -1,6 +1,8 @@
 package generate
 
 import (
+	"net/http"
+
 	"github.com/labstack/echo/v4"
 )
 
@@ -9,4 +11,14 @@ func Routes(e *echo.Echo) {
 	r.GET("", Index)
 	r.POST("generate", Generate)
 	r.GET("output/:filename", OutputDir)
+	r.GET("models", Models)
+}
+
+func OutputDir(c echo.Context) (err error) {
+	return c.File("./output/" + c.Param("filename"))
+}
+
+func Models(c echo.Context) (err error) {
+
+	return c.JSON(http.StatusOK, "")
 }
diff --git a/pkg/generate/output.go b/pkg/generate/output.go
diff --git a/pkg/txt2img/tokenize_test.go b/pkg/txt2img/tokenize_test.go
@@ -1,15 +1,11 @@
 package txt2img
 
-import (
-	"testing"
-
-	"github.com/davecgh/go-spew/spew"
-)
-
+/*
 func Test_tokenize(t *testing.T) {
 	tokens, weights := tokenize("a 1dog running on grass field", false)
 
 	println("DONE")
 	spew.Dump(tokens)
 	spew.Dump(weights)
 }
+*/
diff --git a/run.sh b/run.sh
@@ -0,0 +1 @@
+go run -v -race .

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+sudo modprobe --remove nvidia-uvm`
	`2`	`+sudo modprobe nvidia-uvm`