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/python_actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
name: Python Actions
on: [push]
env:
CODE_PATHS: examples python_models8 nmt_integration_tests
CODE_PATHS: examples python_models nmt_integration_tests

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .ratexcludes
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@
**/neural_modelling/builds/**/*.txt
**/reports/**
**/c_models/**
**/python_models8/**
**/python_models/**
**/examples/**
2 changes: 1 addition & 1 deletion c_models/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
CURRENT_DIR := $(abspath $(dir $(MAKEFILE_PATH)))
APP_OUTPUT_DIR := $(CURRENT_DIR)/../python_models8/model_binaries/
APP_OUTPUT_DIR := $(CURRENT_DIR)/../python_models/model_binaries/

DIRS = makefiles

Expand Down
2 changes: 1 addition & 1 deletion c_models/makefiles/extra.mk
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ EXTRA_MODELS_DIR := $(abspath $(dir $(MAKEFILE_PATH))/../../)/
BUILD_DIR := $(EXTRA_MODELS_DIR)c_models/build/$(APP)/

# This is where the output .aplx files will go
APP_OUTPUT_DIR := $(EXTRA_MODELS_DIR)python_models8/model_binaries/
APP_OUTPUT_DIR := $(EXTRA_MODELS_DIR)python_models/model_binaries/
# key for the database in this APP_OUTPUT_DIR
# If you change APP_OUTPUT_DIR please use a lower case letter
DATABASE_KEY = N
Expand Down
2 changes: 1 addition & 1 deletion c_models/makefiles/extra_neuron.mk
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ EXTRA_MODELS_DIR := $(abspath $(dir $(MAKEFILE_PATH))/../../)/
BUILD_DIR := $(EXTRA_MODELS_DIR)c_models/build/$(APP)/

# This is where the output .aplx files will go
APP_OUTPUT_DIR := $(EXTRA_MODELS_DIR)python_models8/model_binaries/
APP_OUTPUT_DIR := $(EXTRA_MODELS_DIR)python_models/model_binaries/
# key for the database in this APP_OUTPUT_DIR
# If you change APP_OUTPUT_DIR please use a lower case letter
DATABASE_KEY = N
Expand Down
2 changes: 1 addition & 1 deletion c_models/makefiles/extra_synapse.mk
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ EXTRA_MODELS_DIR := $(abspath $(dir $(MAKEFILE_PATH))/../../)/
BUILD_DIR := $(EXTRA_MODELS_DIR)c_models/build/$(APP)/

# This is where the output .aplx files will go
APP_OUTPUT_DIR := $(EXTRA_MODELS_DIR)python_models8/model_binaries/
APP_OUTPUT_DIR := $(EXTRA_MODELS_DIR)python_models/model_binaries/
# key for the database in this APP_OUTPUT_DIR
# If you change APP_OUTPUT_DIR please use a lower case letter
DATABASE_KEY = N
Expand Down
2 changes: 1 addition & 1 deletion doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ def excluded_because_in_init(base):


_output_dir = os.path.abspath(".")
_package_base = "python_models8"
_package_base = "python_models"

# Do the rst generation; remove files which aren't in git first!
for fl in os.listdir("."):
Expand Down
4 changes: 2 additions & 2 deletions doc/source/modules.rst
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
python_models8
python_models
==============

.. toctree::
:maxdepth: 4

python_models8
python_models

examples
========
Expand Down
18 changes: 9 additions & 9 deletions examples/my_example.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@
import matplotlib.pyplot as plt

# import models
from python_models8.neuron.plasticity.stdp.timing_dependence\
from python_models.neuron.plasticity.stdp.timing_dependence\
.my_timing_dependence import (
MyTimingDependence)
from python_models8.neuron.plasticity.stdp.weight_dependence\
from python_models.neuron.plasticity.stdp.weight_dependence\
.my_weight_dependence import (
MyWeightDependence)
from python_models8.neuron.builds.my_model_curr_exp import MyModelCurrExp
from python_models8.neuron.builds.my_full_neuron import MyFullNeuron
from python_models8.neuron.builds.my_if_curr_exp_sEMD import MyIFCurrExpSEMD
from python_models8.neuron.builds.my_model_curr_exp_my_input_type import (
from python_models.neuron.builds.my_model_curr_exp import MyModelCurrExp
from python_models.neuron.builds.my_full_neuron import MyFullNeuron
from python_models.neuron.builds.my_if_curr_exp_sEMD import MyIFCurrExpSEMD
from python_models.neuron.builds.my_model_curr_exp_my_input_type import (
MyModelCurrExpMyInputType)
from python_models8.neuron.builds.my_model_curr_my_synapse_type import (
from python_models.neuron.builds.my_model_curr_my_synapse_type import (
MyModelCurrMySynapseType)
from python_models8.neuron.builds.my_model_curr_exp_my_additional_input \
from python_models.neuron.builds.my_model_curr_exp_my_additional_input \
import (
MyModelCurrExpMyAdditionalInput)
from python_models8.neuron.builds.my_model_curr_exp_my_threshold import (
from python_models.neuron.builds.my_model_curr_exp_my_threshold import (
MyModelCurrExpMyThreshold)


Expand Down
2 changes: 1 addition & 1 deletion examples/my_sEMD_example.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

# imports
import pyNN.spiNNaker as p
from python_models8.neuron.builds.my_if_curr_exp_sEMD import MyIFCurrExpSEMD
from python_models.neuron.builds.my_if_curr_exp_sEMD import MyIFCurrExpSEMD

import datetime
from pyNN.utility.plotting import Figure, Panel
Expand Down
2 changes: 1 addition & 1 deletion nmt_integration_tests/test_my_full_neuron.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import pyNN.spiNNaker as sim
from .nwt_testbase import NwtTestBase
from python_models8.neuron.builds.my_full_neuron import MyFullNeuron
from python_models.neuron.builds.my_full_neuron import MyFullNeuron

# Set the run time of the execution
run_time = 1000
Expand Down
2 changes: 1 addition & 1 deletion nmt_integration_tests/test_my_if_curr_exp_semd.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import pyNN.spiNNaker as sim
from .nwt_testbase import NwtTestBase
from python_models8.neuron.builds.my_if_curr_exp_sEMD import MyIFCurrExpSEMD
from python_models.neuron.builds.my_if_curr_exp_sEMD import MyIFCurrExpSEMD

# Set the run time of the execution
run_time = 1000
Expand Down
2 changes: 1 addition & 1 deletion nmt_integration_tests/test_my_model_curr_exp.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import pyNN.spiNNaker as sim
from .nwt_testbase import NwtTestBase
from python_models8.neuron.builds.my_model_curr_exp import MyModelCurrExp
from python_models.neuron.builds.my_model_curr_exp import MyModelCurrExp

# Set the run time of the execution
run_time = 1000
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import pyNN.spiNNaker as sim
from .nwt_testbase import NwtTestBase
from python_models8.neuron.builds.my_model_curr_exp_my_input_type import (
from python_models.neuron.builds.my_model_curr_exp_my_input_type import (
MyModelCurrExpMyInputType)

# Set the run time of the execution
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import pyNN.spiNNaker as sim
from .nwt_testbase import NwtTestBase
from python_models8.neuron.builds.my_model_curr_exp_my_threshold import (
from python_models.neuron.builds.my_model_curr_exp_my_threshold import (
MyModelCurrExpMyThreshold)

# Set the run time of the execution
Expand Down
6 changes: 3 additions & 3 deletions nmt_integration_tests/test_my_model_curr_exp_stdp.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@

import pyNN.spiNNaker as sim
from .nwt_testbase import NwtTestBase
from python_models8.neuron.builds.my_model_curr_exp import MyModelCurrExp
from python_models8.neuron.plasticity.stdp.timing_dependence\
from python_models.neuron.builds.my_model_curr_exp import MyModelCurrExp
from python_models.neuron.plasticity.stdp.timing_dependence\
.my_timing_dependence import (
MyTimingDependence)
from python_models8.neuron.plasticity.stdp.weight_dependence\
from python_models.neuron.plasticity.stdp.weight_dependence\
.my_weight_dependence import (
MyWeightDependence)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import pyNN.spiNNaker as sim
from .nwt_testbase import NwtTestBase
from python_models8.neuron.builds.my_model_curr_exp_my_additional_input \
from python_models.neuron.builds.my_model_curr_exp_my_additional_input \
import MyModelCurrExpMyAdditionalInput

# Set the number of neurons to simulate
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import pyNN.spiNNaker as sim
from .nwt_testbase import NwtTestBase
from python_models8.neuron.builds.my_model_curr_my_synapse_type import (
from python_models.neuron.builds.my_model_curr_my_synapse_type import (
MyModelCurrMySynapseType)

# Set the run time of the execution
Expand Down
2 changes: 1 addition & 1 deletion python_models8/__init__.py → python_models/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import os
from spynnaker.pyNN.data import SpynnakerDataView
from python_models8 import model_binaries
from python_models import model_binaries

# This adds the model binaries path to the paths searched by sPyNNaker
SpynnakerDataView.register_binary_search_path(
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from spynnaker.pyNN.models.neuron import AbstractPyNNNeuronModel
from spynnaker.pyNN.models.defaults import default_parameters
from python_models8.neuron.implementations.my_full_neuron_impl import (
from python_models.neuron.implementations.my_full_neuron_impl import (
MyFullNeuronImpl)


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from spynnaker.pyNN.models.neuron import AbstractPyNNNeuronModelStandard
from spynnaker.pyNN.models.neuron.implementations import ModelParameter
from spynnaker.pyNN.models.neuron.synapse_types import SynapseTypeExponential
from python_models8.neuron.input_types.my_input_type_semd import (
from python_models.neuron.input_types.my_input_type_semd import (
MyInputTypeCurrentSEMD)
from spynnaker.pyNN.models.neuron.threshold_types import ThresholdTypeStatic

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from spynnaker.pyNN.models.neuron.threshold_types import ThresholdTypeStatic

# Additional components
from python_models8.neuron.neuron_models.my_neuron_model import MyNeuronModel
from python_models.neuron.neuron_models.my_neuron_model import MyNeuronModel
from spynnaker.pyNN.models.defaults import default_initial_values


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
from spynnaker.pyNN.models.neuron.synapse_types import SynapseTypeExponential
from spynnaker.pyNN.models.neuron.threshold_types import ThresholdTypeStatic
from spynnaker.pyNN.models.defaults import default_initial_values
from python_models8.neuron.additional_inputs.my_additional_input import (
from python_models.neuron.additional_inputs.my_additional_input import (
MyAdditionalInput)
from python_models8.neuron.neuron_models.my_neuron_model import MyNeuronModel
from python_models.neuron.neuron_models.my_neuron_model import MyNeuronModel


class MyModelCurrExpMyAdditionalInput(AbstractPyNNNeuronModelStandard):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
from spynnaker.pyNN.models.defaults import default_initial_values

# Additional components
from python_models8.neuron.input_types.my_input_type \
from python_models.neuron.input_types.my_input_type \
import MyInputType
from python_models8.neuron.neuron_models.my_neuron_model \
from python_models.neuron.neuron_models.my_neuron_model \
import MyNeuronModel


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
from spynnaker.pyNN.models.neuron.input_types import InputTypeCurrent
from spynnaker.pyNN.models.neuron.synapse_types import SynapseTypeExponential
from spynnaker.pyNN.models.defaults import default_initial_values
from python_models8.neuron.neuron_models.my_neuron_model import MyNeuronModel
from python_models8.neuron.threshold_types.my_threshold_type import (
from python_models.neuron.neuron_models.my_neuron_model import MyNeuronModel
from python_models.neuron.threshold_types.my_threshold_type import (
MyThresholdType)


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
from spynnaker.pyNN.models.defaults import default_initial_values

# Additional components
from python_models8.neuron.neuron_models.my_neuron_model import MyNeuronModel
from python_models8.neuron.synapse_types.my_synapse_type import MySynapseType
from python_models.neuron.neuron_models.my_neuron_model import MyNeuronModel
from python_models.neuron.synapse_types.my_synapse_type import MySynapseType


class MyModelCurrMySynapseType(AbstractPyNNNeuronModelStandard):
Expand Down
File renamed without changes.
6 changes: 3 additions & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

[metadata]
name = sPyNNakerNewModelTemplate
version = attr: python_models8._version.__version__
version = attr: python_models._version.__version__
description = SpiNNaker Template for New Models
long_description = file: README.md
long_description_content_type = text/markdown
Expand Down Expand Up @@ -48,8 +48,8 @@ install_requires =

[options.packages.find]
include =
python_models8
python_models8.*
python_models
python_models.*

[options.package_data]
* =
Expand Down
4 changes: 2 additions & 2 deletions unittests/test_import_all.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ class ImportAllModule(unittest.TestCase):

def test_import_all(self):
if os.environ.get('CONTINUOUS_INTEGRATION', 'false').lower() == 'true':
package_loader.load_module("python_models8", remove_pyc_files=False)
package_loader.load_module("python_models", remove_pyc_files=False)
else:
# Do a full stack cleanup
package_loader.load_module(
"spinn_utilities", remove_pyc_files=True)
package_loader.load_module("python_models8", remove_pyc_files=True)
package_loader.load_module("python_models", remove_pyc_files=True)
Loading