Fixing another merge issue

João Felipe Santos · João Felipe Santos · commit ff8cd166efd2 · 2026-02-12T19:40:09.000-08:00
diff --git a/NAM/wavenet.cpp b/NAM/wavenet.cpp
@@ -807,8 +807,6 @@ nam::wavenet::WaveNetConfig nam::wavenet::parse_config_json(const nlohmann::json
       input_mixin_pre_film_params, input_mixin_post_film_params, activation_pre_film_params,
       activation_post_film_params, _layer1x1_post_film_params, head1x1_post_film_params));
   }
-  const bool with_head = config.find("head") != config.end() && !config["head"].is_null();
-  const float head_scale = config["head_scale"];
 
   wc.with_head = !config["head"].is_null();
   wc.head_scale = config["head_scale"];

Original file line number	Diff line number	Diff line change
`@@ -807,8 +807,6 @@ nam::wavenet::WaveNetConfig nam::wavenet::parse_config_json(const nlohmann::json`
`807`	`807`	`input_mixin_pre_film_params, input_mixin_post_film_params, activation_pre_film_params,`
`808`	`808`	`activation_post_film_params, _layer1x1_post_film_params, head1x1_post_film_params));`
`809`	`809`	`}`
`810`		`- const bool with_head = config.find("head") != config.end() && !config["head"].is_null();`
`811`		`- const float head_scale = config["head_scale"];`
`812`	`810`
`813`	`811`	`wc.with_head = !config["head"].is_null();`
`814`	`812`	`wc.head_scale = config["head_scale"];`