Handle networks without input in run_profile

nengo · Jan 28, 2020 · 06f24e6 · 06f24e6
1 parent 8c21849
commit 06f24e6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/nengo_dl/benchmarks.py b/nengo_dl/benchmarks.py
@@ -649,7 +649,7 @@ def run_profile(
                     sim.minibatch_size * n_batches, n_steps, net.inp.size_out
                 )
             }
-        else:
+        elif hasattr(net, "inp_a"):
             x = {
                 net.inp_a: np.random.randn(
                     sim.minibatch_size * n_batches, n_steps, net.inp_a.size_out
@@ -658,6 +658,8 @@ def run_profile(
                     sim.minibatch_size * n_batches, n_steps, net.inp_b.size_out
                 ),
             }
+        else:
+            x = None
 
         if train:
             y = {
@@ -670,14 +672,14 @@ def run_profile(
 
             # run once to eliminate startup overhead
             start = timeit.default_timer()
-            sim.fit(x, y, epochs=1)
+            sim.fit(x, y, epochs=1, n_steps=n_steps)
             print("Warmup time:", timeit.default_timer() - start)
 
             for _ in range(reps):
                 if do_profile:
                     profiler.start()
                 start = timeit.default_timer()
-                sim.fit(x, y, epochs=1)
+                sim.fit(x, y, epochs=1, n_steps=n_steps)
                 exec_time = min(timeit.default_timer() - start, exec_time)
                 if do_profile:
                     profiler.save("profile", profiler.stop())

diff --git a/nengo_dl/tests/test_benchmarks.py b/nengo_dl/tests/test_benchmarks.py
@@ -101,14 +101,20 @@ def _test_random(
     assert all(net.inp in x for x in post_conns.values())
 
 
-@pytest.mark.parametrize("network, train", [("integrator", True), ("cconv", False)])
+@pytest.mark.parametrize(
+    "network, train", [("integrator", True), ("cconv", False), ("test", True)]
+)
 def test_run_profile(network, train, pytestconfig, monkeypatch, tmpdir):
     monkeypatch.chdir(tmpdir)
 
     if network == "integrator":
         net = benchmarks.integrator(3, 2, nengo.SpikingRectifiedLinear())
     elif network == "cconv":
         net = benchmarks.cconv(3, 10, nengo.LIF())
+    elif network == "test":
+        with nengo.Network() as net:
+            ens = nengo.Ensemble(10, 1)
+            net.p = nengo.Probe(ens)
 
     benchmarks.run_profile(
         net,