From 4194c29792aa4e4ee8766605d5a3d27bf0c0356c Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 16 Feb 2023 09:36:20 +0000 Subject: [PATCH] keep only one copyright date --- __init__.py | 2 +- binaries/__init__.py | 2 +- c_code/Makefile | 2 +- c_code/activation.c | 2 +- c_code/activation.h | 94 ++++++------ c_code/activation_lut.h | 2 +- c_code/comms_i.c | 2 +- c_code/comms_i.h | 2 +- c_code/comms_s.c | 2 +- c_code/comms_s.h | 2 +- c_code/comms_t.c | 2 +- c_code/comms_t.h | 2 +- c_code/comms_w.c | 2 +- c_code/comms_w.h | 2 +- c_code/init_i.c | 2 +- c_code/init_i.h | 2 +- c_code/init_s.c | 2 +- c_code/init_s.h | 2 +- c_code/init_t.c | 2 +- c_code/init_t.h | 2 +- c_code/init_w.c | 2 +- c_code/init_w.h | 2 +- c_code/input.c | 2 +- c_code/input.mk | 2 +- c_code/mlp_externs.h | 2 +- c_code/mlp_macros.h | 2 +- c_code/mlp_params.h | 2 +- c_code/mlp_types.h | 2 +- c_code/process_i.c | 2 +- c_code/process_i.h | 2 +- c_code/process_s.c | 2 +- c_code/process_s.h | 2 +- c_code/process_t.c | 2 +- c_code/process_t.h | 2 +- c_code/process_w.c | 2 +- c_code/process_w.h | 2 +- c_code/sum.c | 2 +- c_code/sum.mk | 2 +- c_code/threshold.c | 2 +- c_code/threshold.mk | 2 +- c_code/weight.c | 2 +- c_code/weight.mk | 2 +- examples/rand10x40/rand10x40.py | 2 +- examples/rogers-basic/rogers-basic.py | 212 +++++++++++++------------- examples/visSemPhon/visSemPhon.py | 2 +- integration_tests/__init__.py | 2 +- integration_tests/script_builder.py | 2 +- integration_tests/test_scripts.py | 2 +- requirements-test.txt | 2 +- setup.py | 2 +- spinn_pdp2/__init__.py | 2 +- spinn_pdp2/_version.py | 2 +- spinn_pdp2/input_vertex.py | 2 +- spinn_pdp2/mlp_examples.py | 2 +- spinn_pdp2/mlp_group.py | 2 +- spinn_pdp2/mlp_link.py | 2 +- spinn_pdp2/mlp_network.py | 2 +- spinn_pdp2/mlp_types.py | 2 +- spinn_pdp2/sum_vertex.py | 2 +- spinn_pdp2/threshold_vertex.py | 2 +- spinn_pdp2/weight_vertex.py | 2 +- unittests/test_import_all.py | 2 +- 62 files changed, 213 insertions(+), 213 deletions(-) diff --git a/__init__.py b/__init__.py index bd9fc11..f77a80f 100644 --- a/__init__.py +++ b/__init__.py @@ -1,4 +1,4 @@ -# Copyright (c) 2015-2021 The University of Manchester +# Copyright (c) 2015 The University of Manchester # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/binaries/__init__.py b/binaries/__init__.py index bd9fc11..f77a80f 100644 --- a/binaries/__init__.py +++ b/binaries/__init__.py @@ -1,4 +1,4 @@ -# Copyright (c) 2015-2021 The University of Manchester +# Copyright (c) 2015 The University of Manchester # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/c_code/Makefile b/c_code/Makefile index f875e6e..af4a943 100644 --- a/c_code/Makefile +++ b/c_code/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2015-2021 The University of Manchester +# Copyright (c) 2015 The University of Manchester # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/c_code/activation.c b/c_code/activation.c index 6d9fa79..659ceb1 100644 --- a/c_code/activation.c +++ b/c_code/activation.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2021 The University of Manchester + * Copyright (c) 2015 The University of Manchester * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/c_code/activation.h b/c_code/activation.h index bc430d1..0af09e1 100644 --- a/c_code/activation.h +++ b/c_code/activation.h @@ -1,47 +1,47 @@ -/* - * Copyright (c) 2015-2021 The University of Manchester - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef __ACTIVATION_H__ -#define __ACTIVATION_H__ - -#include - -activation_t sigmoid (net_t input); -net_t inv_sigmoid (activation_t input); - -#define __SQRT_HALF UINT32_C(3037000500) - -extern uint64_t recip_normalized_root (uint32_t x); -extern uint64_t __x_u64_ulr (uint64_t x, uint32_t y); - -static inline uint64_t newton_xlr(uint32_t x, uint64_t r) -{ - register uint64_t t = __x_u64_ulr(r, x); - - t = ((uint64_t)(x) << 32) - (t >> 1); - - return t; -} - -static inline int odd(int x) -{ - return (x & 1) == 1; -}; - -extern wchange_t sqrt_custom (lds_t x); - -#endif +/* + * Copyright (c) 2015 The University of Manchester + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef __ACTIVATION_H__ +#define __ACTIVATION_H__ + +#include + +activation_t sigmoid (net_t input); +net_t inv_sigmoid (activation_t input); + +#define __SQRT_HALF UINT32_C(3037000500) + +extern uint64_t recip_normalized_root (uint32_t x); +extern uint64_t __x_u64_ulr (uint64_t x, uint32_t y); + +static inline uint64_t newton_xlr(uint32_t x, uint64_t r) +{ + register uint64_t t = __x_u64_ulr(r, x); + + t = ((uint64_t)(x) << 32) - (t >> 1); + + return t; +} + +static inline int odd(int x) +{ + return (x & 1) == 1; +}; + +extern wchange_t sqrt_custom (lds_t x); + +#endif diff --git a/c_code/activation_lut.h b/c_code/activation_lut.h index 9bc6cda..ea395e0 100644 --- a/c_code/activation_lut.h +++ b/c_code/activation_lut.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2021 The University of Manchester + * Copyright (c) 2015 The University of Manchester * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/c_code/comms_i.c b/c_code/comms_i.c index fc36ea5..b2f23fd 100644 --- a/c_code/comms_i.c +++ b/c_code/comms_i.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2021 The University of Manchester + * Copyright (c) 2015 The University of Manchester * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/c_code/comms_i.h b/c_code/comms_i.h index bc1dadd..cbbcd0c 100644 --- a/c_code/comms_i.h +++ b/c_code/comms_i.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2021 The University of Manchester + * Copyright (c) 2015 The University of Manchester * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/c_code/comms_s.c b/c_code/comms_s.c index d1189ec..068071d 100644 --- a/c_code/comms_s.c +++ b/c_code/comms_s.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2021 The University of Manchester + * Copyright (c) 2015 The University of Manchester * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/c_code/comms_s.h b/c_code/comms_s.h index e19b0c1..36f1bc4 100644 --- a/c_code/comms_s.h +++ b/c_code/comms_s.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2021 The University of Manchester + * Copyright (c) 2015 The University of Manchester * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/c_code/comms_t.c b/c_code/comms_t.c index 33303bf..ffdfa9d 100644 --- a/c_code/comms_t.c +++ b/c_code/comms_t.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2021 The University of Manchester + * Copyright (c) 2015 The University of Manchester * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/c_code/comms_t.h b/c_code/comms_t.h index 2d47b3e..26a7c89 100644 --- a/c_code/comms_t.h +++ b/c_code/comms_t.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2021 The University of Manchester + * Copyright (c) 2015 The University of Manchester * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/c_code/comms_w.c b/c_code/comms_w.c index 50114ca..4a7cb8d 100644 --- a/c_code/comms_w.c +++ b/c_code/comms_w.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2021 The University of Manchester + * Copyright (c) 2015 The University of Manchester * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/c_code/comms_w.h b/c_code/comms_w.h index 3b9953c..60b014c 100644 --- a/c_code/comms_w.h +++ b/c_code/comms_w.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2021 The University of Manchester + * Copyright (c) 2015 The University of Manchester * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/c_code/init_i.c b/c_code/init_i.c index e1e075b..a22c500 100644 --- a/c_code/init_i.c +++ b/c_code/init_i.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2021 The University of Manchester + * Copyright (c) 2015 The University of Manchester * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/c_code/init_i.h b/c_code/init_i.h index 681fb55..3fab11d 100644 --- a/c_code/init_i.h +++ b/c_code/init_i.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2021 The University of Manchester + * Copyright (c) 2015 The University of Manchester * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/c_code/init_s.c b/c_code/init_s.c index 7b15a19..592ee9f 100644 --- a/c_code/init_s.c +++ b/c_code/init_s.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2021 The University of Manchester + * Copyright (c) 2015 The University of Manchester * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/c_code/init_s.h b/c_code/init_s.h index 8eb430e..bcc9451 100644 --- a/c_code/init_s.h +++ b/c_code/init_s.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2021 The University of Manchester + * Copyright (c) 2015 The University of Manchester * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/c_code/init_t.c b/c_code/init_t.c index 4d5410f..ae9a69d 100644 --- a/c_code/init_t.c +++ b/c_code/init_t.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2021 The University of Manchester + * Copyright (c) 2015 The University of Manchester * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/c_code/init_t.h b/c_code/init_t.h index ab2f219..7ef9f89 100644 --- a/c_code/init_t.h +++ b/c_code/init_t.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2021 The University of Manchester + * Copyright (c) 2015 The University of Manchester * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/c_code/init_w.c b/c_code/init_w.c index c7ede49..1e23555 100644 --- a/c_code/init_w.c +++ b/c_code/init_w.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2021 The University of Manchester + * Copyright (c) 2015 The University of Manchester * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/c_code/init_w.h b/c_code/init_w.h index 63946ab..f3d2522 100644 --- a/c_code/init_w.h +++ b/c_code/init_w.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2021 The University of Manchester + * Copyright (c) 2015 The University of Manchester * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/c_code/input.c b/c_code/input.c index 92e0efc..b59046d 100644 --- a/c_code/input.c +++ b/c_code/input.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2021 The University of Manchester + * Copyright (c) 2015 The University of Manchester * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/c_code/input.mk b/c_code/input.mk index ad670fd..daf3f41 100644 --- a/c_code/input.mk +++ b/c_code/input.mk @@ -1,4 +1,4 @@ -# Copyright (c) 2015-2021 The University of Manchester +# Copyright (c) 2015 The University of Manchester # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/c_code/mlp_externs.h b/c_code/mlp_externs.h index 61174f4..4488fe8 100644 --- a/c_code/mlp_externs.h +++ b/c_code/mlp_externs.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2021 The University of Manchester + * Copyright (c) 2015 The University of Manchester * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/c_code/mlp_macros.h b/c_code/mlp_macros.h index d42bb6a..a674404 100644 --- a/c_code/mlp_macros.h +++ b/c_code/mlp_macros.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2021 The University of Manchester + * Copyright (c) 2015 The University of Manchester * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/c_code/mlp_params.h b/c_code/mlp_params.h index 9213f26..5ce4fde 100644 --- a/c_code/mlp_params.h +++ b/c_code/mlp_params.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2021 The University of Manchester + * Copyright (c) 2015 The University of Manchester * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/c_code/mlp_types.h b/c_code/mlp_types.h index 415e78c..6a39960 100644 --- a/c_code/mlp_types.h +++ b/c_code/mlp_types.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2021 The University of Manchester + * Copyright (c) 2015 The University of Manchester * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/c_code/process_i.c b/c_code/process_i.c index 2cbfa69..ef40799 100644 --- a/c_code/process_i.c +++ b/c_code/process_i.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2021 The University of Manchester + * Copyright (c) 2015 The University of Manchester * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/c_code/process_i.h b/c_code/process_i.h index a008682..397e149 100644 --- a/c_code/process_i.h +++ b/c_code/process_i.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2021 The University of Manchester + * Copyright (c) 2015 The University of Manchester * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/c_code/process_s.c b/c_code/process_s.c index 2a9944b..a2a81f8 100644 --- a/c_code/process_s.c +++ b/c_code/process_s.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2021 The University of Manchester + * Copyright (c) 2015 The University of Manchester * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/c_code/process_s.h b/c_code/process_s.h index dc067da..5f0944c 100644 --- a/c_code/process_s.h +++ b/c_code/process_s.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2021 The University of Manchester + * Copyright (c) 2015 The University of Manchester * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/c_code/process_t.c b/c_code/process_t.c index a3cdc3e..afefb53 100644 --- a/c_code/process_t.c +++ b/c_code/process_t.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2021 The University of Manchester + * Copyright (c) 2015 The University of Manchester * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/c_code/process_t.h b/c_code/process_t.h index 6cdf54b..3a9874f 100644 --- a/c_code/process_t.h +++ b/c_code/process_t.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2021 The University of Manchester + * Copyright (c) 2015 The University of Manchester * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/c_code/process_w.c b/c_code/process_w.c index ca5fc44..8b78f54 100644 --- a/c_code/process_w.c +++ b/c_code/process_w.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2021 The University of Manchester + * Copyright (c) 2015 The University of Manchester * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/c_code/process_w.h b/c_code/process_w.h index 1b4f57f..a98fe91 100644 --- a/c_code/process_w.h +++ b/c_code/process_w.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2021 The University of Manchester + * Copyright (c) 2015 The University of Manchester * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/c_code/sum.c b/c_code/sum.c index e2ef98b..9e19ebc 100644 --- a/c_code/sum.c +++ b/c_code/sum.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2021 The University of Manchester + * Copyright (c) 2015 The University of Manchester * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/c_code/sum.mk b/c_code/sum.mk index 153f0a5..c5331f7 100644 --- a/c_code/sum.mk +++ b/c_code/sum.mk @@ -1,4 +1,4 @@ -# Copyright (c) 2015-2021 The University of Manchester +# Copyright (c) 2015 The University of Manchester # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/c_code/threshold.c b/c_code/threshold.c index 25e7140..7484697 100644 --- a/c_code/threshold.c +++ b/c_code/threshold.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2021 The University of Manchester + * Copyright (c) 2015 The University of Manchester * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/c_code/threshold.mk b/c_code/threshold.mk index 6bdb22e..550b032 100644 --- a/c_code/threshold.mk +++ b/c_code/threshold.mk @@ -1,4 +1,4 @@ -# Copyright (c) 2015-2021 The University of Manchester +# Copyright (c) 2015 The University of Manchester # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/c_code/weight.c b/c_code/weight.c index 71f7788..10e6dee 100644 --- a/c_code/weight.c +++ b/c_code/weight.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2021 The University of Manchester + * Copyright (c) 2015 The University of Manchester * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/c_code/weight.mk b/c_code/weight.mk index 5bc3733..ebb0c6c 100644 --- a/c_code/weight.mk +++ b/c_code/weight.mk @@ -1,4 +1,4 @@ -# Copyright (c) 2015-2021 The University of Manchester +# Copyright (c) 2015 The University of Manchester # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/examples/rand10x40/rand10x40.py b/examples/rand10x40/rand10x40.py index b5dbaae..c09ff48 100644 --- a/examples/rand10x40/rand10x40.py +++ b/examples/rand10x40/rand10x40.py @@ -1,4 +1,4 @@ -# Copyright (c) 2015-2021 The University of Manchester +# Copyright (c) 2015 The University of Manchester # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/examples/rogers-basic/rogers-basic.py b/examples/rogers-basic/rogers-basic.py index 4600d33..af5a288 100644 --- a/examples/rogers-basic/rogers-basic.py +++ b/examples/rogers-basic/rogers-basic.py @@ -1,106 +1,106 @@ -# Copyright (c) 2015-2021 The University of Manchester -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -from spinn_pdp2.mlp_network import MLPNetwork -from spinn_pdp2.mlp_types import MLPNetworkTypes, MLPGroupTypes, MLPUpdateFuncs -from spinn_pdp2.mlp_types import MLPInputProcs - -#----------------------------------------------------------- -# rogers-basic -# -# implementation of a simplified Rogers network -# -# Rogers et al., "The structure and deterioration of semantic -# memory: A computational and neuropsychological investigation" -# Psychological Review, 111(1), 205–235, 2004. -# -#----------------------------------------------------------- - -# instantiate the MLP network -rogers = MLPNetwork (net_type = MLPNetworkTypes.CONTINUOUS, - intervals = 8, - ticks_per_interval = 10 - ) - -# instantiate network groups (layers) -Encyclo = rogers.group (units = 18, - group_type = [MLPGroupTypes.INPUT, MLPGroupTypes.OUTPUT], - label = "Encyclo" - ) -Functional = rogers.group (units = 32, - group_type = [MLPGroupTypes.INPUT, MLPGroupTypes.OUTPUT], - label = "Functional" - ) -Perceptual = rogers.group (units = 61, - group_type = [MLPGroupTypes.INPUT, MLPGroupTypes.OUTPUT], - label = "Perceptual" - ) -Visual = rogers.group (units = 64, - group_type = [MLPGroupTypes.INPUT, MLPGroupTypes.OUTPUT], - label = "Visual" - ) -Name = rogers.group (units = 48, - group_type = [MLPGroupTypes.INPUT, MLPGroupTypes.OUTPUT], - label = "Name" - ) -Semantic = rogers.group (units = 64, - label = "Semantic" - ) - -# instantiate network links -rogers.link (Encyclo, Semantic) -rogers.link (Semantic, Encyclo) -rogers.link (Functional, Semantic) -rogers.link (Semantic, Functional) -rogers.link (Perceptual, Semantic) -rogers.link (Semantic, Perceptual) -rogers.link (Visual, Semantic) -rogers.link (Semantic, Visual) -rogers.link (Name, Semantic) -rogers.link (Semantic, Name) -rogers.link (Semantic, Semantic) - -# instantiate network example set -set1 = rogers.example_set (label = "set1") - -# read Lens-style examples file -set1.read_Lens_examples_file ("rogers-basic.ex") - -# set network parameters -rogers.set (num_presentations = 10, - learning_rate = 0.005, - weight_decay = 0.0002, - momentum = 0.0, - train_group_crit = 0.2 - ) - -# read initial weights from Lens-generated file -rogers.read_Lens_weights_file ( - "rogers-basic_weights.txt") - -# train the network for the default number of updates -rogers.train (update_function = MLPUpdateFuncs.UPD_DOUGSMOMENTUM) - -# generate Lens-style output file -rogers.write_Lens_output_file ("rogers-basic_train.out") - -# test the network for the complete example set -rogers.test () - -# generate Lens-style output file -rogers.write_Lens_output_file ("rogers-basic_train_test_1e.out") - -# close the application -rogers.end () +# Copyright (c) 2015 The University of Manchester +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +from spinn_pdp2.mlp_network import MLPNetwork +from spinn_pdp2.mlp_types import MLPNetworkTypes, MLPGroupTypes, MLPUpdateFuncs +from spinn_pdp2.mlp_types import MLPInputProcs + +#----------------------------------------------------------- +# rogers-basic +# +# implementation of a simplified Rogers network +# +# Rogers et al., "The structure and deterioration of semantic +# memory: A computational and neuropsychological investigation" +# Psychological Review, 111(1), 205–235, 2004. +# +#----------------------------------------------------------- + +# instantiate the MLP network +rogers = MLPNetwork (net_type = MLPNetworkTypes.CONTINUOUS, + intervals = 8, + ticks_per_interval = 10 + ) + +# instantiate network groups (layers) +Encyclo = rogers.group (units = 18, + group_type = [MLPGroupTypes.INPUT, MLPGroupTypes.OUTPUT], + label = "Encyclo" + ) +Functional = rogers.group (units = 32, + group_type = [MLPGroupTypes.INPUT, MLPGroupTypes.OUTPUT], + label = "Functional" + ) +Perceptual = rogers.group (units = 61, + group_type = [MLPGroupTypes.INPUT, MLPGroupTypes.OUTPUT], + label = "Perceptual" + ) +Visual = rogers.group (units = 64, + group_type = [MLPGroupTypes.INPUT, MLPGroupTypes.OUTPUT], + label = "Visual" + ) +Name = rogers.group (units = 48, + group_type = [MLPGroupTypes.INPUT, MLPGroupTypes.OUTPUT], + label = "Name" + ) +Semantic = rogers.group (units = 64, + label = "Semantic" + ) + +# instantiate network links +rogers.link (Encyclo, Semantic) +rogers.link (Semantic, Encyclo) +rogers.link (Functional, Semantic) +rogers.link (Semantic, Functional) +rogers.link (Perceptual, Semantic) +rogers.link (Semantic, Perceptual) +rogers.link (Visual, Semantic) +rogers.link (Semantic, Visual) +rogers.link (Name, Semantic) +rogers.link (Semantic, Name) +rogers.link (Semantic, Semantic) + +# instantiate network example set +set1 = rogers.example_set (label = "set1") + +# read Lens-style examples file +set1.read_Lens_examples_file ("rogers-basic.ex") + +# set network parameters +rogers.set (num_presentations = 10, + learning_rate = 0.005, + weight_decay = 0.0002, + momentum = 0.0, + train_group_crit = 0.2 + ) + +# read initial weights from Lens-generated file +rogers.read_Lens_weights_file ( + "rogers-basic_weights.txt") + +# train the network for the default number of updates +rogers.train (update_function = MLPUpdateFuncs.UPD_DOUGSMOMENTUM) + +# generate Lens-style output file +rogers.write_Lens_output_file ("rogers-basic_train.out") + +# test the network for the complete example set +rogers.test () + +# generate Lens-style output file +rogers.write_Lens_output_file ("rogers-basic_train_test_1e.out") + +# close the application +rogers.end () diff --git a/examples/visSemPhon/visSemPhon.py b/examples/visSemPhon/visSemPhon.py index c723b3d..4cd09e8 100644 --- a/examples/visSemPhon/visSemPhon.py +++ b/examples/visSemPhon/visSemPhon.py @@ -1,4 +1,4 @@ -# Copyright (c) 2015-2021 The University of Manchester +# Copyright (c) 2015 The University of Manchester # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/integration_tests/__init__.py b/integration_tests/__init__.py index dd7f845..680f6b1 100644 --- a/integration_tests/__init__.py +++ b/integration_tests/__init__.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2021 The University of Manchester +# Copyright (c) 2017 The University of Manchester # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/integration_tests/script_builder.py b/integration_tests/script_builder.py index 7b62f2b..5204092 100644 --- a/integration_tests/script_builder.py +++ b/integration_tests/script_builder.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2019 The University of Manchester +# Copyright (c) 2017 The University of Manchester # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/integration_tests/test_scripts.py b/integration_tests/test_scripts.py index 0b5519f..7adacec 100644 --- a/integration_tests/test_scripts.py +++ b/integration_tests/test_scripts.py @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2021 The University of Manchester +# Copyright (c) 2019 The University of Manchester # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/requirements-test.txt b/requirements-test.txt index f6abe44..38ada75 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2021 The University of Manchester +# Copyright (c) 2017 The University of Manchester # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/setup.py b/setup.py index a7eda01..294dab3 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2021 The University of Manchester +# Copyright (c) 2017 The University of Manchester # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/spinn_pdp2/__init__.py b/spinn_pdp2/__init__.py index bd9fc11..f77a80f 100644 --- a/spinn_pdp2/__init__.py +++ b/spinn_pdp2/__init__.py @@ -1,4 +1,4 @@ -# Copyright (c) 2015-2021 The University of Manchester +# Copyright (c) 2015 The University of Manchester # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/spinn_pdp2/_version.py b/spinn_pdp2/_version.py index 41e78f1..703cc02 100644 --- a/spinn_pdp2/_version.py +++ b/spinn_pdp2/_version.py @@ -1,4 +1,4 @@ -# Copyright (c) 2015-2021 The University of Manchester +# Copyright (c) 2015 The University of Manchester # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/spinn_pdp2/input_vertex.py b/spinn_pdp2/input_vertex.py index 7cd853b..b709886 100644 --- a/spinn_pdp2/input_vertex.py +++ b/spinn_pdp2/input_vertex.py @@ -1,4 +1,4 @@ -# Copyright (c) 2015-2022 The University of Manchester +# Copyright (c) 2015 The University of Manchester # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/spinn_pdp2/mlp_examples.py b/spinn_pdp2/mlp_examples.py index 7db5a93..be8a45f 100644 --- a/spinn_pdp2/mlp_examples.py +++ b/spinn_pdp2/mlp_examples.py @@ -1,4 +1,4 @@ -# Copyright (c) 2015-2021 The University of Manchester +# Copyright (c) 2015 The University of Manchester # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/spinn_pdp2/mlp_group.py b/spinn_pdp2/mlp_group.py index 80bbe21..e3072fe 100644 --- a/spinn_pdp2/mlp_group.py +++ b/spinn_pdp2/mlp_group.py @@ -1,4 +1,4 @@ -# Copyright (c) 2015-2021 The University of Manchester +# Copyright (c) 2015 The University of Manchester # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/spinn_pdp2/mlp_link.py b/spinn_pdp2/mlp_link.py index bda97bf..df66eed 100644 --- a/spinn_pdp2/mlp_link.py +++ b/spinn_pdp2/mlp_link.py @@ -1,4 +1,4 @@ -# Copyright (c) 2015-2021 The University of Manchester +# Copyright (c) 2015 The University of Manchester # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/spinn_pdp2/mlp_network.py b/spinn_pdp2/mlp_network.py index 2635fdd..bbdbf27 100644 --- a/spinn_pdp2/mlp_network.py +++ b/spinn_pdp2/mlp_network.py @@ -1,4 +1,4 @@ -# Copyright (c) 2015-2021 The University of Manchester +# Copyright (c) 2015 The University of Manchester # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/spinn_pdp2/mlp_types.py b/spinn_pdp2/mlp_types.py index 98c4aae..22ad33e 100644 --- a/spinn_pdp2/mlp_types.py +++ b/spinn_pdp2/mlp_types.py @@ -1,4 +1,4 @@ -# Copyright (c) 2015-2021 The University of Manchester +# Copyright (c) 2015 The University of Manchester # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/spinn_pdp2/sum_vertex.py b/spinn_pdp2/sum_vertex.py index 9d8fad8..e1b78d2 100644 --- a/spinn_pdp2/sum_vertex.py +++ b/spinn_pdp2/sum_vertex.py @@ -1,4 +1,4 @@ -# Copyright (c) 2015-2022 The University of Manchester +# Copyright (c) 2015 The University of Manchester # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/spinn_pdp2/threshold_vertex.py b/spinn_pdp2/threshold_vertex.py index 27c5ab0..737abc0 100644 --- a/spinn_pdp2/threshold_vertex.py +++ b/spinn_pdp2/threshold_vertex.py @@ -1,4 +1,4 @@ -# Copyright (c) 2015-2022 The University of Manchester +# Copyright (c) 2015 The University of Manchester # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/spinn_pdp2/weight_vertex.py b/spinn_pdp2/weight_vertex.py index 358ce7b..f08e02a 100644 --- a/spinn_pdp2/weight_vertex.py +++ b/spinn_pdp2/weight_vertex.py @@ -1,4 +1,4 @@ -# Copyright (c) 2015-2022 The University of Manchester +# Copyright (c) 2015 The University of Manchester # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/unittests/test_import_all.py b/unittests/test_import_all.py index 318a77b..d00b42b 100644 --- a/unittests/test_import_all.py +++ b/unittests/test_import_all.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2019 The University of Manchester +# Copyright (c) 2017 The University of Manchester # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by