Intergate brainpylib operators into brainpy (#352)

Intergate brainpylib operators into brainpy #352

Author: ztqakita

CMakeLists.txt

@@ -29,7 +29,6 @@ BrainPy is a flexible, efficient, and extensible framework for computational neu
 ## Ecosystem
 
 - **[BrainPy](https://github.com/brainpy/BrainPy)**: The solution for the general-purpose brain dynamics programming. 
-- **[brainpylib](https://github.com/brainpy/brainpylib)**: Efficient operators for the sparse and event-driven computation. 
 - **[brainpy-examples](https://github.com/brainpy/examples)**: Comprehensive examples of BrainPy computation. 
 - **[brainpy-datasets](https://github.com/brainpy/datasets)**: Neuromorphic and Cognitive Datasets for Brain Dynamics Modeling.
 

README.md

@@ -153,7 +153,7 @@ def update(self, tdi, pre_spike=None):
       post_vs = self._syn2post_with_one2one(syn_value, self.g_max)
     else:
       if self.comp_method == 'sparse':
-        f = lambda s: bm.event_ops.event_csr_matvec(
+        f = lambda s: bm.event_csr_matvec(
           self.g_max, self.conn_mask[0], self.conn_mask[1], s,
           shape=(self.pre.num, self.post.num), transpose=True
         )
@@ -344,7 +344,7 @@ def update(self, tdi, pre_spike=None):
       post_vs = self._syn2post_with_one2one(syn_value, self.g_max)
     else:
       if self.comp_method == 'sparse':
-        f = lambda s: bm.event_ops.event_csr_matvec(
+        f = lambda s: bm.event_csr_matvec(
           self.g_max, self.conn_mask[0], self.conn_mask[1], s,
           shape=(self.pre.num, self.post.num),
           transpose=True
@@ -549,7 +549,7 @@ def update(self, tdi, pre_spike=None):
       post_vs = self._syn2post_with_one2one(syn_value, self.g_max)
     else:
       if self.comp_method == 'sparse':
-        f = lambda s: bm.sparse_ops.cusparse_csr_matvec(
+        f = lambda s: bm.cusparse_csr_matvec(
           self.g_max, self.conn_mask[0], self.conn_mask[1], s,
           shape=(self.pre.num, self.post.num),
           transpose=True
@@ -894,7 +894,7 @@ def update(self, tdi, pre_spike=None):
       post_vs = self._syn2post_with_one2one(syn_value, self.g_max)
     else:
       if self.comp_method == 'sparse':
-        f = lambda s: bm.event_ops.event_csr_matvec(
+        f = lambda s: bm.event_csr_matvec(
           self.g_max, self.conn_mask[0], self.conn_mask[1], s,
           shape=(self.pre.num, self.post.num),
           transpose=True

brainpy/_src/dyn/synapses/abstract_models.py

@@ -230,7 +230,7 @@ def update(self, tdi, pre_spike=None):
       post_vs = self._syn2post_with_one2one(syn_value, self.g_max)
     else:
       if self.comp_method == 'sparse':
-        f = lambda s: bm.sparse_ops.cusparse_csr_matvec(
+        f = lambda s: bm.cusparse_csr_matvec(
           self.g_max, self.conn_mask[0], self.conn_mask[1], s,
           shape=(self.pre.num, self.post.num),
           transpose=True
@@ -574,7 +574,7 @@ def update(self, tdi, pre_spike=None):
       post_vs = self._syn2post_with_one2one(syn_value, self.g_max)
     else:
       if self.comp_method == 'sparse':
-        f = lambda s: bm.sparse_ops.cusparse_csr_matvec(
+        f = lambda s: bm.cusparse_csr_matvec(
           self.g_max,self.conn_mask[0], self.conn_mask[1], s,
           shape=(self.pre.num, self.post.num),
           transpose=True

brainpy/_src/dyn/synapses/biological_models.py

@@ -121,7 +121,7 @@ def update(self, pre_spike, post_v=None):
     else:
       if self.comp_method == 'sparse':
         if self.stp is None:
-          f = lambda s: bm.event_ops.event_csr_matvec(self.g_max,
+          f = lambda s: bm.event_csr_matvec(self.g_max,
                                                       self.conn_mask[0],
                                                       self.conn_mask[1],
                                                       s,
@@ -130,7 +130,7 @@ def update(self, pre_spike, post_v=None):
           if isinstance(self.mode, bm.BatchingMode):
             f = vmap(f)
         else:
-          f = lambda s: bm.sparse_ops.cusparse_csr_matvec(self.g_max,
+          f = lambda s: bm.cusparse_csr_matvec(self.g_max,
                                                           self.conn_mask[0],
                                                           self.conn_mask[1],
                                                           s,
@@ -276,7 +276,7 @@ def update(self, pre_spike, post_v=None):
       post_vs = self._syn2post_with_one2one(syn_value, self.g_max)
     else:
       if self.comp_method == 'sparse':
-        f = lambda s: bm.sparse_ops.cusparse_csr_matvec(
+        f = lambda s: bm.cusparse_csr_matvec(
           self.g_max,
           self.conn_mask[0],
           self.conn_mask[1],

brainpy/_src/dyn/synapses_v2/abstract_synapses.py

@@ -4,37 +4,9 @@
 Operators for brain dynamics modeling.
 """
 
-from .check import *
-from .errors import *
-from .tools import *
-from .register_custom_calls import *
-
-
-from . import (
-    event_ops,
-    sparse_ops,
-    jitconn_ops,
-    op_registers,
-    compat,
-    pre_syn_post,
-    sparse_matmul
-)
-
-__all__ = (
-    event_ops.__all__
-    + sparse_ops.__all__
-    + jitconn_ops.__all__
-    + op_registers.__all__
-    + compat.__all__
-    + pre_syn_post.__all__
-    + sparse_matmul.__all__
-)
-
 
 from .event_ops import *
 from .sparse_ops import *
 from .jitconn_ops import *
 from .op_registers import *
-from .compat import *
-from .sparse_matmul import *
-from .pre_syn_post import *
+from .pre_syn_post import *