add reset param to ucache

Author: rmatif

examples/cli/main.cpp

@@ -1484,7 +1484,7 @@ struct SDGenerationParams {
              on_cache_mode_arg},
             {"",
              "--cache-option",
-             "named cache params: easycache/ucache: threshold=,start=,end=,decay=,relative= | cache-dit: Fn=,Bn=,threshold=,warmup=",
+             "named cache params (key=value format, comma-separated):\n                                           - easycache/ucache: threshold=,start=,end=,decay=,relative=,reset=\n                                           - dbcache/taylorseer/cache-dit: Fn=,Bn=,threshold=,warmup=\n                                           Examples: \"threshold=0.25\" or \"threshold=1.5,reset=0\"",
              on_cache_option_arg},
             {"",
              "--scm-mask",
@@ -1659,6 +1659,8 @@ struct SDGenerationParams {
                             cache_params.error_decay_rate = std::stof(val);
                         } else if (key == "relative") {
                             cache_params.use_relative_threshold = (std::stof(val) != 0.0f);
+                        } else if (key == "reset") {
+                            cache_params.reset_error_on_compute = (std::stof(val) != 0.0f);
                         } else if (key == "Fn" || key == "fn") {
                             cache_params.Fn_compute_blocks = std::stoi(val);
                         } else if (key == "Bn" || key == "bn") {
@@ -1684,13 +1686,15 @@ struct SDGenerationParams {
                 cache_params.end_percent = 0.95f;
                 cache_params.error_decay_rate = 1.0f;
                 cache_params.use_relative_threshold = true;
+                cache_params.reset_error_on_compute = true;
             } else if (cache_mode == "ucache") {
                 cache_params.mode = SD_CACHE_UCACHE;
                 cache_params.reuse_threshold = 1.0f;
                 cache_params.start_percent = 0.15f;
                 cache_params.end_percent = 0.95f;
                 cache_params.error_decay_rate = 1.0f;
                 cache_params.use_relative_threshold = true;
+                cache_params.reset_error_on_compute = true;
             } else if (cache_mode == "dbcache") {
                 cache_params.mode = SD_CACHE_DBCACHE;
                 cache_params.Fn_compute_blocks = 8;

stable-diffusion.cpp

@@ -1548,15 +1548,17 @@ class StableDiffusionGGML {
                     ucache_config.end_percent            = cache_params->end_percent;
                     ucache_config.error_decay_rate       = std::max(0.0f, std::min(1.0f, cache_params->error_decay_rate));
                     ucache_config.use_relative_threshold = cache_params->use_relative_threshold;
+                    ucache_config.reset_error_on_compute = cache_params->reset_error_on_compute;
                     ucache_state.init(ucache_config, denoiser.get());
                     if (ucache_state.enabled()) {
                         ucache_enabled = true;
-                        LOG_INFO("UCache enabled - threshold: %.3f, start: %.2f, end: %.2f, decay: %.2f, relative: %s",
+                        LOG_INFO("UCache enabled - threshold: %.3f, start: %.2f, end: %.2f, decay: %.2f, relative: %s, reset: %s",
                                  ucache_config.reuse_threshold,
                                  ucache_config.start_percent,
                                  ucache_config.end_percent,
                                  ucache_config.error_decay_rate,
-                                 ucache_config.use_relative_threshold ? "true" : "false");
+                                 ucache_config.use_relative_threshold ? "true" : "false",
+                                 ucache_config.reset_error_on_compute ? "true" : "false");
                     } else {
                         LOG_WARN("UCache requested but could not be initialized for this run");
                     }
@@ -2696,6 +2698,7 @@ void sd_cache_params_init(sd_cache_params_t* cache_params) {
     cache_params->end_percent            = 0.95f;
     cache_params->error_decay_rate       = 1.0f;
     cache_params->use_relative_threshold = true;
+    cache_params->reset_error_on_compute = true;
     cache_params->Fn_compute_blocks           = 8;
     cache_params->Bn_compute_blocks           = 0;
     cache_params->residual_diff_threshold     = 0.08f;

stable-diffusion.h

@@ -250,6 +250,7 @@ typedef struct {
     float end_percent;
     float error_decay_rate;
     bool use_relative_threshold;
+    bool reset_error_on_compute;
     int Fn_compute_blocks;
     int Bn_compute_blocks;
     float residual_diff_threshold;

ucache.hpp

@@ -19,6 +19,7 @@ struct UCacheConfig {
     bool adaptive_threshold      = true;
     float early_step_multiplier  = 0.5f;
     float late_step_multiplier   = 1.5f;
+    bool reset_error_on_compute  = true;
 };
 
 struct UCacheCacheEntry {
@@ -319,6 +320,8 @@ struct UCacheState {
                 total_steps_skipped++;
                 apply_cache(cond, input, output);
                 return true;
+            } else if (config.reset_error_on_compute) {
+                accumulated_error = 0.0f;
             }
         }