Skip to content

Commit 9fd56ea

Browse files
ago109Alexander Ororbiarxng8
authored
Nudge of release to minor patched version 2.0.3 (#118)
* nudge of doc to 2.0.2 (#115) Co-authored-by: Alexander Ororbia <ago@hal3.cs.rit.edu> * minor edit to math in hh-lesson doc * Fix workflow, numpy install, and pytest bug in github action workflows (#117) * Update pyproject.toml * Update python-package-conda.yml * Update python-package-conda.yml * Update python-package-conda.yml * Update python-package-conda.yml * Update python-package-conda.yml * Update python-package-conda.yml * Update python-package-conda.yml * minor nudge/cleanup to minor patched version 2.0.1 * minor nudge/cleanup to minor patched version 2.0.3 --------- Co-authored-by: Alexander Ororbia <ago@hal3.cs.rit.edu> Co-authored-by: Viet Dung Nguyen <60036798+rxng8@users.noreply.github.com>
1 parent ffc94a5 commit 9fd56ea

File tree

9 files changed

+39
-33
lines changed

9 files changed

+39
-33
lines changed

.github/workflows/python-package-conda.yml

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,19 @@ jobs:
1010

1111
steps:
1212
- uses: actions/checkout@v4
13-
- name: Set up Python 3.10
14-
uses: actions/setup-python@v3
13+
14+
- name: Install Miniconda
15+
uses: conda-incubator/setup-miniconda@v2
1516
with:
16-
python-version: '3.10'
17-
- name: Add conda to system path
17+
auto-update-conda: true
18+
python-version: 3.11
19+
environment-name: test
20+
21+
- name: Install dependencies
1822
run: |
19-
# $CONDA is an environment variable pointing to the root of the miniconda directory
20-
echo $CONDA/bin >> $GITHUB_PATH
21-
- name: Install current library and dependencies
22-
run: |
23-
pip install -e .
24-
# - name: Lint with flake8
25-
# run: |
26-
# conda install flake8
27-
# # stop the build if there are Python syntax errors or undefined names
28-
# flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
29-
# # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
30-
# flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
31-
- name: Test with pytest
23+
conda install -n test numpy=1.26 pytest pip
24+
conda run -n test pip install -e .
25+
26+
- name: Run tests
3227
run: |
33-
conda install pytest
34-
pytest
28+
conda run -n test pytest

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ngc-learn requires:
3232
1) Python (>=3.10)
3333
2) NumPy (>=1.22.0)
3434
3) SciPy (>=1.7.0)
35-
4) ngcsimlib (>=1.0.0), (visit official page <a href="https://github.com/NACLab/ngc-sim-lib">here</a>)
35+
4) ngcsimlib (>=1.0.1), (visit official page <a href="https://github.com/NACLab/ngc-sim-lib">here</a>)
3636
5) JAX (>=0.4.28) (to enable GPU use, make sure to install one of the CUDA variants)
3737
<!--
3838
5) scikit-learn (>=1.3.1) if using `ngclearn.utils.density`
@@ -42,7 +42,7 @@ ngc-learn requires:
4242
-->
4343

4444
---
45-
ngc-learn 2.0.0 and later require Python 3.10 or newer as well as ngcsimlib >=1.0.0.
45+
ngc-learn 2.0.3 and later require Python 3.10 or newer as well as ngcsimlib >=1.0.1.
4646
ngc-learn's plotting capabilities (routines within `ngclearn.utils.viz`) require
4747
Matplotlib (>=3.8.0) and imageio (>=2.31.5) and both plotting and density estimation
4848
tools (routines within ``ngclearn.utils.density``) will require Scikit-learn (>=0.24.2).
@@ -75,7 +75,7 @@ Python 3.11.4 (main, MONTH DAY YEAR, TIME) [GCC XX.X.X] on linux
7575
Type "help", "copyright", "credits" or "license" for more information.
7676
>>> import ngclearn
7777
>>> ngclearn.__version__
78-
'2.0.0'
78+
'2.0.3'
7979
```
8080

8181
<i>Note:</i> For access to the previous Tensorflow-2 version of ngc-learn (of
@@ -122,7 +122,7 @@ $ python install -e .
122122
</pre>
123123

124124
**Version:**<br>
125-
2.0.2 <!--1.2.3-Beta--> <!-- -Alpha -->
125+
2.0.3 <!--1.2.3-Beta--> <!-- -Alpha -->
126126

127127
Author:
128128
Alexander G. Ororbia II<br>

docs/installation.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ requires that you ensure that you have installed the following base dependencies
99
your system. Note that this library was developed and tested on Ubuntu 22.04 (and earlier versions on 18.04/20.04).
1010
Specifically, ngc-learn requires:
1111
* Python (>=3.10)
12-
* ngcsimlib (>=1.0.0), (<a href="https://github.com/NACLab/ngc-sim-lib">official page</a>)
12+
* ngcsimlib (>=1.0.1), (<a href="https://github.com/NACLab/ngc-sim-lib">official page</a>)
1313
* NumPy (>=1.22.0)
1414
* SciPy (>=1.7.0)
1515
* JAX (>= 0.4.28; and jaxlib>=0.4.28) <!--(tested for cuda 11.8)-->
@@ -78,7 +78,7 @@ Python 3.11.4 (main, MONTH DAY YEAR, TIME) [GCC XX.X.X] on linux
7878
Type "help", "copyright", "credits" or "license" for more information.
7979
>>> import ngclearn
8080
>>> ngclearn.__version__
81-
'2.0.2'
81+
'2.0.3'
8282
```
8383

8484
<i>Note</i>: If you do not have a JSON configuration file in place (see tutorials

docs/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ matplotlib>=3.8.0
88
jax>=0.4.28
99
jaxlib>=0.4.28
1010
imageio>=2.31.5
11-
ngcsimlib>=1.0.0
11+
ngcsimlib>=1.0.1

docs/tutorials/neurocog/hodgkin_huxley_cell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ neurons and muscle cells. It is a continuous-time dynamical system.
8282
Formally, the core dynamics of the H-H cell can be written out as follows:
8383

8484
$$
85-
\tau_v \frac{\partial \mathbf{v}_t}{\partial t} &= \mathbf{j}_t - g_Na * \mathbf{m}^3_t * \mathbf{h}_t * (\mathbf{v}_t - v_Na) - g_K * \mathbf{n}^4_t * (\mathbf{v}_t - v_K) - g_L * (\mathbf{v}_t - v_L) \\
85+
\tau_v \frac{\partial \mathbf{v}_t}{\partial t} &= \mathbf{j}_t - g_{Na} * \mathbf{m}^3_t * \mathbf{h}_t * (\mathbf{v}_t - v_{Na}) - g_K * \mathbf{n}^4_t * (\mathbf{v}_t - v_K) - g_L * (\mathbf{v}_t - v_L) \\
8686
\frac{\partial \mathbf{n}_t}{\partial t} &= \alpha_n(\mathbf{v}_t) * (1 - \mathbf{n}_t) - \beta_n(\mathbf{v}_t) * \mathbf{n}_t \\
8787
\frac{\partial \mathbf{m}_t}{\partial t} &= \alpha_m(\mathbf{v}_t) * (1 - \mathbf{m}_t) - \beta_m(\mathbf{v}_t) * \mathbf{m}_t \\
8888
\frac{\partial \mathbf{h}_t}{\partial t} &= \alpha_h(\mathbf{v}_t) * (1 - \mathbf{h}_t) - \beta_h(\mathbf{v}_t) * \mathbf{h}_t

history.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,3 +80,8 @@ History
8080
* integration of reinforce-synapse, block/partitioned synapse component ("patched-synapse")
8181
* basic unit-tests (pytest framework) integrated to support dev
8282
* includes support for Intel's lava-nc emulator (several spiking/stdp components that play with ngc-lava)
83+
84+
2.0.3
85+
— — — — — — — — -
86+
* Minor patch to point / depend on minor-patched ngcsimlib 1.0.1 (nudge to minor patched release)
87+
* Added wrapper `inverse_sigmoid` for original `inverse_logistic` routine in model_utils (for convenience)

ngclearn/utils/model_utils.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -508,10 +508,13 @@ def d_sigmoid(x):
508508
sigm_x = nn.sigmoid(x) ## pre-compute once
509509
return sigm_x * (1. - sigm_x)
510510

511+
def inverse_sigmoid(x, clip_bound=0.03): ## wrapper call for naming convention ease
512+
return inverse_logistic(x, clip_bound=clip_bound)
513+
511514
@jit
512-
def inverse_logistic(x, clip_bound=0.03): # 0.03
515+
def inverse_logistic(x, clip_bound=0.03):
513516
"""
514-
The inverse logistic link - logit function.
517+
The inverse logistic link - the logit function.
515518
516519
Args:
517520
x: data to transform via inverse logistic function

pyproject.toml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
[build-system]
2-
requires = ["setuptools>=61.0"]
3-
build-backend = "setuptools.build_meta"
2+
requires = [
3+
"setuptools>=61.0", # default
4+
"wheel", # also often needed
5+
"numpy>=1.19.5" # add numpy here for build-time use
6+
]
7+
build-backend = "setuptools.build_meta" # using setuptool building engine
48

59
[project]
610
name = "ngclearn"
7-
version = "2.0.2"
11+
version = "2.0.3"
812
description = "Simulation software for building and analyzing arbitrary predictive coding, spiking network, and biomimetic neural systems."
913
authors = [
1014
{name = "Alexander Ororbia", email = "ago@cs.rit.edu"},

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ matplotlib>=3.8.0
55
patchify
66
jax>=0.4.28
77
jaxlib>=0.4.28
8-
ngcsimlib>=1.0.0
8+
ngcsimlib>=1.0.1
99
imageio>=2.31.5
1010
pandas>=2.2.3

0 commit comments

Comments
 (0)