Skip to content

Commit

Permalink
Merge pull request #482 from chaoming0625/master
Browse files Browse the repository at this point in the history
ad acknowledgment.md
  • Loading branch information
chaoming0625 authored Sep 10, 2023
2 parents 6cfe6f8 + 9292dc2 commit 95caf05
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 13 deletions.
13 changes: 13 additions & 0 deletions ACKNOWLEDGMENTS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Acknowledgments

The development of BrainPy is being or has been supported by many organizations, programs, and individuals since 2020.
The following list of support received is therefore necessarily incomplete.


This project has received funding from Science and Technology Innovation 2030 (China Brain Project):

- Brain Science and Brain-inspired Intelligence Project (No. 2021ZD0200204).

Additionally, BrainPy gratefully acknowledges the support and funding received from:

- Beijing Academy of Artificial Intelligence.
9 changes: 3 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,13 @@ For detailed installation instructions, please refer to the documentation: [Quic
- **[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.

## Citing and Funding

If you are using ``brainpy``, please consider citing [the corresponding papers](https://brainpy.readthedocs.io/en/latest/tutorial_FAQs/citing_and_publication.html).
## Citing

BrainPy is developed by a team in Neural Information Processing Lab at Peking University, China.
Our team is committed to the long-term maintenance and development of the project.

Moreover, the development of BrainPy is being or has been supported by Science and Technology
Innovation 2030 - Brain Science and Brain-inspired Intelligence Project (China Brain Project),
and Beijing Academy of Artificial Intelligence.
If you are using ``brainpy``, please consider citing [the corresponding papers](https://brainpy.readthedocs.io/en/latest/tutorial_FAQs/citing_and_publication.html).



## Ongoing development plans
Expand Down
11 changes: 5 additions & 6 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
numpy
tqdm
msgpack
matplotlib>=3.4
numba
brainpylib
jax>=0.4.1
jaxlib>=0.4.1
scipy>=1.1.0
brainpylib
numba
matplotlib>=3.4
msgpack
tqdm

# test requirements
pytest
Expand Down
1 change: 0 additions & 1 deletion requirements-doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ msgpack
numba
jax>=0.4.1
matplotlib>=3.4
jaxlib>=0.4.1
scipy>=1.1.0
numba

Expand Down

0 comments on commit 95caf05

Please sign in to comment.