Merge pull request #325 from chaoming0625/master

Upgrade ``brainpy.math.Array`` for future extensions

Author: chaoming0625

brainpy/_src/dyn/tests/test_dyn_runner.py

@@ -8,7 +8,7 @@
 
 class TestDSRunner(unittest.TestCase):
   def test1(self):
-    class ExampleDS(bp.dyn.DynamicalSystem):
+    class ExampleDS(bp.DynamicalSystem):
       def __init__(self):
         super(ExampleDS, self).__init__()
         self.i = bm.Variable(bm.zeros(1))
@@ -17,23 +17,23 @@ def update(self, tdi):
         self.i += 1
 
     ds = ExampleDS()
-    runner = bp.dyn.DSRunner(ds, dt=1., monitors=['i'], progress_bar=False)
+    runner = bp.DSRunner(ds, dt=1., monitors=['i'], progress_bar=False)
     runner.run(100.)
 
   def test_t_and_dt(self):
-    class ExampleDS(bp.dyn.DynamicalSystem):
+    class ExampleDS(bp.DynamicalSystem):
       def __init__(self):
         super(ExampleDS, self).__init__()
         self.i = bm.Variable(bm.zeros(1))
 
       def update(self, tdi):
         self.i += 1 * tdi.dt
 
-    runner = bp.dyn.DSRunner(ExampleDS(), dt=1., monitors=['i'], progress_bar=False)
+    runner = bp.DSRunner(ExampleDS(), dt=1., monitors=['i'], progress_bar=False)
     runner.run(100.)
 
   def test_DSView(self):
-    class EINet(bp.dyn.Network):
+    class EINet(bp.Network):
       def __init__(self, scale=1.0, method='exp_auto'):
         super(EINet, self).__init__()
 

brainpy/_src/math/index_tricks.py

@@ -1,7 +1,7 @@
 import abc
 
 from jax import core
-from .numpy_ops import arange, array, concatenate, expand_dims, linspace, meshgrid, stack, transpose
+from .arraycompatible import arange, array, concatenate, expand_dims, linspace, meshgrid, stack, transpose
 import numpy as np
 
 __all__ = ["c_", "index_exp", "mgrid", "ogrid", "r_", "s_"]