From 49ae16a9b2dbf87644207fc0c249ed3a57cda7d0 Mon Sep 17 00:00:00 2001
From: Brent Huisman <brenthuisman@users.noreply.github.com>
Date: Tue, 21 Jun 2022 17:26:30 +0200
Subject: [PATCH] Two context decomp swaps were forgotten (#1912)
---
example/diffusion/diffusion.cpp | 2 +-
python/example/diffusion.py | 1 -
test/unit/test_diffusion.cpp | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/example/diffusion/diffusion.cpp b/example/diffusion/diffusion.cpp
index e8f94651..e2ed2537 100644
--- a/example/diffusion/diffusion.cpp
+++ b/example/diffusion/diffusion.cpp
@@ -119,7 +119,7 @@ int main(int argc, char** argv) {
if (!out.good()) throw std::runtime_error("Could not open output file for writing.");
auto C = make_context({1, O.gpu});
auto R = linear{O.L, O.dx, O.Xi, O.dX};
- simulation S(R, partition_load_balance(R, C), C);
+ simulation S(R, C, partition_load_balance(R, C));
S.add_sampler(all_probes, regular_schedule(O.ds), sampler);
S.run(O.T, O.dt);
out.close();
diff --git a/python/example/diffusion.py b/python/example/diffusion.py
index 6d9f06bd..5198b4cb 100644
--- a/python/example/diffusion.py
+++ b/python/example/diffusion.py
@@ -1,7 +1,6 @@
#!/usr/bin/env python3
import arbor as A
-import pandas as pd
import seaborn as sns
import matplotlib.pyplot as plt
diff --git a/test/unit/test_diffusion.cpp b/test/unit/test_diffusion.cpp
index 37e29222..4575ed7d 100644
--- a/test/unit/test_diffusion.cpp
+++ b/test/unit/test_diffusion.cpp
@@ -114,7 +114,7 @@ testing::AssertionResult run(const linear& rec, const result_t exp) {
}
};
auto ctx = make_context({arbenv::default_concurrency(), with_gpu});
- auto sim = simulation{rec, partition_load_balance(rec, ctx), ctx};
+ auto sim = simulation{rec, ctx, partition_load_balance(rec, ctx)};
sim.add_sampler(arb::all_probes, arb::regular_schedule(0.1), sampler);
sim.run(0.11, 0.01);
return all_near(sample_values, exp, epsilon);
--
GitLab