Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LIF ProcessModels: Floating and fixed point: PR attempt #2 #70

Merged
merged 23 commits into from
Nov 18, 2021

Conversation

srrisbud
Copy link
Contributor

There are merge conflicts. Trying to resolve these gracefully, without using the nuclear option of deleting and recreating the entire fork.

srrisbud and others added 16 commits November 2, 2021 16:30
…created through LavaPyType

Signed-off-by: Risbud, Sumedh <[email protected]>
…created through LavaPyType

Signed-off-by: Risbud, Sumedh <[email protected]>
@srrisbud srrisbud added 0-needs-review For all new issues area: proc Issues with something in lava/proc lif area: magma/core Issues with something in lava/magma/core labels Nov 18, 2021
@srrisbud srrisbud self-assigned this Nov 18, 2021
@srrisbud
Copy link
Contributor Author

There are merge conflicts. Trying to resolve these gracefully, without using the nuclear option of deleting and recreating the entire fork.

Seems like I was successful in fixing the merge issues. There are no merge conflicts anymore.

Copy link
Contributor

@mathisrichter mathisrichter left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good in general.
The most important request from my side are unit tests for the Process Models and their dynamics.

I didn't check the changes to the tutorials.

src/lava/proc/lif/models.py Show resolved Hide resolved
src/lava/proc/lif/models.py Outdated Show resolved Hide resolved
tests/lava/proc/lif/test_process.py Show resolved Hide resolved
Copy link
Contributor

@bamsumit bamsumit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. I didn't go through the notebooks. I guess they work ;)

Copy link
Contributor Author

@srrisbud srrisbud left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Went over everything once

@mathisrichter
Copy link
Contributor

Nice! But no unit tests for the two Process Models?

@mathisrichter
Copy link
Contributor

Nice! But no unit tests for the two Process Models?

Never mind, I overlooked all of that. Sorry!

@srrisbud srrisbud merged commit 9245fd2 into lava-nc:main Nov 18, 2021
@bamsumit
Copy link
Contributor

@srrisbud the new lif unittests are really polluting the console with deprication warnings. Apparently they don't show up in pyb -E unit but try python -m unittest discover test/ and it shows up and there are loads of them.

/home/sshresth/lava-nc/lava/src/lava/proc/lif/models.py:24: DeprecationWarning: `np.float` is a deprecated alias for the builtin `float`. To silence this warning, use `float` by itself. Doing this will not modify any behavior and is safe. If you specifically wanted the numpy scalar type, use `np.float64` here.
Deprecated in NumPy 1.20; for more details and guidance: https://numpy.org/devdocs/release/1.20.0-notes.html#deprecations
  a_in: PyInPort = LavaPyType(PyInPort.VEC_DENSE, np.float)
/home/sshresth/lava-nc/lava/src/lava/proc/lif/models.py:26: DeprecationWarning: `np.float` is a deprecated alias for the builtin `float`. To silence this warning, use `float` by itself. Doing this will not modify any behavior and is safe. If you specifically wanted the numpy scalar type, use `np.float64` here.
Deprecated in NumPy 1.20; for more details and guidance: https://numpy.org/devdocs/release/1.20.0-notes.html#deprecations
  u: np.ndarray = LavaPyType(np.ndarray, np.float)

@srrisbud srrisbud deleted the bit_acc_lif_dense branch July 17, 2022 15:04
monkin77 pushed a commit to monkin77/thesis-lava that referenced this pull request Jul 12, 2024
…va-nc#70)

* Added @tags decorator to tag ProcessModels and distinguish them

Signed-off-by: Risbud, Sumedh <[email protected]>

* Fixed @tags decorator after pull request review

Signed-off-by: Risbud, Sumedh <[email protected]>

* LIF: bit-accurate with Loihi and floating point ProcessModels

Signed-off-by: Risbud, Sumedh <[email protected]>

* Minor change to variable builder to support floating point variables created through LavaPyType

Signed-off-by: Risbud, Sumedh <[email protected]>

* Minor change to variable builder to support floating point variables created through LavaPyType

Signed-off-by: Risbud, Sumedh <[email protected]>

* lava -> src/lava: reorg to resolve merge conflicts

Signed-off-by: Risbud, Sumedh <[email protected]>

* tests -> tests/lava: reorg to resolve merge conflicts

Signed-off-by: Risbud, Sumedh <[email protected]>

* tests -> tests/lava: reorg to resolve merge conflicts

Signed-off-by: Risbud, Sumedh <[email protected]>

* Manual merge of changes from message passing refactoring (after lava->src/lava reorg)

Signed-off-by: Risbud, Sumedh <[email protected]>

* Loihi1SimCfg handles subProcs and tags. Tutorials 2-6 work with new LIF

* Minor: builder support for float LavaPyType corrected

Signed-off-by: Risbud, Sumedh <[email protected]>

* LIF: incorporated code-review suggestions

Signed-off-by: Risbud, Sumedh <[email protected]>

* Manually merge latest lava-nc/lava:main to the personal fork:main

Signed-off-by: Risbud, Sumedh <[email protected]>

* Minor change to variable builder to support floating point variables created through LavaPyType

Signed-off-by: Risbud, Sumedh <[email protected]>

* Fixing flake8 flagged line overflows

Signed-off-by: Risbud, Sumedh <[email protected]>

* Fixing flake8 flagged line overflows

Signed-off-by: Risbud, Sumedh <[email protected]>

* LIF: changes in response to @mathisrichter's review

Signed-off-by: Risbud, Sumedh <[email protected]>

Co-authored-by: drager-intel <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0-needs-review For all new issues area: magma/core Issues with something in lava/magma/core area: proc Issues with something in lava/proc
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Create fixed point ProcessModel for LIF, bit-accurate with Loihi hardware implementation
5 participants