Remove iced dir & add as git dep

This commit is contained in:
Tristan D. 2024-09-09 11:46:22 +02:00
parent 9613bab2c3
commit aca1bb473d
Signed by: tristan
SSH key fingerprint: SHA256:9oFM1J63hYWJjCnLG6C0fxBS15rwNcWwdQNMOHYKJ/4
9 changed files with 9780 additions and 64 deletions

4
.gitmodules vendored
View file

@ -1,4 +0,0 @@
[submodule "iced"]
path = iced
url = git@github.com:iced-rs/iced.git
branch = master

9742
Cargo.lock generated Normal file

File diff suppressed because it is too large Load diff

View file

@ -4,8 +4,15 @@ lto = "thin"
[profile.dev.package."*"] [profile.dev.package."*"]
opt-level = 3 opt-level = 3
# [profile.dev.package.cbg_forms] [profile.dev.package.frozen_llama]
# opt-level = 1 opt-level = 1
[profile.dev.package.llama_forge_rs]
opt-level = 1
[profile.dev.package.leptos_stub]
opt-level = 1
[profile.dev.package.llama_cpp_spec_wrapper]
opt-level = 1
[profile.release] [profile.release]
opt-level = 3 opt-level = 3
@ -22,19 +29,21 @@ lto = "fat"
panic = "abort" panic = "abort"
[workspace] [workspace]
members = ["iced", "llama_forge_rs"] members = ["llama_forge_rs", "leptos_stub", "frozen_llama", "llama_cpp_spec_wrapper"]
resolver = "2" resolver = "2"
[workspace.package] [workspace.package]
authors = ["Tristan Druyen"] authors = ["Tristan Druyen"]
description = "The Ökonzept monorepo" description = "The redvault AI monorepo"
license = "AGPL-3.0-or-later" license = "AGPL-3.0-or-later"
publish = false publish = false
readme = "README.md" readme = "README.md"
repository = "https://git.vlt81.de/oekonzept/oeko-mono" repository = "https://git.vlt81.de/oekonzept/oeko-mono"
version = "0.1.1" version = "0.1.1"
edition = "2021"
[workspace.dependencies] [workspace.dependencies]
iced = { git = "https://github.com/iced-rs/iced.git", branch = "master" }
leptos = { version = "0.6", features = ["serde"] } leptos = { version = "0.6", features = ["serde"] }
leptos_axum = { version = "0.6" } leptos_axum = { version = "0.6" }
leptos_meta = { version = "0.6" } leptos_meta = { version = "0.6" }
@ -46,17 +55,3 @@ wasm-bindgen = "=0.2.93"
[workspace.metadata.cargo-all-features] [workspace.metadata.cargo-all-features]
skip_feature_sets = [["csr", "ssr"], ["csr", "hydrate"], ["ssr", "hydrate"]] skip_feature_sets = [["csr", "ssr"], ["csr", "hydrate"], ["ssr", "hydrate"]]
# [[workspace.metadata.leptos]]
# name = "oeko-mono"
# output-name = "oeko-mono"
# site-root = "target/site"
# assets-dir = "public"
# site-pkg-dir = "pkg"
# style-file = "style/main.sass"
# site-addr = "127.0.0.1:3000"
# bin-package = "server"
# bin-target-triple = "x86_64-unknown-linux-gnu"
# lib-package = "wasm-lib"
# tailwind-input-file = "style/tailwind.css"
# tailwind-config-file = "./tailwind.config.js" # TODO How to change this for embed ??

View file

@ -1,9 +1,9 @@
[package] [package]
name = "frozen_llama" name = "frozen_llama"
version = "0.1.0" version.workspace=true
authors = [] # TODO authors.workspace=true
edition = "2023" edition.workspace=true
publish = false publish.workspace=true
[dependencies] [dependencies]
iced.workspace = true iced.workspace = true

1
iced

@ -1 +0,0 @@
Subproject commit 9628dc20d5dab128b9fff2c4b73cc66b0071e149

View file

@ -35,14 +35,6 @@ ssr = [
"dep:tracing", "dep:tracing",
] ]
# Defines a size-optimized profile for the WASM bundle in release mode
[profile.wasm-release]
inherits = "release"
opt-level = 'z'
lto = true
codegen-units = 1
panic = "abort"
[package.metadata.leptos] [package.metadata.leptos]
# The name used by wasm-bindgen/cargo-leptos for the JS/WASM bundle. Defaults to the crate name # The name used by wasm-bindgen/cargo-leptos for the JS/WASM bundle. Defaults to the crate name
output-name = "leptos_stub" output-name = "leptos_stub"

View file

@ -0,0 +1,12 @@
[package]
name = "llama_cpp_spec_wrapper"
authors.workspace = true
description.workspace = true
license.workspace = true
publish.workspace = true
readme.workspace = true
repository.workspace = true
version.workspace = true
edition.workspace = true
[dependencies]

View file

@ -0,0 +1,3 @@
fn main() {
println!("Hello, world!");
}

View file

@ -1,13 +1,13 @@
[package] [package]
name = "llama_forge_rs" name = "llama_forge_rs"
edition = "2021" edition.workspace=true
authors = ["Tristan Druyen"] authors.workspace=true
description = "The LLama Forge RS" description = "The LLama Forge RS"
license = "AGPL-3.0-or-later" license.workspace=true
publish = false publish.workspace=true
readme = "README.md" readme = "README.md"
repository = "https://git.vlt81.de/vault81/llama_forge_rs" repository.workspace=true
version = "0.1.0" version.workspace=true
[lib] [lib]
crate-type = ["cdylib", "rlib"] crate-type = ["cdylib", "rlib"]
@ -121,29 +121,6 @@ ssr = [
"leptos_router/ssr", "leptos_router/ssr",
] ]
[profile.dev]
opt-level = 1
lto = "thin"
[profile.dev.package."*"]
opt-level = 3
[profile.dev.package.llama_forge_rs]
opt-level = 1
[profile.release]
opt-level = 3
codegen-units = 1
lto = "fat"
strip = "debuginfo"
# Defines a size-optimized profile for the WASM bundle in release mode
[profile.wasm-release]
inherits = "release"
opt-level = 'z'
codegen-units = 1
lto = "fat"
panic = "abort"
[package.metadata.cargo-all-features] [package.metadata.cargo-all-features]
skip_feature_sets = [["ssr", "hydrate"]] skip_feature_sets = [["ssr", "hydrate"]]