NSF Grant#45

Open

hobson wants to merge 218 commits intodatitran:masterfrom

Commits on Nov 18, 2017

counts objects and says a description using osx say
Hobson Lane
committed

Commits on Nov 19, 2017

pluralized names for each entry in pbtxt
Hobson Lane
committed

Commits on Nov 21, 2017

pandas in environment.yml
Hobson Lane
committed
NUM_CLASSES 90 despite 80 COCO limit?
Hobson Lane
committed
num classes
Hobson Lane
committed

Commits on Nov 28, 2017

adjust threshold back up to .5 (two places)
Hobson Lane
committed
object_detection/utils/visualization_utils.py is read only now and return statement is nested
Hobson Lane
committed

Commits on Dec 5, 2017

new radar.py classes to hold radar data, WIP
Hobson Lane
committed
Got rtsp streaming working
Alex Rosengarten
committed
(Documentation)
Alex Rosengarten
committed
- Strike through outdated readme notes.
Alex Rosengarten
committed

Commits on Dec 6, 2017

standup notes
Hobson Lane
committed
Merge branch 'master' of github.com:aira/object_detector_app
Hobson Lane
committed
updated standup
Hobson Lane
committed
(Jenkinsfile) Added dummy Jenkinsfile for CI (and later CD)
Alex Rosengarten
committed
Merge branch 'master' of https://github.com/aira/object_detector_app
Alex Rosengarten
committed
- Minimized the environment file (maybe it could be smaller)
Alex Rosengarten
committed
- Minimized the environment file (maybe it could be smaller)
Alex Rosengarten
committed

Commits on Dec 8, 2017

- Dev tested + modified Jenkinsfile
Alex Rosengarten
committed
Merge pull request #2 from aira/feature/jenkins
alxmrs
authored
- Changed `sh` --> `bash` in Jenkinsfile
Alex Rosengarten
committed
Trying to get jenkinsfile to run without error.
Alex Rosengarten
committed
- Testing out method to get the conda env working in Jenkins
Alex Rosengarten
committed
Modified Jenkinsfile to work with local conda installation in Jenkins instance
Alex Rosengarten
committed
- Fixed groovy syntax error
Alex Rosengarten
committed
Modified Jenkinsfile
Alex Rosengarten
committed
- Changing volume mapping rw access to default
Alex Rosengarten
committed
- Mapping two new volumes (`/etc/passwd` and `/etc/group`) to docker container from jenkins machine to attempt to solve conda permissions issue with rw with `pkgs`.
Alex Rosengarten
committed
- Mapping two new volumes (`/etc/passwd` and `/etc/group`) to docker container from jenkins machine to attempt to solve conda permissions issue with rw with `pkgs`.
Alex Rosengarten
committed
- Adding USERID env variable
Alex Rosengarten
committed
- added conda info, going to see what's happening on Jenkins/docker image
Alex Rosengarten
committed
- added conda info, going to see what's happening on Jenkins/docker image
Alex Rosengarten
committed
- added conda info, going to see what's happening on Jenkins/docker image
Alex Rosengarten
committed
- needed to pass a flag to `conda clean`. Passing all argument
Alex Rosengarten
committed
- Attempting to run pipeline without docker.
Alex Rosengarten
committed
- Blindly attempting to elevate privledges with `sudo`
Alex Rosengarten
committed
- Stepping back on specifing the env. Changed permissions for the `conda3` folder that I'm mapping to.
Alex Rosengarten
committed
- Copying example jenkins file more closely.
Alex Rosengarten
committed
Changed env variables (uid, gid)
Alex Rosengarten
committed
Changed env variables (uid, gid)
Alex Rosengarten
committed

Commits on Dec 9, 2017

getting info about pkgs dir
Alex Rosengarten
committed
Experimenting
Alex Rosengarten
committed

Commits on Dec 11, 2017

(CICD)
Alex Rosengarten
committed
(Fix Unit Tests)
Alex Rosengarten
committed
(Unit Test, Removed unused Files)
Alex Rosengarten
committed
(CICD)
Alex Rosengarten
committed

Commits on Dec 12, 2017

- In Jenkinsfile, commented out deploy stubs.
Alex Rosengarten
committed
standup-notes
Hobson Lane
committed
Merge branch 'master' of github.com:aira/object_detector_app
Hobson Lane
committed
- Createds script to install tensorflow `nets` library (i.e. clone the tf/models repo).
Alex Rosengarten
committed
- Removed `imshow` commands. Running headless by default.
Alex Rosengarten
committed
- Changed argparser action, simpler interface (thanks Hobson)
Alex Rosengarten
committed
Merge pull request #4 from aira/feature/headless
hobson
authored
- Refactored NLP as python package
Alex Rosengarten
committed
- Moved NLP module to top level (outside of `object_detection`
Alex Rosengarten
committed
- Refactored Voice output to be defaulted to off. Can be set on with `-s` or `--say` command line argument.
Alex Rosengarten
committed
image datasets
Hobson Lane
committed
ignore tf model files
Hobson Lane
committed
(MQTT Layer)
Alex Rosengarten
committed
(Bugfix: package/script conflict)
Alex Rosengarten
committed
(NLP Reorg)
Alex Rosengarten
committed
(Dispatch Org)
Alex Rosengarten
committed
(Moved back `radar.py`)
Alex Rosengarten
committed

Commits on Dec 13, 2017

Merge branch 'master' of github.com:aira/object_detector_app
Hobson Lane
committed
__file__ instead of cwd()
Hobson Lane
committed
(Working Demo)
Alex Rosengarten
committed
(Refactor NLP Organization)
Alex Rosengarten
committed
Merge pull request #5 from aira/feature/nlp
hobson
authored
(Unit Test Fixes)
Alex Rosengarten
committed
Merge branch 'master' of https://github.com/aira/object_detector_app
Alex Rosengarten
committed
Revert "(Unit Test Fixes)"
Alex Rosengarten
committed
dict to list mapping pairs
Hobson Lane
committed
Merge branch 'master' of github.com:aira/object_detector_app into radar
Hobson Lane
committed
(README update)
Alex Rosengarten
committed
Notes from API Review
alxmrs
authored
Cleaned up notes from API Discussion
alxmrs
authored
ignore tmp files, minimal klugie radar (just pasthrough to update_state)
Hobson Lane
committed
merge conflict on .gitignore
Hobson Lane
committed

Commits on Dec 14, 2017

just try to import
Hobson Lane
committed
one level up
Hobson Lane
committed
incorporate new constants file into object_detection_app
Hobson Lane
committed
object_detection_app.py
Hobson Lane
committed
merge working tmp from master
Hobson Lane
committed
(Color Labeling Package)
Alex Rosengarten
committed
(Histogram approach)
Alex Rosengarten
committed
found it!
Hobson Lane
committed
updated readme file

Ashwin Kannan
authored and
Ashwin Kannan
committed
Readme Numbers updated

Ashwin Kannan
authored and
Ashwin Kannan
committed
Update README.md
ashwinkannan94
authored
Update README.md
ashwinkannan94
authored
Update README.md
ashwinkannan94
authored
Up to date with master

Ashwin Kannan
authored and
Ashwin Kannan
committed
style guide and bugfix by Ashwin
Hobson Lane
committed
style guide and bugfix by Ashwin
Hobson Lane
committed

Commits on Dec 15, 2017

(Color Hist v1)
Alex Rosengarten
committed
constants for color and bb
Hobson Lane
committed
Merge branch 'master' of github.com:aira/object_detector_app into Ashwin
Hobson Lane
committed
docstring

Ashwin Kannan
authored and
Ashwin Kannan
committed
code added

Ashwin Kannan
authored and
Ashwin Kannan
committed
updated test cases and code

Ashwin Kannan
authored and
Ashwin Kannan
committed
changed print to return.

Ashwin Kannan
authored and
Ashwin Kannan
committed
updated testdoc with complete suite of test cases

Ashwin Kannan
authored and
Ashwin Kannan
committed
NSF-4 #start-progress add style guide and constants for vector
Hobson Lane
committed
Merge branch 'master' of github.com:aira/object_detector_app
Hobson Lane
committed
(Update State Vector)
Alex Rosengarten
committed
add constants
Hobson Lane
committed
(Color Labeler Module)
Alex Rosengarten
committed
new transformation file which contains normalization and labeling whether in center, left or right

Ashwin Kannan
authored and
Ashwin Kannan
committed
Merge branch 'master' into radar
Hobson Lane
committed
modified file. No longer need to use. All under NLP branch and filename is transform.py

Ashwin Kannan
authored and
Ashwin Kannan
committed
style guide
Hobson Lane
committed
removed the normalize.py file from repo

Ashwin Kannan
authored and
Ashwin Kannan
committed
Code that ran during the demo
Alex Rosengarten
committed

Commits on Dec 16, 2017

Commits on Dec 17, 2017

object_vectors is a list of lists
Hobson Lane
committed

Commits on Dec 18, 2017

updated to coding standards and changed all tabs to 4 spaces.

Ashwin Kannan
authored and
Ashwin Kannan
committed
changed print to return

Ashwin Kannan
authored and
Ashwin Kannan
committed
add singulars to plurals.py
Hobson Lane
committed
no more utterance_frames arg
Hobson Lane
committed
fixed say error handling (os.system doesn't raise exceptions)
Hobson Lane
committed
Merge pull request #10 from aira/feature/db
hobson
authored
(NLP Functions)
Alex Rosengarten
committed
Revert "(NLP Functions) - Added template string to `Describe` command + started helper fxn - Updated nlp core `__init__.py` - Broke out functions in `nlp/core.py`."
Alex Rosengarten
committed
Merge branch 'master' of https://github.com/aira/object_detector_app
Alex Rosengarten
committed
fixed PR changes.

Ashwin Kannan
authored and
Ashwin Kannan
committed
(Merges from Hobbs PR)
Alex Rosengarten
committed
- `nlp/core.py` doctests now pass
Alex Rosengarten
committed
Merge branch 'master' of https://github.com/aira/object_detector_app into Ashwin

Ashwin Kannan
authored and
Ashwin Kannan
committed
style changes for docstring and doctest

Ashwin Kannan
authored and
Ashwin Kannan
committed
Update README.md
hobson
authored

Commits on Dec 19, 2017

Got it (mostly) working.
Alex Rosengarten
committed
(NLP Doctests passing)
Alex Rosengarten
committed
- Doctests passing for `include_color` parameter.
Alex Rosengarten
committed
changed output state vector to have location

Ashwin Kannan
authored and
Ashwin Kannan
committed
added a estimate function to take in the box args and output that as x, y, z, width, height, depth

Ashwin Kannan
authored and
Ashwin Kannan
committed
Merge branch 'master' of https://github.com/aira/object_detector_app into Ashwin

Ashwin Kannan
authored and
Ashwin Kannan
committed
Merge branch 'master' of https://github.com/aira/object_detector_app into feature/nlp
Alex Rosengarten
committed
- Tests passing
Alex Rosengarten
committed
- Tests passing
Alex Rosengarten
committed
- wrote more doctests to test differentiation in aggregation.
Alex Rosengarten
committed
no same variable names and all docstring plus doctests updated

Ashwin Kannan
authored and
Ashwin Kannan
committed
minor changes

Ashwin Kannan
authored and
Ashwin Kannan
committed
no variables have the same name

Ashwin Kannan
authored and
Ashwin Kannan
committed
- doctested `include_color` and `include_position` and tests all pass
Alex Rosengarten
committed
(Fixed position bugs)
Alex Rosengarten
committed
- Cleaned up the `describe.py` file/command.
Alex Rosengarten
committed
Redone the variable names to be correct

Ashwin Kannan
authored and
Ashwin Kannan
committed
changed variable name to not be conflicting with function name

Ashwin Kannan
authored and
Ashwin Kannan
committed
(Deployment)
Alex Rosengarten
committed
removed loc variable

Ashwin Kannan
authored and
Ashwin Kannan
committed
(Merge with Ashwin's PR)
Alex Rosengarten
committed
Merge branch 'Ashwin' of https://github.com/aira/object_detector_app into feature/nlp
Alex Rosengarten
committed
- renamed Describe --> DescribeScene
Alex Rosengarten
committed
- Fixed color command
Alex Rosengarten
committed
Merge pull request #12 from aira/Ashwin
alxmrs
authored
Merge branch 'master' of https://github.com/aira/object_detector_app into feature/nlp
Alex Rosengarten
committed
Revert "(Deployment)"
Alex Rosengarten
committed
(Deployment start)
Alex Rosengarten
committed
Merge branch 'master' of https://github.com/aira/object_detector_app into feature/deploy
Alex Rosengarten
committed
Merge branch 'master' of https://github.com/aira/object_detector_app
Alex Rosengarten
committed
Merge pull request #13 from aira/feature/nlp
hobson
authored
(Creating Deploy Scripts)
Alex Rosengarten
committed
(Merge with Master)
Alex Rosengarten
committed
(Creating Deploy Scripts)
Alex Rosengarten
committed
(gitignoring log)
Alex Rosengarten
committed
(gitignoring process id log)
Alex Rosengarten
committed
(Merge with Master)
Alex Rosengarten
committed
- Added shutdown script
Alex Rosengarten
committed
(Revering weird merge change)
Alex Rosengarten
committed
Merge pull request #14 from aira/feature/deploy
hobson
authored
Merge branch 'master' of https://github.com/aira/object_detector_app
Alex Rosengarten
committed

Commits on Dec 20, 2017

Update CONTRIBUTING.md
hobson
authored
Update CONTRIBUTING.md
hobson
authored
get rid of the annoying red json comment highlighting
hobson
authored
indent
hobson
authored
Update README.md
hobson
authored
Update README.md
hobson
authored
Update README.md
hobson
authored
Update README.md
hobson
authored
Update README.md
hobson
authored
mqtt fixes

Ashwin Kannan
authored and
Ashwin Kannan
committed
fixes to make the server run the shell scripts properly as paths need to be corrected

Ashwin Kannan
authored and
Ashwin Kannan
committed

Commits on Dec 21, 2017

simple fix.

Ashwin Kannan
authored and
Ashwin Kannan
committed
revert path
Hobson Lane
committed
Merge pull request #16 from aira/mqtt_fixes
hobson
authored
Merge pull request #17 from aira/mqtt_fixes_2
hobson
authored
basic JSON format being output. Need to change the confidence parameter

Ashwin Kannan
authored and
Ashwin Kannan
committed
fixed messageId to be incremented each time send() is called. Made the JSON text more readable

Ashwin Kannan
authored and
Ashwin Kannan
committed

Commits on Dec 27, 2017

Merge branch 'master' of https://github.com/aira/object_detector_app
Alex Rosengarten
committed
(Fixed CONTRIBUTING.md minor error)
Alex Rosengarten
committed
milliseconds fix and command changed to statement

Ashwin Kannan
authored and
Ashwin Kannan
committed
- Fixed bug, need to refactor.
Alex Rosengarten
committed
- Added `loop_stop` to stop the mqtt client before the python program exits.
Alex Rosengarten
committed
Merge pull request #18 from aira/json_payload_fix
alxmrs
authored
Revert "- Added `loop_stop` to stop the mqtt client before the python program exits."
Alex Rosengarten
committed
Merge branch 'master' of https://github.com/aira/object_detector_app into bugfix/video404
Alex Rosengarten
committed
(Threading potential fixes)
Alex Rosengarten
committed
(Dev test main while loop)
Alex Rosengarten
committed
Revert "(Threading potential fixes)"
Alex Rosengarten
committed

Commits on Dec 28, 2017

Hard Revert "(Threading potential fixes)"
Alex Rosengarten
committed
(MQTT loop fix)
Alex Rosengarten
committed
(Null Check Frame)
Alex Rosengarten
committed
Merge pull request #19 from aira/bugfix/video404
alxmrs
authored

Commits on Apr 13, 2018

NSF science contribution docs
hobson
committed