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.

Sign up for GitHub

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

Jump to bottom

Spinnaker new #11

Merged
merged 293 commits into from
Sep 21, 2023
Merged

Spinnaker new #11

merged 293 commits into from
Sep 21, 2023

Conversation

siirty
Copy link

@siirty siirty commented Mar 12, 2023

I again went over the problems with symlinks and tested the old method on my Desktop PC where everything works as expected, so i reverted those changes. I also added templates which we may use as a baseline to see what needs to be generated. As i`m not yet that familiar with all the nest framework it may make sense that you briefly look through the function headers to see if everything necessary for the calculations is present

clinssen
clinssen reviewed Mar 14, 2023
View reviewed changes
pynestml/codegeneration/resources_spinnaker/@NEURON_NAME@_impl.h.jinja2 Outdated
{%- include "directives_cpp/Block.jinja2" %}
{%- endfor %}
{%- endfilter %}
{%- if neuron.get_update_blocks() %}
Copy link
Owner

Choose a reason for hiding this comment

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

C++ (generated) code indentation should be independent of template code indentation. To indent the latter, please use

{%- [... indent here ...] while ... %}

pynestml/codegeneration/resources_spinnaker/common/iaf_psc_exp_template.c Outdated
@@ -0,0 +1,160 @@
#include <iaf_psc_exp_template.h>
Copy link
Owner

Choose a reason for hiding this comment

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

Is this generated code, or the start of a new template? Generated code should not be part of the PR. If it is a template, could you rename it to something like @NEURON_NAME@.c.jinja2?

setup.py Outdated
@@ -25,6 +25,7 @@

Copy link
Owner

Choose a reason for hiding this comment

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

Are the additional newlines necessary?

@clinssen
Copy link
Owner

Could you please fix the static checks too? Cheers!

clinssen
clinssen requested changes Mar 20, 2023
View reviewed changes
setup.py Outdated
@@ -67,4 +67,4 @@

install_requires=requirements,
test_suite="tests",
)
Copy link
Owner

Choose a reason for hiding this comment

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

please fix missing newline

.gitignore Outdated
@@ -31,3 +34,5 @@ venv
*.gdf
*~
*.iml
pynestml/codegeneration/resources_spinnaker/common/iaf_psc_exp_template.c
Copy link
Owner

Choose a reason for hiding this comment

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

Should these two lines be here?

.github should not be ignored, it contains the CI scripts.

I'm fine with your other changes in this file, but can you spin them off to a separate pull request directly to https://github.com/nest/nestml? Cheers!

clinssen and others added 27 commits March 24, 2023 11:37
@clinssen
Merge pull request nest#885 from clinssen/fix_sympy_predef_func
44a85a1 
Fix conflict with sympy predefined/built-in functions
@pnbabu
Fix OU noise tutorial notebook
bb2f422
@pnbabu
Merge remote-tracking branch 'upstream/master' into fix_ou_noise_tuto…
820ed6f 
…rial
@clinssen
Merge pull request nest#886 from pnbabu/fix_ou_noise_tutorial
b3f6090 
Fix OU noise tutorial
@siirty
spinnaker_test runs without errors
8b8ac1a
@clinssen
add erf() and erfc() to predefined maths functions (nest#889)
91de439 
Co-authored-by: C.A.P. Linssen <charl@turingbirds.com>
@pnbabu @jougs
Remove end keyword from NESTML models (nest#866)
7a1d0ce 
* Add lexer and parser for removing end keyword

* Remove end keyword for neuron models

* Remove end keyword for synapse models
---------

Co-authored-by: Jochen Martin Eppler <jougs@gmx.net>
@pnbabu
Fix links in ipython notebooks
680a60c
make sure continuous-time value buffers are properly initialized
4329736
@clinssen
Merge pull request nest#890 from pnbabu/fix_ipynb_links
31d49ae 
Fix links in ipython notebooks
@clinssen
Merge pull request nest#892 from clinssen/buffer_init
45c4cf6 
Make sure continuous-time value buffers are properly initialized
fix ternary operator handling
1d2318f
fix ternary operator handling
071fa81
@siirty
stash for laptop(example python impl)
ae3ff42
@siirty
updated template
04969f6
@clinssen
improve name of GitHub Actions workflow
23a3fbd
@clinssen
fix GitHub Actions status badge
407a72a
@pnbabu
Indent output block (nest#893)
9353917
@pnbabu
Fix links in ipynb notebooks
74f04f1
@siirty
Stash for laptop(Changed relevant python generation !UNDO later!)
c4986d1
@clinssen
Merge pull request nest#898 from pnbabu/fix_ipynb_links
aeff052 
Fix links in ipynb notebooks
@clinssen
Merge pull request nest#897 from clinssen/bail_error_strategy
35c253d 
Fix ternary operator handling
@clinssen
Fix accessing predefined time variable t in synapse event handlers (n…
1928f33 
…est#826)
@siirty
fixed setup and bad directives
cf2b750
@clinssen
Fix numeric origin printer (nest#891)
ad828d9
@le-schmidt
Merge remote-tracking branch 'nest/master' into stash
075146e
@clinssen
remove debug print statement (nest#899)
ad96114 
Co-authored-by: C.A.P. Linssen <charl@turingbirds.com>
le-schmidt and others added 29 commits August 17, 2023 12:02
@le-schmidt
Generate full state to weight state
e72f2b7
@le-schmidt
Merge branch 'stash' into spinnaker-new
ee7e449
@med-ayssar
Split process function into sub-routines (nest#916)
092f5fa
@le-schmidt
Fixed all syntax errors
9dd13c5
@pnbabu
Fix type check for inline expressions (nest#945)
b10be5f
@le-schmidt
Don't throw exception on void
89289a6
@le-schmidt
Exception on external variable
66a8934
@le-schmidt
Synapse compiles
2eb246c
@le-schmidt
Added some fixed point arithmetic
74db625
@le-schmidt
Merge branch 'stash' into spinnaker-new
cac8044
@pnbabu
Remove units from spiking input ports (nest#882)
ddaa78b
@pnbabu
Fix input ports (nest#947)
f8dbab7
@pnbabu
Fix print function (nest#951)
13d08a4
@clinssen
Fix STDP synapse bug (nest-simulator #2443) (nest#843)
7ee2455
@clinssen
fix third-factor STDP test condition (nest#956)
4339780 
Co-authored-by: C.A.P. Linssen <charl@turingbirds.com>
@clinssen
add admonition to docs (nest#955)
af9623a 
Co-authored-by: C.A.P. Linssen <charl@turingbirds.com>
@clinssen
Fix third factor STDP synapse test (nest#958)
3d33b70
@clinssen
Add/fix checks that inline expressions, parameters and internals cann…
b39c002 
…ot be assigned to (nest#953)
@pnbabu
Fix power operator and elif functions in NESTML (nest#950)
a2d57ab
@pnbabu
Add linker flags to resolve linker errors in macOS (nest#954)
7a6f2a1
@pnbabu
Merge remote-tracking branch 'upstream/master' into spinnaker-new
dea1ead
@pnbabu
Remove spinnaker-install directory
74b3071
@pnbabu
Fix pycodestyle errors
370bb1f
@pnbabu
Fix templates
880fefe
add support for SpiNNaker
4e533bb
@pnbabu
Comment out the synapses in the test
f343cd1
@pnbabu
Fix pycodestyle errors
59324ae
add support for SpiNNaker
24a3f12
Merge remote-tracking branch 'le-schmidt/spinnaker-new' into spinnake…
12b1a4b 
…r-new
@clinssen clinssen merged commit 12b1a4b into clinssen:spinnaker-new Sep 21, 2023
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@clinssen clinssen clinssen requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@siirty @clinssen @pnbabu @le-schmidt @med-ayssar