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

Network schema io #44

Merged
merged 64 commits into from
Jun 13, 2017
Merged

Network schema io #44

merged 64 commits into from
Jun 13, 2017

Commits on Apr 14, 2017

  1. Merge pull request #37 from markplagge/Develop 

    update network-schema-io with latest development branch,
    Mark Plagge committed Apr 14, 2017
    Configuration menu
    Copy the full SHA
    ec2c0b9 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2017

  1. Adding json spike to CSV converter and NeMo run script 

    Reading in the TN Spike file with new function.
Added NeMo_TN.py file to build system - is a CLI application that will load TN JSON files and run NeMo with them.
    Mark Plagge committed Apr 17, 2017
    Configuration menu
    Copy the full SHA
    8a201b5 View commit details
    Browse the repository at this point in the history

  2. Quick spike save function 

    saves the paresed spikes as csv
    Mark Plagge committed Apr 17, 2017
    Configuration menu
    Copy the full SHA
    c3ba33e View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2017

  1. Some pythonic changes to make the JSON reader more efficient. 

    Was running into issues with memory limits and processing time, now uses threading, and basic JIT
Includes some testing and sobel TN files for testing
    Mark Plagge committed Apr 18, 2017
    Configuration menu
    Copy the full SHA
    9581297 View commit details
    Browse the repository at this point in the history

  2. added progressbar

    Mark Plagge committed Apr 18, 2017
    Configuration menu
    Copy the full SHA
    98cfeb1 View commit details
    Browse the repository at this point in the history

  3. fixed mp error

    Mark Plagge committed Apr 18, 2017
    Configuration menu
    Copy the full SHA
    d7f2721 View commit details
    Browse the repository at this point in the history

  4. changed to future rather than MP

    Mark Plagge committed Apr 18, 2017
    Configuration menu
    Copy the full SHA
    d411bf8 View commit details
    Browse the repository at this point in the history

  5. Read TN JSON spikes and faster mp

    Mark Plagge committed Apr 18, 2017
    Configuration menu
    Copy the full SHA
    2655c1a View commit details
    Browse the repository at this point in the history

  6. Forgot result call.

    Mark Plagge committed Apr 18, 2017
    Configuration menu
    Copy the full SHA
    ceadaca View commit details
    Browse the repository at this point in the history

  7. future calls to future calls are bad when using JIT

    Mark Plagge committed Apr 18, 2017
    Configuration menu
    Copy the full SHA
    a9e7180 View commit details
    Browse the repository at this point in the history

  8. Fixed issues. to_csv is still slow.

    Mark Plagge committed Apr 18, 2017
    Configuration menu
    Copy the full SHA
    c19eb1b View commit details
    Browse the repository at this point in the history

  9. clean cruft

    Mark Plagge committed Apr 18, 2017
    Configuration menu
    Copy the full SHA
    ba7518e View commit details
    Browse the repository at this point in the history

  10. Added JIT back

    Mark Plagge committed Apr 18, 2017
    Configuration menu
    Copy the full SHA
    fb6c014 View commit details
    Browse the repository at this point in the history

  11. Quick changes before adding tqdm and fixing neuron params.

    Mark Plagge committed Apr 18, 2017
    Configuration menu
    Copy the full SHA
    b392865 View commit details
    Browse the repository at this point in the history

  12. qc change

    Mark Plagge committed Apr 18, 2017
    Configuration menu
    Copy the full SHA
    dd2f2a0 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2017

  1. Python JSON->CSV working with spikes 

    Still need to write package for TN input and run.
    Mark Plagge committed Apr 19, 2017
    Configuration menu
    Copy the full SHA
    068c7c4 View commit details
    Browse the repository at this point in the history

  2. More workable - CLI non functional.

    Mark Plagge committed Apr 19, 2017
    Configuration menu
    Copy the full SHA
    2ebffe2 View commit details
    Browse the repository at this point in the history

  3. Minor typo in testIO.h

    Mark Plagge committed Apr 19, 2017
    Configuration menu
    Copy the full SHA
    3de1176 View commit details
    Browse the repository at this point in the history

  4. more typos

    Mark Plagge committed Apr 19, 2017
    Configuration menu
    Copy the full SHA
    e7424d9 View commit details
    Browse the repository at this point in the history

  5. more script fixes.

    Mark Plagge committed Apr 19, 2017
    Configuration menu
    Copy the full SHA
    c7516e7 View commit details
    Browse the repository at this point in the history

  6. typo

    Mark Plagge committed Apr 19, 2017
    Configuration menu
    Copy the full SHA
    2ccf839 View commit details
    Browse the repository at this point in the history

  7. more minor changes

    Mark Plagge committed Apr 19, 2017
    Configuration menu
    Copy the full SHA
    18efd33 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2017

  1. TN scripts working, added some test csv files.

    Mark Plagge committed Apr 21, 2017
    Configuration menu
    Copy the full SHA
    42b7c03 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2017

  1. some minor tweaks to neuron reader

    Mark Plagge committed Apr 24, 2017
    Configuration menu
    Copy the full SHA
    6422715 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2017

  1. IO mostly working - need to check neuron CSV read validity 

    Fixed the IO for spikes - reading files. Currently files are hardcoded as nemo_model.csv and nemo_spikes.csv. CSV does not look like it it loading in to neurons exactly right - need to double check that.
    Mark Plagge committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    3d2f97b View commit details
    Browse the repository at this point in the history

  2. IO Mostly working 

    Fixed the IO for spikes - reading files. Currently files are hardcoded as nemo_model.csv and nemo_spikes.csv. CSV does not look like it it loading in to neurons exactly right - need to double check that.
    Mark Plagge committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    4914c8a View commit details
    Browse the repository at this point in the history

  3. Added basic neuron stat monitor for sanity check 

    Also re-wrote some of the output for nemo
    Mark Plagge committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    b1ddec6 View commit details
    Browse the repository at this point in the history

  4. Changed default network structure for easier testing.

    Mark Plagge committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    fac82c5 View commit details
    Browse the repository at this point in the history

  5. fixed malloc/free error.

    Mark Plagge committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    b5a1649 View commit details
    Browse the repository at this point in the history

  6. Minor list comm typo.

    Mark Plagge committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    f7474fa View commit details
    Browse the repository at this point in the history

  7. fixed net out code. Need to start doing sanity checks on model CSV

    Mark Plagge committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    533aeaa View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2017

  1. Fixed, but CSV input to Neuron NF

    Mark Plagge committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    6843e4b View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2017

  1. Some quick changes before major retooling

    Mark Plagge committed Apr 28, 2017
    Configuration menu
    Copy the full SHA
    895f725 View commit details
    Browse the repository at this point in the history

  2. network read is still buggy - not loading destinations properly. 

    Also added lua code, may remove later.
    Mark Plagge committed Apr 28, 2017
    Configuration menu
    Copy the full SHA
    9fca7f1 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2017

  1. IO stack update

    Mark Plagge committed May 1, 2017
    Configuration menu
    Copy the full SHA
    c601030 View commit details
    Browse the repository at this point in the history

  2. new tn format - using a more structured format will make debugging ea… 

    …sier and future enhancements easier.
    Mark Plagge committed May 1, 2017
    Configuration menu
    Copy the full SHA
    ff806ac View commit details
    Browse the repository at this point in the history

  3. New, better, file format.

    Mark Plagge committed May 1, 2017
    Configuration menu
    Copy the full SHA
    e876896 View commit details
    Browse the repository at this point in the history

  4. new nemo reader - minor bugs

    Mark Plagge committed May 1, 2017
    Configuration menu
    Copy the full SHA
    3f8884e View commit details
    Browse the repository at this point in the history

  5. nemo python with new file def working.

    Mark Plagge committed May 1, 2017
    Configuration menu
    Copy the full SHA
    47ded1f View commit details
    Browse the repository at this point in the history

Commits on May 2, 2017

  1. small bug fix on json reader

    Mark Plagge committed May 2, 2017
    Configuration menu
    Copy the full SHA
    f7b9d5e View commit details
    Browse the repository at this point in the history

  2. minor JSON parser changes.

    Mark Plagge committed May 2, 2017
    Configuration menu
    Copy the full SHA
    faeb07e View commit details
    Browse the repository at this point in the history

Commits on May 3, 2017

  1. added neuron name conversion function

    @nmcglo
    nmcglo committed May 3, 2017
    Configuration menu
    Copy the full SHA
    9de119e View commit details
    Browse the repository at this point in the history

Commits on May 4, 2017

  1. fixed getArrayFromMulti

    @nmcglo
    nmcglo committed May 4, 2017
    Configuration menu
    Copy the full SHA
    4fa868d View commit details
    Browse the repository at this point in the history

  2. fixed populateArray() position bug

    @nmcglo
    nmcglo committed May 4, 2017
    Configuration menu
    Copy the full SHA
    7d92f11 View commit details
    Browse the repository at this point in the history

  3. fixed hardcoded default num cores

    @nmcglo
    nmcglo committed May 4, 2017
    Configuration menu
    Copy the full SHA
    3606069 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #39 from markplagge/network-schema-io-neil 

    Network schema io neil
    Mark Plagge committed May 4, 2017
    Configuration menu
    Copy the full SHA
    de0ef53 View commit details
    Browse the repository at this point in the history

  5. NeMo Model CFG Reader framework written 

    Need to write Neuron init code as well as main function code and one cleanup function in read_model.c 
Also forked and added the Lua cmake project as a submodule. Submodule init/update is now required.
    Mark Plagge committed May 4, 2017
    Configuration menu
    Copy the full SHA
    b4497f1 View commit details
    Browse the repository at this point in the history

  6. New Build config with partial support for reading in config file.

    Mark Plagge committed May 4, 2017
    Configuration menu
    Copy the full SHA
    0538179 View commit details
    Browse the repository at this point in the history

  7. Builds but arrays have bugs.

    Mark Plagge committed May 4, 2017
    Configuration menu
    Copy the full SHA
    03c1bf4 View commit details
    Browse the repository at this point in the history

  8. Arrray bug

    Mark Plagge committed May 4, 2017
    Configuration menu
    Copy the full SHA
    21c737f View commit details
    Browse the repository at this point in the history

Commits on May 5, 2017

  1. L Up -// tn_json_reader up.

    Mark Plagge committed May 5, 2017
    Configuration menu
    Copy the full SHA
    7c13cc0 View commit details
    Browse the repository at this point in the history

  2. Latest NS IO

    Mark Plagge committed May 5, 2017
    Configuration menu
    Copy the full SHA
    6a1b74e View commit details
    Browse the repository at this point in the history

Commits on May 6, 2017

  1. Found spiking / non spiking issue

    Mark Plagge committed May 6, 2017
    Configuration menu
    Copy the full SHA
    0324aa9 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2017

  1. Added MNIST network def to script test pool

    Mark Plagge committed May 7, 2017
    Configuration menu
    Copy the full SHA
    cead8d5 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2017

  1. fixed CMAKE build process with LUA

    Mark Plagge committed May 8, 2017
    Configuration menu
    Copy the full SHA
    187b810 View commit details
    Browse the repository at this point in the history

  2. Fixed CMAKE build process with LUA settings

    Mark Plagge committed May 8, 2017
    Configuration menu
    Copy the full SHA
    25b6d95 View commit details
    Browse the repository at this point in the history

  3. Removed extra print statement

    Mark Plagge committed May 8, 2017
    Configuration menu
    Copy the full SHA
    47ddb20 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2017

  1. Changed input filenames to compile-time option. 

    Added more descriptive file read error prompts.
    Mark Plagge committed May 11, 2017
    Configuration menu
    Copy the full SHA
    fe85469 View commit details
    Browse the repository at this point in the history

  2. added some error handling for model reads

    Mark Plagge committed May 11, 2017
    Configuration menu
    Copy the full SHA
    7913bb9 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2017

  1. Minor bug fixes

    Mark Plagge committed May 14, 2017
    Configuration menu
    Copy the full SHA
    fb2906c View commit details
    Browse the repository at this point in the history

  2. Removed c11 flags, replaced with gnu99 flags for build.

    Mark Plagge committed May 14, 2017
    Configuration menu
    Copy the full SHA
    00961ea View commit details
    Browse the repository at this point in the history

Commits on May 21, 2017

  1. added comparing script and example model

    @nmcglo
    nmcglo committed May 21, 2017
    Configuration menu
    Copy the full SHA
    222ee35 View commit details
    Browse the repository at this point in the history

  2. Added Compare Script Arguments

    @nmcglo
    nmcglo committed May 21, 2017
    Configuration menu
    Copy the full SHA
    c44477e View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2017

  1. Ready to debug 

    Debug / QA ready - Scripting code is ready. 
This branch is for issue #24 and issue #21
    Mark Plagge committed Jun 13, 2017
    Configuration menu
    Copy the full SHA
    f40e06a View commit details
    Browse the repository at this point in the history