Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/Windows_CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
python -m pip install numpy>=1.21.0
python -m pip install "jaxlib==0.3.14" -f https://whls.blob.core.windows.net/unstable/index.html --use-deprecated legacy-resolver
python -m pip install https://github.com/google/jax/archive/refs/tags/jax-v0.3.14.tar.gz
python -m pip install -r requirements-win.txt
python -m pip install -r requirements-dev.txt
python -m pip install tqdm brainpylib
python setup.py install
- name: Lint with flake8
Expand Down
2 changes: 1 addition & 1 deletion brainpy/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-

__version__ = "2.2.3.4"
__version__ = "2.2.3.5"


try:
Expand Down
2 changes: 1 addition & 1 deletion brainpy/initialize/generic.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def parameter(
else:
raise ValueError(f'Unknown param type {type(param)}: {param}')
if allow_scalar:
if param.shape == () or param.shape != (1,):
if param.shape == () or param.shape == (1,):
return param
if param.shape != size:
raise ValueError(f'The shape of the parameters should be {size}, but we got {param.shape}')
Expand Down
5 changes: 5 additions & 0 deletions brainpy/math/tests/test_numpy_einsum.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.


import pytest
pytest.skip("No need to test.", allow_module_level=True)


import itertools
from collections import defaultdict
from functools import partial
Expand Down
2 changes: 2 additions & 0 deletions brainpy/math/tests/test_numpy_indexing.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@


import pytest
pytest.skip("No need to test.", allow_module_level=True)

import enum
import itertools
import typing
Expand Down
2 changes: 2 additions & 0 deletions brainpy/math/tests/test_numpy_ops.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@


import pytest
pytest.skip("No need to test.", allow_module_level=True)

import collections
import functools
from functools import partial
Expand Down
6 changes: 4 additions & 2 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
-r requirements.txt

numpy>=1.15
jax>=0.3.0
tqdm
numba
matplotlib>=3.4
jaxlib>=0.3.0
Expand All @@ -11,3 +12,4 @@ pillow

# test requirements
pytest
absl-py
13 changes: 0 additions & 13 deletions requirements-win.txt

This file was deleted.