Reduce memory for refinement (#117)

* Reduce memory for refinement * Fix * Force 1.85 on CI * Wasm * Dupes * Simpler creation of optimizer
ArthurBrussee · Feb 24, 2025 · 9b4fd2d · 9b4fd2d
1 parent 96634f0
commit 9b4fd2d
Show file tree

Hide file tree

Showing 37 changed files with 342 additions and 309 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,7 +20,7 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.82.0
+          toolchain: 1.85.0
           components: rustfmt, clippy
 
       - name: Install packages (Linux)
@@ -61,7 +61,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.82.0
+          toolchain: 1.85.0
           targets: wasm32-unknown-unknown
 
       - run: sudo apt-get update && sudo apt-get install libgtk-3-dev libatk1.0-dev

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,7 +4,7 @@ members = ["crates/*", "examples/*"]
 default-members = ["crates/brush-app"]
 
 [workspace.package]
-edition = "2021"
+edition = "2024"
 version = "0.2.0"
 readme = "README.md"
 license = "Apache-2.0"
@@ -71,13 +71,13 @@ ply-rs.git = "https://github.com/ArthurBrussee/ply-rs.git"
 burn = { git = "https://github.com/tracel-ai/burn", features = [
     'wgpu',
     'autodiff',
-] } # Various burn packages. Currently need to use burn at head.
-burn-cubecl = { git = "https://github.com/tracel-ai/burn" }
-burn-ir = { git = "https://github.com/tracel-ai/burn" }
+], branch = "remove-wasm-shared-sum" } # Various burn packages. Currently need to use burn at head.
+burn-cubecl = { git = "https://github.com/tracel-ai/burn", branch = "remove-wasm-shared-sum" }
+burn-ir = { git = "https://github.com/tracel-ai/burn", branch = "remove-wasm-shared-sum" }
 burn-wgpu = { git = "https://github.com/tracel-ai/burn", features = [
     "exclusive-memory-only",
-] }
-burn-fusion = { git = "https://github.com/tracel-ai/burn" }
+], branch = "remove-wasm-shared-sum" }
+burn-fusion = { git = "https://github.com/tracel-ai/burn", branch = "remove-wasm-shared-sum" }
 
 egui = "0.31.0"
 eframe = { version = "0.31.0", default-features = false, features = [

diff --git a/crates/brush-android/src/lib.rs b/crates/brush-android/src/lib.rs
@@ -1,6 +1,6 @@
 #![cfg(target_os = "android")]
 
-use jni::sys::{jint, JNI_VERSION_1_6};
+use jni::sys::{JNI_VERSION_1_6, jint};
 use std::os::raw::c_void;
 use std::sync::Arc;
 

diff --git a/crates/brush-app/src/app.rs b/crates/brush-app/src/app.rs
@@ -7,7 +7,7 @@ use crate::panels::{DatasetPanel, PresetsPanel, ScenePanel, StatsPanel, TracingP
 use brush_dataset::Dataset;
 use brush_process::data_source::DataSource;
 use brush_process::process_loop::{
-    start_process, ControlMessage, ProcessArgs, ProcessMessage, RunningProcess,
+    ControlMessage, ProcessArgs, ProcessMessage, RunningProcess, start_process,
 };
 use brush_render::camera::Camera;
 use brush_train::scene::SceneView;
@@ -73,11 +73,7 @@ impl egui_tiles::Behavior<PaneType> for AppTree {
     /// Width of the gap between tiles in a horizontal or vertical layout,
     /// and between rows/columns in a grid layout.
     fn gap_width(&self, _style: &egui::Style) -> f32 {
-        if self.zen {
-            0.0
-        } else {
-            0.5
-        }
+        if self.zen { 0.0 } else { 0.5 }
     }
 }
 

diff --git a/crates/brush-app/src/channel.rs b/crates/brush-app/src/channel.rs
@@ -1,4 +1,4 @@
-use tokio::sync::mpsc::{channel, Receiver};
+use tokio::sync::mpsc::{Receiver, channel};
 use tokio_with_wasm::alias as tokio_wasm;
 
 pub fn reactive_receiver<T: Send + 'static>(