From ddfddbd33f87004c55e6404dddfd079dd3d1888d Mon Sep 17 00:00:00 2001
From: Magnus Ulimoen <magnus@ulimoen.dev>
Date: Mon, 25 Jan 2021 23:58:50 +0100
Subject: [PATCH] fix bench+sparse builds

---
 euler/benches/bench.rs      | 10 ++++++++--
 maxwell/benches/bench.rs    |  5 ++++-
 sbp/benches/sbpoperators.rs |  1 +
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/euler/benches/bench.rs b/euler/benches/bench.rs
index 6896291..87bb20a 100644
--- a/euler/benches/bench.rs
+++ b/euler/benches/bench.rs
@@ -9,13 +9,19 @@ fn advance_system<SBP: SbpOperator2d>(universe: &mut System<SBP>, n: usize) {
     }
 }
 
-fn advance_system_upwind<UO: UpwindOperator2d>(universe: &mut System<UO>, n: usize) {
+fn advance_system_upwind<UO: SbpOperator2d + UpwindOperator2d>(
+    universe: &mut System<UO>,
+    n: usize,
+) {
     for _ in 0..n {
         universe.advance_upwind(1.0 / 40.0 * 0.2);
     }
 }
 
-fn advance_embedded<UO: UpwindOperator2d>(universe: &mut System<UO>, embedded: bool) {
+fn advance_embedded<UO: SbpOperator2d + UpwindOperator2d>(
+    universe: &mut System<UO>,
+    embedded: bool,
+) {
     let dt = 0.2 / std::cmp::max(universe.nx(), universe.ny()) as Float;
     let t = 1.0;
     if embedded {
diff --git a/maxwell/benches/bench.rs b/maxwell/benches/bench.rs
index 551fdff..863bac8 100644
--- a/maxwell/benches/bench.rs
+++ b/maxwell/benches/bench.rs
@@ -9,7 +9,10 @@ fn advance_system<SBP: SbpOperator2d>(universe: &mut System<SBP>, n: usize) {
     }
 }
 
-fn advance_system_upwind<UO: UpwindOperator2d>(universe: &mut System<UO>, n: usize) {
+fn advance_system_upwind<UO: SbpOperator2d + UpwindOperator2d>(
+    universe: &mut System<UO>,
+    n: usize,
+) {
     for _ in 0..n {
         universe.advance_upwind(0.01);
     }
diff --git a/sbp/benches/sbpoperators.rs b/sbp/benches/sbpoperators.rs
index cd8fb79..a3073a3 100644
--- a/sbp/benches/sbpoperators.rs
+++ b/sbp/benches/sbpoperators.rs
@@ -68,6 +68,7 @@ fn baseline_sparse() {
     let _res = Array2::<Float>::zeros((W, H));
 }
 
+#[cfg(feature = "sparse")]
 fn upwind4_diffxi_sparse() {
     let dx = operators::Upwind4.op_xi().diff_matrix(W);
     let dx = sprs::kronecker_product(sprs::CsMat::eye(H).view(), dx.view());