Removed static arrays for better compile time

someguynamedjosh · Mar 25, 2021 · 21d4034 · 21d4034
1 parent e9a0e89
commit 21d4034
Show file tree

Hide file tree

Showing 22 changed files with 292 additions and 256 deletions.
diff --git a/components/audiobench/src/engine/codegen.rs b/components/audiobench/src/engine/codegen.rs
@@ -133,8 +133,8 @@ impl<'a> CodeGenerator<'a> {
             "    static_index += 1\n", // grumble grumble
             "    global_input = GlobalInput(midi_controls, pitch_wheel, bpm, elapsed_time, ",
             "elapsed_beats)\n",
-            "    start_trigger = Trigger(note_input.start_trigger, repeat([false], buffer_length - 1)...)\n",
-            "    release_trigger = Trigger(note_input.release_trigger, repeat([false], buffer_length - 1)...)\n",
+            "    start_trigger = Trigger(reshape([note_input.start_trigger, repeat([false], buffer_length - 1)...], (1, buffer_length)))\n",
+            "    release_trigger = Trigger(reshape([note_input.release_trigger, repeat([false], buffer_length - 1)...], (1, buffer_length)))\n",
             "    note_output = NoteOutput()\n",
             "    context = NoteContext(global_input, note_input, note_output)\n",
             "    view = ()\n",
@@ -143,7 +143,7 @@ impl<'a> CodeGenerator<'a> {
         for _ in 0..feedback_widget_selectors.len() {
             exec_body.push_str("Vector{Float32}(), ");
         }
-        exec_body.push_str(")\n\n    @. context.note_out.audio = 0.0\n");
+        exec_body.push_str(")\n\n    context.note_out.audio .= 0f0\n");
         let automation_code = AutomationCode {
             ordered_modules: ordered_modules.clone(),
         };
@@ -181,7 +181,7 @@ impl<'a> CodeGenerator<'a> {
                         exec_body.push_str("    if do_feedback\n");
                     }
                     exec_body.push_str(&format!(
-                        "      push!(feedback.m{}w{}, m{}c{}[%, 1, 1])\n",
+                        "      push!(feedback.m{}w{}, m{}c{}[1, 1])\n",
                         index, widget_index, index, control_index
                     ));
                 }

diff --git a/components/audiobench/src/engine/julia_thread.rs b/components/audiobench/src/engine/julia_thread.rs
@@ -175,6 +175,7 @@ impl JuliaThread {
                 "Encountered Julia error while executing, see message log for details.\n\n{}",
                 err
             );
+            eprintln!("{}", err);
             // This error is "recoverable"
             self.report_julia_error(message);
         }
@@ -212,6 +213,7 @@ impl JuliaThread {
                     "Encountered Julia error while executing, see message log for details.\n\n{}",
                     err
                 );
+                eprintln!("{}", err);
                 self.report_julia_error(message);
                 // This error is "recoverable"
                 None

diff --git a/components/audiobench/src/engine/program_wrapper.rs b/components/audiobench/src/engine/program_wrapper.rs
@@ -236,8 +236,8 @@ impl AudiobenchExecutor {
         parameters: &GlobalParameters,
     ) -> Result<Self, String> {
         let mut base = ExecutionEngine::new();
-        base.add_global_code(julia_helper::include_packed_library!("StaticArrays"))
-            .unwrap();
+        // base.add_global_code(julia_helper::include_packed_library!("StaticArrays"))
+        //     .unwrap();
         let mut this = AudiobenchExecutor {
             base,
             // This is a quick and dirty way of getting the executor to rebuild when we use