Fix bad merge

This commit is contained in:
2026-05-04 10:08:18 +02:00
parent 0b670cbd24
commit c610ae5a68
5 changed files with 0 additions and 236 deletions
-35
View File
@@ -1,14 +1,6 @@
# Kawai
<<<<<<< HEAD
Local AI image and video generator. Simple UI. NSFW-capable. Auto GPU detection (Nvidia / AMD / Intel / Apple Silicon / CPU).
=======
<<<<<<< HEAD
Local AI image and video generator. Simple UI. NSFW-capable. Auto GPU detection (Nvidia / AMD / Intel / Apple Silicon / CPU).
=======
Local AI image and video generator. Simple UI. NSFW-capable. Auto GPU detection (Nvidia / AMD / Intel / CPU).
>>>>>>> refs/remotes/azuze/main
>>>>>>> 965a3d97c6dae38fa25174559b1ea0f3050788f9
## Quick start
@@ -18,10 +10,6 @@ python launcher.py
Run with **any Python** you have installed. The launcher bootstraps `uv` and uses it to fetch a clean Python 3.11 runtime + venv, then installs the right PyTorch build for your GPU. Nothing about your system Python is touched.
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 965a3d97c6dae38fa25174559b1ea0f3050788f9
Works on Windows, Linux, and macOS.
First run takes a few minutes (uv install + Python 3.11 download + torch + dependencies). Subsequent runs start instantly.
@@ -41,26 +29,11 @@ python launcher.py --reinstall # wipe install marker, re-detect, reinstal
`--vendor {nvidia,amd,intel,cpu}` is available too if you need to pair (e.g. `--backend directml --vendor intel`). Override is persisted in `config.local.json` and survives relaunches until you pass `--backend` again or `--reinstall`.
<<<<<<< HEAD
=======
=======
First run takes a few minutes (uv install + Python 3.11 download + torch + dependencies). Subsequent runs start instantly.
>>>>>>> refs/remotes/azuze/main
>>>>>>> 965a3d97c6dae38fa25174559b1ea0f3050788f9
### What the launcher does
1. Installs `uv` to `.tools/` if not present.
2. Creates `venv/` with Python 3.11 (uv downloads the interpreter on demand).
<<<<<<< HEAD
3. Detects GPU (Nvidia / AMD / Intel / Apple Silicon / CPU) and installs matching PyTorch wheel.
=======
<<<<<<< HEAD
3. Detects GPU (Nvidia / AMD / Intel / Apple Silicon / CPU) and installs matching PyTorch wheel.
=======
3. Detects GPU (Nvidia / AMD / Intel / CPU) and installs matching PyTorch wheel.
>>>>>>> refs/remotes/azuze/main
>>>>>>> 965a3d97c6dae38fa25174559b1ea0f3050788f9
4. Installs latest `diffusers`, `transformers`, etc.
5. Opens browser UI at `http://127.0.0.1:7860`.
@@ -85,12 +58,4 @@ CSAM detection on all outputs (NudeNet age classifier + hash check). All other c
## Status
<<<<<<< HEAD
Windows + Linux + macOS. AMD on Linux uses ROCm; AMD/Intel on Windows use DirectML; Apple Silicon uses MPS. Intel Macs run on CPU only (no GPU acceleration path).
=======
<<<<<<< HEAD
Windows + Linux + macOS. AMD on Linux uses ROCm; AMD/Intel on Windows use DirectML; Apple Silicon uses MPS. Intel Macs run on CPU only (no GPU acceleration path).
=======
Windows only. Linux support planned.
>>>>>>> refs/remotes/azuze/main
>>>>>>> 965a3d97c6dae38fa25174559b1ea0f3050788f9