From 96042d3bead121a2e63f871db4c03333c84083e3 Mon Sep 17 00:00:00 2001 From: alexmadison Date: Tue, 21 Nov 2023 14:49:07 +0100 Subject: [PATCH] fixed test --- test/unit_tests/nrn_hs_2D_array_3x5/test.act | 47 +++++++++++++++---- .../unit_tests/nrn_hs_2D_array_3x5/test.prsim | 20 ++++---- 2 files changed, 47 insertions(+), 20 deletions(-) diff --git a/test/unit_tests/nrn_hs_2D_array_3x5/test.act b/test/unit_tests/nrn_hs_2D_array_3x5/test.act index c6a3cc5..f969bb5 100644 --- a/test/unit_tests/nrn_hs_2D_array_3x5/test.act +++ b/test/unit_tests/nrn_hs_2D_array_3x5/test.act @@ -31,16 +31,43 @@ import globals; open tmpl::dataflow_neuro; -defproc nrn_hs_2D_array_3x5(a1of1 in[15]; a1of1 outx[3], outy[5]) +pint Nx = 3; +pint Ny = 5; +defproc nrn_hs_2d_array_3x5(a1of1 in[15]; a1of1 outx[3], outy[5]) { - bool _reset_B; - prs { - Reset => _reset_B- - } - nrn_hs_2D_array<3,5,5> b(.in = in, .outx = outx, .outy = outy); - b.supply.vdd = Vdd; - b.supply.vss = GND; - b.reset_B = _reset_B; + power supply; + supply.vdd = Vdd; + supply.vss = GND; + + bool _reset_B; + prs { + Reset => _reset_B- + } + nrn_hs_2d_array<3,5> b(.in = in, .outx = outx, .outy = outy); + + b.supply = supply; + b.reset_B = _reset_B; + + + + nrn_line_end_pull_down pd_x[Nx], pd_y[Ny]; + (i:Nx: + pd_x[i].in = b.to_pd_x[i].a; + pd_x[i].out = b.to_pd_x[i].r; + + pd_x[i].supply = supply; + pd_x[i].reset_B = _reset_B; + ) + + (i:Ny: + pd_y[i].in = b.to_pd_y[i].a; + pd_y[i].out = b.to_pd_y[i].r; + + pd_y[i].supply = supply; + pd_y[i].reset_B = _reset_B; + ) + + } -nrn_hs_2D_array_3x5 b; \ No newline at end of file +nrn_hs_2d_array_3x5 b; \ No newline at end of file diff --git a/test/unit_tests/nrn_hs_2D_array_3x5/test.prsim b/test/unit_tests/nrn_hs_2D_array_3x5/test.prsim index 70dae7a..261ba52 100644 --- a/test/unit_tests/nrn_hs_2D_array_3x5/test.prsim +++ b/test/unit_tests/nrn_hs_2D_array_3x5/test.prsim @@ -26,18 +26,18 @@ set b.outy[2].a 0 set b.outy[3].a 0 set b.outy[4].a 0 -set b.outx[0].r 1 -set b.outx[1].r 1 -set b.outx[2].r 1 +# set b.outx[0].r 1 +# set b.outx[1].r 1 +# set b.outx[2].r 1 -set b.outy[0].r 1 -set b.outy[1].r 1 -set b.outy[2].r 1 -set b.outy[3].r 1 -set b.outy[4].r 0 +# set b.outy[0].r 1 +# set b.outy[1].r 1 +# set b.outy[2].r 1 +# set b.outy[3].r 1 +# set b.outy[4].r 0 -set b.b.neurons[0]._en 0 -set b.b.neurons[0]._req 1 +# set b.b.neurons[0]._en 0 +# set b.b.neurons[0]._req 1 # set Reset 0 cycle