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

VOR related models #37

Open
wants to merge 79 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
151a84b
Add bare bones of icub_vor environment
andrewgait Oct 14, 2020
d439407
Merge remote-tracking branch 'origin/master' into icub_vor
andrewgait Oct 23, 2020
526026c
First working (simplified) ICubVorEnv vertex and example test
andrewgait Oct 28, 2020
49ef436
Encode rates based on error and send to connected SpikeSourcePoisson
andrewgait Oct 30, 2020
90ef1ac
Merge remote-tracking branch 'origin/master' into icub_vor
andrewgait Nov 16, 2020
db09210
Update icub_vor to match other vertices, switch to [-1,1] for errors
andrewgait Nov 16, 2020
010b44b
vor venv normalised error looks better
pabogdan Dec 1, 2020
9519b2e
Merge remote-tracking branch 'origin/icub_vor' into icub_vor
pabogdan Dec 1, 2020
781c228
rolling back changes. head and eye norm better done in python.
pabogdan Dec 1, 2020
c0e0a01
Merge remote-tracking branch 'origin/master' into icub_vor
andrewgait Dec 2, 2020
d6ae370
Update to remove compiler warnings for old-style function definitions
andrewgait Dec 2, 2020
16be544
added a comment to clarify what a check was doing
pabogdan Dec 2, 2020
11c15e6
Merge branch 'icub_vor' of github.com:SpiNNakerManchester/SpiNNGym in…
pabogdan Dec 2, 2020
5c1a947
added eye twist movement
pabogdan Dec 3, 2020
64c5e61
eye position works well, eye velocity is broken completely
pabogdan Dec 4, 2020
40694e1
eye velocity now matches as well. I wonder if the error can be brough…
pabogdan Dec 4, 2020
a0b58a2
added some comments and a gain factor
pabogdan Dec 7, 2020
8f764fd
retrieving eye positions, not head pos
pabogdan Dec 7, 2020
71a0f13
now writing gain and pos_to_vel from python
pabogdan Dec 8, 2020
c39a69d
head position now capped between -1 and 1
pabogdan Dec 16, 2020
89c2c5a
not using head arrays anymore and corrected reading order for eye pos…
pabogdan Dec 18, 2020
8b59f6c
can now toggle between a WTA or a difference based decision
pabogdan Dec 18, 2020
8bbf482
added ability to set min and max error rates
pabogdan Dec 18, 2020
112543a
fixing len checks to eye positions rather than the heads
pabogdan Dec 18, 2020
fade7f1
error computation biasing position
pabogdan Jan 18, 2021
76d758a
current parameters work somewhat well for 5x slowdown (commit from vo…
pabogdan Jan 29, 2021
b7a8bb5
velocity is now the parameter that the network can influence
pabogdan Feb 8, 2021
f62b7e3
Merge remote-tracking branch 'origin/master' into icub_vor_update
andrewgait Nov 15, 2021
1bcafde
Update ICubVorEnv to match other vertices
andrewgait Nov 19, 2021
44c5ae0
C code line length, unused params; update requirements
andrewgait Nov 19, 2021
e507cba
flake8
andrewgait Nov 19, 2021
115e71b
Add copyrights
andrewgait Nov 19, 2021
e80b645
Merge remote-tracking branch 'origin/master' into icub_vor_update
andrewgait Jan 20, 2022
3ebb978
Add more icub_vor scripts (moved from examples elsewhere)
andrewgait Mar 2, 2022
47a5ac7
Merge branch 'master' into icub_vor_update
andrewgait Mar 28, 2022
13aa14d
Merge branch 'master' into icub_vor_update
andrewgait Apr 14, 2022
a58977c
Merge remote-tracking branch 'origin/master' into icub_vor_update
andrewgait Jun 17, 2022
9d8b612
Change spynnaker8 to pynn.spinnaker
andrewgait Jun 17, 2022
44f567b
Merge remote-tracking branch 'origin/master' into icub_vor_update
andrewgait Jul 11, 2022
4031773
Update ICubVorEnv to use spinn_gym vertex classes
andrewgait Jul 11, 2022
51231dc
Put this import back in
andrewgait Jul 11, 2022
2600b6b
Merge remote-tracking branch 'origin/master' into icub_vor_update
andrewgait Jul 22, 2022
04ca3ae
match function arguments
andrewgait Jul 22, 2022
57e479b
Update ICubVorEnv vertices to match downstream changes
andrewgait Jul 22, 2022
0ee23e9
do flake8 on integration tests and unittests too
andrewgait Jul 25, 2022
76e1da2
Rename
andrewgait Jul 26, 2022
f608079
Get the number of keys needed for the ICub vertex correct
andrewgait Jul 29, 2022
335ee95
flake8 missed import
andrewgait Jul 29, 2022
f2f0eb3
Better call for super() method
andrewgait Jul 29, 2022
f663341
Merge branch 'master' into icub_vor_update
andrewgait Aug 4, 2022
f092003
Match downstream changes
andrewgait Aug 4, 2022
727385c
Merge branch 'master' into icub_vor_update
andrewgait Sep 14, 2022
3f345e4
Merge remote-tracking branch 'origin/master' into icub_vor_update
andrewgait Nov 16, 2022
f56ff93
Update ICubVorEnv to match changes elsewhere
andrewgait Nov 17, 2022
1ae09d3
Merge branch 'master' into icub_vor_update
andrewgait Jan 12, 2023
06dee5a
Removing unused parameter found by pylint
andrewgait Jan 12, 2023
4d663ae
Merge remote-tracking branch 'origin/master' into icub_vor_update
andrewgait Jan 25, 2023
2b55efc
Merge branch 'master' into icub_vor_update
andrewgait Feb 20, 2023
d1a8f17
Merge branch 'master' into icub_vor_update
andrewgait Mar 1, 2023
d20b233
Merge branch 'master' into icub_vor_update
andrewgait Apr 21, 2023
41e294d
Merge branch 'master' into icub_vor_update
andrewgait May 15, 2023
238771d
Merge remote-tracking branch 'origin/master' into icub_vor_update
andrewgait Jun 23, 2023
56d98f4
DataType has moved
andrewgait Jun 26, 2023
75c9e04
Move icub utilities from examples
andrewgait Jun 30, 2023
c7a1e60
Move icub utilities back to examples
andrewgait Jun 30, 2023
c1e6386
Fix imports and add init file
andrewgait Jun 30, 2023
b42f310
Do imports more sensibly and update to single copyright year
andrewgait Jul 3, 2023
49c7ad8
Apparently pylint was complaining about this
andrewgait Jul 3, 2023
071b958
Merge remote-tracking branch 'origin/master' into icub_vor_update
andrewgait Jul 20, 2023
f565eb4
Missing init py file
andrewgait Jul 27, 2023
a2de770
Try this to satisfy pylint instead
andrewgait Jul 27, 2023
da95f68
Try this setting instead
andrewgait Jul 27, 2023
e671c7b
Try this instead
andrewgait Jul 27, 2023
1fea7a1
This should now work
andrewgait Jul 27, 2023
463af62
Update script_builder to skip icub_utilities
andrewgait Jul 28, 2023
2a11cac
Try a different location for icub_utilities
andrewgait Jul 31, 2023
08ed4e4
More tidying up
andrewgait Jul 31, 2023
4478474
Merge branch 'master' into icub_vor_update
andrewgait Sep 18, 2023
f1ef156
Merge branch 'master' into icub_vor_update
Christian-B Jan 5, 2024
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 @@ -69,7 +69,7 @@ jobs:
coveralls-token: ${{ secrets.COVERALLS_REPO_TOKEN }}

- name: Lint with flake8
run: flake8 examples spinn_gym
run: flake8 examples spinn_gym integration_tests unittests
- name: Lint with pylint
uses: ./support/actions/pylint
with:
Expand Down
1 change: 1 addition & 0 deletions .ratexcludes
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
**/*.colour_map
**/*.col
**/*.csv
**/SpiNNUtils/**
**/SpiNNMachine/**
**/SpiNNMan/**
Expand Down
2 changes: 1 addition & 1 deletion c_code/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.

DIRS = breakout inverted_pendulum double_inverted_pendulum multi_arm_bandit logic store_recall
DIRS = breakout inverted_pendulum double_inverted_pendulum multi_arm_bandit logic store_recall icub_vor_env
#DIRS = breakout double_inverted_pendulum multi_arm_bandit logic store_recall

all: $(DIRS)
Expand Down
32 changes: 32 additions & 0 deletions c_code/icub_vor_env/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Copyright (c) 2019-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 <http://www.gnu.org/licenses/>.

ifndef NEURAL_MODELLING_DIRS
$(error NEURAL_MODELLING_DIRS is not set. Please define
NEURAL_MODELLING_DIRS (possibly by running "source setup" in the
neural_modelling folder within the sPyNNaker source folder))
endif

APP := icub_vor_env
BUILD_DIR = $(abspath $(CURRENT_DIR)/../../build/$(APP))/
SOURCES = icub_vor_env.c
MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
CURRENT_DIR := $(dir $(MAKEFILE_PATH))
EXTRA_SRC_DIR := $(abspath $(CURRENT_DIR))/src
SOURCE_DIRS += $(EXTRA_SRC_DIR)
APP_OUTPUT_DIR := $(abspath $(CURRENT_DIR)../../spinn_gym/model_binaries/)/
CFLAGS += -I$(NEURAL_MODELLING_DIRS)/src

include $(SPINN_DIRS)/make/local.mk
Loading
Loading