diff --git a/doc/tutorials/izhikevich/nestml_izhikevich_tutorial.ipynb b/doc/tutorials/izhikevich/nestml_izhikevich_tutorial.ipynb index 6db636d2b..6ac4ff9b8 100644 --- a/doc/tutorials/izhikevich/nestml_izhikevich_tutorial.ipynb +++ b/doc/tutorials/izhikevich/nestml_izhikevich_tutorial.ipynb @@ -320,39 +320,6 @@ "fig.show()" ] }, - { - "cell_type": "code", - "execution_count": 6, - "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "\n", - "Mar 26 14:32:18 Install [Info]: \n", - " loaded module izhikevich_module\n" - ] - }, - { - "data": { - "text/plain": [ - "('izhikevich_module',)" - ] - }, - "execution_count": 6, - "metadata": {}, - "output_type": "execute_result" - } - ], - "source": [ - "nest.ResetKernel()\n", - "nest.Install(module_name)\n", - "# nest.Models()\n", - "os.environ[\"DYLD_LIBRARY_PATH\"]\n", - "nest.get(\"modules\")" - ] - }, { "cell_type": "markdown", "metadata": {}, diff --git a/doc/tutorials/stdp_windows/stdp_windows.ipynb b/doc/tutorials/stdp_windows/stdp_windows.ipynb index 58d5ecda3..9ccc67810 100644 --- a/doc/tutorials/stdp_windows/stdp_windows.ipynb +++ b/doc/tutorials/stdp_windows/stdp_windows.ipynb @@ -295,7 +295,7 @@ "-- Detecting CXX compile features - done\n", "\u001b[0m\u001b[0m\n", "\u001b[0m-------------------------------------------------------\u001b[0m\n", - "\u001b[0mnestml_stdp_module Configuration Summary\u001b[0m\n", + "\u001b[0mstdp_module Configuration Summary\u001b[0m\n", "\u001b[0m-------------------------------------------------------\u001b[0m\n", "\u001b[0m\u001b[0m\n", "\u001b[0mC++ compiler : /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/c++\u001b[0m\n", @@ -307,15 +307,15 @@ "\u001b[0m\u001b[0m\n", "\u001b[0m-------------------------------------------------------\u001b[0m\n", "\u001b[0m\u001b[0m\n", - "\u001b[0mYou can now build and install 'nestml_stdp_module' using\u001b[0m\n", + "\u001b[0mYou can now build and install 'stdp_module' using\u001b[0m\n", "\u001b[0m make\u001b[0m\n", "\u001b[0m make install\u001b[0m\n", "\u001b[0m\u001b[0m\n", - "\u001b[0mThe library file libnestml_stdp_module.so will be installed to\u001b[0m\n", - "\u001b[0m /var/folders/2j/fb047q1177v9f56f_jktrb4c0000gn/T/nestml_target_hru10kht\u001b[0m\n", + "\u001b[0mThe library file libstdp_module.so will be installed to\u001b[0m\n", + "\u001b[0m /var/folders/2j/fb047q1177v9f56f_jktrb4c0000gn/T/nestml_target_k_5p0jun\u001b[0m\n", "\u001b[0mThe module can be loaded into NEST using\u001b[0m\n", - "\u001b[0m (nestml_stdp_module) Install (in SLI)\u001b[0m\n", - "\u001b[0m nest.Install(nestml_stdp_module) (in PyNEST)\u001b[0m\n", + "\u001b[0m (stdp_module) Install (in SLI)\u001b[0m\n", + "\u001b[0m nest.Install(stdp_module) (in PyNEST)\u001b[0m\n", "\u001b[0m\u001b[0m\n", "\u001b[33mCMake Warning (dev) in CMakeLists.txt:\n", " No cmake_minimum_required command is present. A line of code such as\n", @@ -327,12 +327,19 @@ " information run \"cmake --help-policy CMP0000\".\n", "This warning is for project developers. Use -Wno-dev to suppress it.\n", "\u001b[0m\n", - "-- Configuring done (0.7s)\n", + "-- Configuring done (0.8s)\n", "-- Generating done (0.0s)\n", "-- Build files have been written to: /Users/pooja/nestml/master/doc/tutorials/stdp_windows/target\n", - "[ 50%] \u001b[32mBuilding CXX object CMakeFiles/nestml_stdp_module_module.dir/nestml_stdp_module.o\u001b[0m\n", - "[ 50%] \u001b[32mBuilding CXX object CMakeFiles/nestml_stdp_module_module.dir/iaf_psc_delta_nestml.o\u001b[0m\n", - "[ 75%] \u001b[32mBuilding CXX object CMakeFiles/nestml_stdp_module_module.dir/iaf_psc_delta_nestml__with_stdp_nestml.o\u001b[0m\n", + "[ 75%] \u001b[32mBuilding CXX object CMakeFiles/stdp_module_module.dir/iaf_psc_delta_nestml.o\u001b[0m\n", + "[ 75%] \u001b[32mBuilding CXX object CMakeFiles/stdp_module_module.dir/stdp_module.o\u001b[0m\n", + "[ 75%] \u001b[32mBuilding CXX object CMakeFiles/stdp_module_module.dir/iaf_psc_delta_nestml__with_stdp_nestml.o\u001b[0m\n", + "In file included from /Users/pooja/nestml/master/doc/tutorials/stdp_windows/target/stdp_module.cpp:31:\n", + "/Users/pooja/nestml/master/doc/tutorials/stdp_windows/target/iaf_psc_delta_nestml.h:267:17: warning: 'iaf_psc_delta_nestml::get_C_m' hides overloaded virtual function [-Woverloaded-virtual]\n", + " inline double get_C_m() const\n", + " ^\n", + "/Users/pooja/conda/nestml_dev/include/nest/node.h:797:18: note: hidden overloaded virtual function 'nest::Node::get_C_m' declared here: different number of parameters (1 vs 0)\n", + " virtual double get_C_m( int comp );\n", + " ^\n", "In file included from /Users/pooja/nestml/master/doc/tutorials/stdp_windows/target/iaf_psc_delta_nestml.cpp:44:\n", "/Users/pooja/nestml/master/doc/tutorials/stdp_windows/target/iaf_psc_delta_nestml.h:267:17: warning: 'iaf_psc_delta_nestml::get_C_m' hides overloaded virtual function [-Woverloaded-virtual]\n", " inline double get_C_m() const\n", @@ -363,37 +370,30 @@ "/Users/pooja/nestml/master/doc/tutorials/stdp_windows/target/iaf_psc_delta_nestml.cpp:283:16: warning: unused variable '__resolution' [-Wunused-variable]\n", " const double __resolution = nest::Time::get_resolution().get_ms(); // do not remove, this is necessary for the resolution() function\n", " ^\n", - "/Users/pooja/nestml/master/doc/tutorials/stdp_windows/target/iaf_psc_delta_nestml__with_stdp_nestml.cpp:181:16: warning: unused variable '__resolution' [-Wunused-variable]\n", - " const double __resolution = nest::Time::get_resolution().get_ms(); // do not remove, this is necessary for the resolution() function\n", - " ^\n", - "/Users/pooja/nestml/master/doc/tutorials/stdp_windows/target/iaf_psc_delta_nestml__with_stdp_nestml.cpp:318:10: warning: In file included from unused variable 'get_t' [-Wunused-variable]/Users/pooja/nestml/master/doc/tutorials/stdp_windows/target/nestml_stdp_module.cpp:31:\n", - "/Users/pooja/nestml/master/doc/tutorials/stdp_windows/target/iaf_psc_delta_nestml.h:267:17:\n", - " warning: 'iaf_psc_delta_nestml::get_C_m' hides overloaded virtual function [-Woverloaded-virtual]\n", - " auto get_t = [origin, lag](){ return nest::Time( nest::Time::step( origin.get_steps() + lag + 1) ).get_ms(); };\n", - " ^\n", - " inline double get_C_m() const\n", - " ^\n", - "/Users/pooja/nestml/master/doc/tutorials/stdp_windows/target/iaf_psc_delta_nestml__with_stdp_nestml.cpp:312:16: warning: unused variable '__resolution' [-Wunused-variable]\n", - "/Users/pooja/conda/nestml_dev/include/nest/node.h:797:18: note: hidden overloaded virtual function 'nest::Node::get_C_m' declared here: different number of parameters (1 vs 0)\n", - " const double __resolution = nest::Time::get_resolution().get_ms(); // do not remove, this is necessary for the resolution() function\n", - " ^ virtual double get_C_m( int comp );\n", - "\n", - " ^\n", - "In file included from /Users/pooja/nestml/master/doc/tutorials/stdp_windows/target/nestml_stdp_module.cpp:33:\n", + "In file included from /Users/pooja/nestml/master/doc/tutorials/stdp_windows/target/stdp_module.cpp:33:\n", "/Users/pooja/nestml/master/doc/tutorials/stdp_windows/target/iaf_psc_delta_nestml__with_stdp_nestml.h:319:17: warning: 'iaf_psc_delta_nestml__with_stdp_nestml::get_C_m' hides overloaded virtual function [-Woverloaded-virtual]\n", " inline double get_C_m() const\n", " ^\n", "/Users/pooja/conda/nestml_dev/include/nest/node.h:797:18: note: hidden overloaded virtual function 'nest::Node::get_C_m' declared here: different number of parameters (1 vs 0)\n", " virtual double get_C_m( int comp );\n", " ^\n", - "In file included from /Users/pooja/nestml/master/doc/tutorials/stdp_windows/target/nestml_stdp_module.cpp:33:\n", + "In file included from /Users/pooja/nestml/master/doc/tutorials/stdp_windows/target/stdp_module.cpp:33:\n", "/Users/pooja/nestml/master/doc/tutorials/stdp_windows/target/iaf_psc_delta_nestml__with_stdp_nestml.h:259:8: warning: 'register_stdp_connection' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]\n", " void register_stdp_connection( double t_first_read, double delay );\n", " ^\n", "/Users/pooja/conda/nestml_dev/include/nest/node.h:482:16: note: overridden virtual function is here\n", " virtual void register_stdp_connection( double, double );\n", " ^\n", - "In file included from /Users/pooja/nestml/master/doc/tutorials/stdp_windows/target/nestml_stdp_module.cpp:36:\n", + "/Users/pooja/nestml/master/doc/tutorials/stdp_windows/target/iaf_psc_delta_nestml__with_stdp_nestml.cpp:181:16: warning: unused variable '__resolution' [-Wunused-variable]\n", + " const double __resolution = nest::Time::get_resolution().get_ms(); // do not remove, this is necessary for the resolution() function\n", + " ^\n", + "/Users/pooja/nestml/master/doc/tutorials/stdp_windows/target/iaf_psc_delta_nestml__with_stdp_nestml.cpp:318:10: warning: unused variable 'get_t' [-Wunused-variable]\n", + " auto get_t = [origin, lag](){ return nest::Time( nest::Time::step( origin.get_steps() + lag + 1) ).get_ms(); };\n", + " ^\n", + "/Users/pooja/nestml/master/doc/tutorials/stdp_windows/target/iaf_psc_delta_nestml__with_stdp_nestml.cpp:312:16: warning: unused variable '__resolution' [-Wunused-variable]\n", + " const double __resolution = nest::Time::get_resolution().get_ms(); // do not remove, this is necessary for the resolution() function\n", + " ^\n", + "In file included from /Users/pooja/nestml/master/doc/tutorials/stdp_windows/target/stdp_module.cpp:36:\n", "/Users/pooja/nestml/master/doc/tutorials/stdp_windows/target/stdp_nestml__with_iaf_psc_delta_nestml.h:417:18: warning: unused variable '__resolution' [-Wunused-variable]\n", " const double __resolution = nest::Time::get_resolution().get_ms(); // do not remove, this is necessary for the resolution() function\n", " ^\n", @@ -592,13 +592,13 @@ "4 warnings generated.\n", "5 warnings generated.\n", "19 warnings generated.\n", - "[100%] \u001b[32m\u001b[1mLinking CXX shared module nestml_stdp_module.so\u001b[0m\n", + "[100%] \u001b[32m\u001b[1mLinking CXX shared module stdp_module.so\u001b[0m\n", "ld: warning: install name of a reexported library '@rpath/libtinfo.6.dylib' found at '/Users/pooja/conda/nestml_dev/lib/libtinfo.6.dylib' is different from install name '/Users/pooja/conda/nestml_dev/lib/libtinfo.6.dylib' found in its parent library '/Users/pooja/conda/nestml_dev/lib/libncurses.6.dylib'\n", - "[100%] Built target nestml_stdp_module_module\n", - "[100%] Built target nestml_stdp_module_module\n", + "[100%] Built target stdp_module_module\n", + "[100%] Built target stdp_module_module\n", "\u001b[36mInstall the project...\u001b[0m\n", "-- Install configuration: \"\"\n", - "-- Installing: /var/folders/2j/fb047q1177v9f56f_jktrb4c0000gn/T/nestml_target_hru10kht/nestml_stdp_module.so\n" + "-- Installing: /var/folders/2j/fb047q1177v9f56f_jktrb4c0000gn/T/nestml_target_k_5p0jun/stdp_module.so\n" ] } ], @@ -606,7 +606,7 @@ "module_name, neuron_model_name, synapse_model_name = NESTCodeGeneratorUtils.generate_code_for(\n", " \"../../../models/neurons/iaf_psc_delta.nestml\",\n", " nestml_stdp_model,\n", - " module_name=\"nestml_stdp_module\",\n", + " module_name=\"stdp_module\",\n", " post_ports=[\"post_spikes\"])" ] }, @@ -954,7 +954,7 @@ "\u001b[0m make install\u001b[0m\n", "\u001b[0m\u001b[0m\n", "\u001b[0mThe library file libstdp_windowed_module.so will be installed to\u001b[0m\n", - "\u001b[0m /var/folders/2j/fb047q1177v9f56f_jktrb4c0000gn/T/nestml_target_vbp6k7be\u001b[0m\n", + "\u001b[0m /var/folders/2j/fb047q1177v9f56f_jktrb4c0000gn/T/nestml_target_nk7rte3o\u001b[0m\n", "\u001b[0mThe module can be loaded into NEST using\u001b[0m\n", "\u001b[0m (stdp_windowed_module) Install (in SLI)\u001b[0m\n", "\u001b[0m nest.Install(stdp_windowed_module) (in PyNEST)\u001b[0m\n", @@ -969,7 +969,7 @@ " information run \"cmake --help-policy CMP0000\".\n", "This warning is for project developers. Use -Wno-dev to suppress it.\n", "\u001b[0m\n", - "-- Configuring done (0.8s)\n", + "-- Configuring done (0.6s)\n", "-- Generating done (0.0s)\n", "-- Build files have been written to: /Users/pooja/nestml/master/doc/tutorials/stdp_windows/target\n", "[ 25%] \u001b[32mBuilding CXX object CMakeFiles/stdp_windowed_module_module.dir/stdp_windowed_module.o\u001b[0m\n", @@ -1008,12 +1008,6 @@ "/Users/pooja/nestml/master/doc/tutorials/stdp_windows/target/iaf_psc_delta_nestml__with_stdp_windowed_nestml.cpp:186:16: warning: unused variable '__resolution' [-Wunused-variable]\n", " const double __resolution = nest::Time::get_resolution().get_ms(); // do not remove, this is necessary for the resolution() function\n", " ^\n", - "/Users/pooja/nestml/master/doc/tutorials/stdp_windows/target/iaf_psc_delta_nestml__with_stdp_windowed_nestml.cpp:336:10: warning: unused variable 'get_t' [-Wunused-variable]\n", - " auto get_t = [origin, lag](){ return nest::Time( nest::Time::step( origin.get_steps() + lag + 1) ).get_ms(); };\n", - " ^\n", - "/Users/pooja/nestml/master/doc/tutorials/stdp_windows/target/iaf_psc_delta_nestml__with_stdp_windowed_nestml.cpp:330:16: warning: unused variable '__resolution' [-Wunused-variable]\n", - " const double __resolution = nest::Time::get_resolution().get_ms(); // do not remove, this is necessary for the resolution() function\n", - " ^\n", "In file included from /Users/pooja/nestml/master/doc/tutorials/stdp_windows/target/stdp_windowed_module.cpp:31:\n", "/Users/pooja/nestml/master/doc/tutorials/stdp_windows/target/iaf_psc_delta_nestml.h:267:17: warning: 'iaf_psc_delta_nestml::get_C_m' hides overloaded virtual function [-Woverloaded-virtual]\n", " inline double get_C_m() const\n", @@ -1021,6 +1015,12 @@ "/Users/pooja/conda/nestml_dev/include/nest/node.h:797:18: note: hidden overloaded virtual function 'nest::Node::get_C_m' declared here: different number of parameters (1 vs 0)\n", " virtual double get_C_m( int comp );\n", " ^\n", + "/Users/pooja/nestml/master/doc/tutorials/stdp_windows/target/iaf_psc_delta_nestml__with_stdp_windowed_nestml.cpp:336:10: warning: unused variable 'get_t' [-Wunused-variable]\n", + " auto get_t = [origin, lag](){ return nest::Time( nest::Time::step( origin.get_steps() + lag + 1) ).get_ms(); };\n", + " ^\n", + "/Users/pooja/nestml/master/doc/tutorials/stdp_windows/target/iaf_psc_delta_nestml__with_stdp_windowed_nestml.cpp:330:16: warning: unused variable '__resolution' [-Wunused-variable]\n", + " const double __resolution = nest::Time::get_resolution().get_ms(); // do not remove, this is necessary for the resolution() function\n", + " ^\n", "In file included from /Users/pooja/nestml/master/doc/tutorials/stdp_windows/target/stdp_windowed_module.cpp:33:\n", "/Users/pooja/nestml/master/doc/tutorials/stdp_windows/target/iaf_psc_delta_nestml__with_stdp_windowed_nestml.h:334:17: warning: 'iaf_psc_delta_nestml__with_stdp_windowed_nestml::get_C_m' hides overloaded virtual function [-Woverloaded-virtual]\n", " inline double get_C_m() const\n", @@ -1240,7 +1240,7 @@ "[100%] Built target stdp_windowed_module_module\n", "\u001b[36mInstall the project...\u001b[0m\n", "-- Install configuration: \"\"\n", - "-- Installing: /var/folders/2j/fb047q1177v9f56f_jktrb4c0000gn/T/nestml_target_vbp6k7be/stdp_windowed_module.so\n" + "-- Installing: /var/folders/2j/fb047q1177v9f56f_jktrb4c0000gn/T/nestml_target_nk7rte3o/stdp_windowed_module.so\n" ] } ], @@ -1410,7 +1410,7 @@ "\u001b[0m make install\u001b[0m\n", "\u001b[0m\u001b[0m\n", "\u001b[0mThe library file libstdp_vogels_module.so will be installed to\u001b[0m\n", - "\u001b[0m /var/folders/2j/fb047q1177v9f56f_jktrb4c0000gn/T/nestml_target_fz6hkibd\u001b[0m\n", + "\u001b[0m /var/folders/2j/fb047q1177v9f56f_jktrb4c0000gn/T/nestml_target_ym4oobtv\u001b[0m\n", "\u001b[0mThe module can be loaded into NEST using\u001b[0m\n", "\u001b[0m (stdp_vogels_module) Install (in SLI)\u001b[0m\n", "\u001b[0m nest.Install(stdp_vogels_module) (in PyNEST)\u001b[0m\n", @@ -1425,7 +1425,7 @@ " information run \"cmake --help-policy CMP0000\".\n", "This warning is for project developers. Use -Wno-dev to suppress it.\n", "\u001b[0m\n", - "-- Configuring done (0.6s)\n", + "-- Configuring done (0.8s)\n", "-- Generating done (0.0s)\n", "-- Build files have been written to: /Users/pooja/nestml/master/doc/tutorials/stdp_windows/target\n", "[ 50%] \u001b[32mBuilding CXX object CMakeFiles/stdp_vogels_module_module.dir/iaf_psc_delta_nestml.o\u001b[0m\n", @@ -1452,13 +1452,6 @@ "/Users/pooja/conda/nestml_dev/include/nest/node.h:482:16: note: overridden virtual function is here\n", " virtual void register_stdp_connection( double, double );\n", " ^\n", - "In file included from /Users/pooja/nestml/master/doc/tutorials/stdp_windows/target/stdp_vogels_module.cpp:31:\n", - "/Users/pooja/nestml/master/doc/tutorials/stdp_windows/target/iaf_psc_delta_nestml.h:267:17: warning: 'iaf_psc_delta_nestml::get_C_m' hides overloaded virtual function [-Woverloaded-virtual]\n", - " inline double get_C_m() const\n", - " ^\n", - "/Users/pooja/conda/nestml_dev/include/nest/node.h:797:18: note: hidden overloaded virtual function 'nest::Node::get_C_m' declared here: different number of parameters (1 vs 0)\n", - " virtual double get_C_m( int comp );\n", - " ^\n", "/Users/pooja/nestml/master/doc/tutorials/stdp_windows/target/iaf_psc_delta_nestml.cpp:171:16: warning: unused variable '__resolution' [-Wunused-variable]\n", " const double __resolution = nest::Time::get_resolution().get_ms(); // do not remove, this is necessary for the resolution() function\n", " ^\n", @@ -1468,6 +1461,13 @@ "/Users/pooja/nestml/master/doc/tutorials/stdp_windows/target/iaf_psc_delta_nestml.cpp:283:16: warning: unused variable '__resolution' [-Wunused-variable]\n", " const double __resolution = nest::Time::get_resolution().get_ms(); // do not remove, this is necessary for the resolution() function\n", " ^\n", + "In file included from /Users/pooja/nestml/master/doc/tutorials/stdp_windows/target/stdp_vogels_module.cpp:31:\n", + "/Users/pooja/nestml/master/doc/tutorials/stdp_windows/target/iaf_psc_delta_nestml.h:267:17: warning: 'iaf_psc_delta_nestml::get_C_m' hides overloaded virtual function [-Woverloaded-virtual]\n", + " inline double get_C_m() const\n", + " ^\n", + "/Users/pooja/conda/nestml_dev/include/nest/node.h:797:18: note: hidden overloaded virtual function 'nest::Node::get_C_m' declared here: different number of parameters (1 vs 0)\n", + " virtual double get_C_m( int comp );\n", + " ^\n", "/Users/pooja/nestml/master/doc/tutorials/stdp_windows/target/iaf_psc_delta_nestml__with_stdp_vogels_nestml.cpp:181:16: warning: unused variable '__resolution' [-Wunused-variable]\n", " const double __resolution = nest::Time::get_resolution().get_ms(); // do not remove, this is necessary for the resolution() function\n", " ^\n", @@ -1696,7 +1696,7 @@ "[100%] Built target stdp_vogels_module_module\n", "\u001b[36mInstall the project...\u001b[0m\n", "-- Install configuration: \"\"\n", - "-- Installing: /var/folders/2j/fb047q1177v9f56f_jktrb4c0000gn/T/nestml_target_fz6hkibd/stdp_vogels_module.so\n" + "-- Installing: /var/folders/2j/fb047q1177v9f56f_jktrb4c0000gn/T/nestml_target_ym4oobtv/stdp_vogels_module.so\n" ] } ],