NSF Grant - #45

Open

hobson wants to merge 218 commits into

datitran:masterfrom

Commits on Nov 18, 2017

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

Commits on Nov 19, 2017

pluralized names for each entry in pbtxt
Hobson Lane
committed
1a5e1f7

Commits on Nov 21, 2017

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

Commits on Nov 28, 2017

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

Commits on Dec 5, 2017

new radar.py classes to hold radar data, WIP
Hobson Lane
committed
6b0aaf4
Got rtsp streaming working
Alex Rosengarten
committed
16aeb53
(Documentation)
Alex Rosengarten
committed
6118cdc
- Strike through outdated readme notes.
Alex Rosengarten
committed
662e0ae

Commits on Dec 6, 2017

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

Commits on Dec 7, 2017

- Minimized the environment file (maybe it could be smaller)
Alex Rosengarten
committed
1dd7405
Setting up Jenkins Pipeline in Blue Ocean.
alxmrs
committed
07eb83f
Trying to make subsequent commands run inside docker container.
alxmrs
committed
1a8d688
- Moved `build` and `test` commands to bash scripts
Alex Rosengarten
committed
ed013b4
Merge branch 'master' of https://github.com/aira/object_detector_app into feature/jenkins
Alex Rosengarten
committed
c7690e1
Merge pull request #1 from aira/feature/jenkins
alxmrs
authored
c360f13

Commits on Dec 8, 2017

- Dev tested + modified Jenkinsfile
Alex Rosengarten
committed
1098090
Merge pull request #2 from aira/feature/jenkins
alxmrs
authored
9219025
- Changed `sh` --> `bash` in Jenkinsfile
Alex Rosengarten
committed
3411ea5
Trying to get jenkinsfile to run without error.
Alex Rosengarten
committed
661430c
- Testing out method to get the conda env working in Jenkins
Alex Rosengarten
committed
a4e2cce
Modified Jenkinsfile to work with local conda installation in Jenkins instance
Alex Rosengarten
committed
5d5dffd
- Fixed groovy syntax error
Alex Rosengarten
committed
c8ab7df
Modified Jenkinsfile
Alex Rosengarten
committed
04fc0e4
- Changing volume mapping rw access to default
Alex Rosengarten
committed
e2beb26
- 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
7ed0399
- 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
d995836
- Adding USERID env variable
Alex Rosengarten
committed
8d52c54
- added conda info, going to see what's happening on Jenkins/docker image
Alex Rosengarten
committed
9de20dd
- added conda info, going to see what's happening on Jenkins/docker image
Alex Rosengarten
committed
1323478
- added conda info, going to see what's happening on Jenkins/docker image
Alex Rosengarten
committed
da6069b
- needed to pass a flag to `conda clean`. Passing all argument
Alex Rosengarten
committed
5c13e36
- Attempting to run pipeline without docker.
Alex Rosengarten
committed
3637163
- Blindly attempting to elevate privledges with `sudo`
Alex Rosengarten
committed
da3c492
- Stepping back on specifing the env. Changed permissions for the `conda3` folder that I'm mapping to.
Alex Rosengarten
committed
0b30da4
- Copying example jenkins file more closely.
Alex Rosengarten
committed
f536bab
Changed env variables (uid, gid)
Alex Rosengarten
committed
9f4dda4
Changed env variables (uid, gid)
Alex Rosengarten
committed
a31d3b7

Commits on Dec 9, 2017

getting info about pkgs dir
Alex Rosengarten
committed
0b9f169
Experimenting
Alex Rosengarten
committed
8da58ce

Commits on Dec 11, 2017

(CICD)
Alex Rosengarten
committed
2206920
(Fix Unit Tests)
Alex Rosengarten
committed
06b66ed
(Unit Test, Removed unused Files)
Alex Rosengarten
committed
363d7dd
(CICD)
Alex Rosengarten
committed
cf0d536

Commits on Dec 12, 2017

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

Commits on Dec 13, 2017

Merge branch 'master' of github.com:aira/object_detector_app
Hobson Lane
committed
983d8c7
__file__ instead of cwd()
Hobson Lane
committed
dfe0479
(Working Demo)
Alex Rosengarten
committed
10d2a02
(Refactor NLP Organization)
Alex Rosengarten
committed
779b3ed
Merge pull request #5 from aira/feature/nlp
hobson
authored
9513e45
(Unit Test Fixes)
Alex Rosengarten
committed
7ad16cb
Merge branch 'master' of https://github.com/aira/object_detector_app
Alex Rosengarten
committed
c740bea
Revert "(Unit Test Fixes)"
Alex Rosengarten
committed
7b6440b
dict to list mapping pairs
Hobson Lane
committed
00170a0
Merge branch 'master' of github.com:aira/object_detector_app into radar
Hobson Lane
committed
4408b67
(README update)
Alex Rosengarten
committed
8f28b70
Notes from API Review
alxmrs
authored
b58fcca
Cleaned up notes from API Discussion
alxmrs
authored
3d98224
ignore tmp files, minimal klugie radar (just pasthrough to update_state)
Hobson Lane
committed
98d49e8
merge conflict on .gitignore
Hobson Lane
committed
de2c39d

Commits on Dec 14, 2017

just try to import
Hobson Lane
committed
25a880d
one level up
Hobson Lane
committed
79b8da8
incorporate new constants file into object_detection_app
Hobson Lane
committed
6f7c8a4
object_detection_app.py
Hobson Lane
committed
578c250
merge working tmp from master
Hobson Lane
committed
c601ef5
(Color Labeling Package)
Alex Rosengarten
committed
c24d5a0
(Histogram approach)
Alex Rosengarten
committed
b793b58
found it!
Hobson Lane
committed
6b982bc
updated readme file

Ashwin Kannan
authored and
Ashwin Kannan
committed
e22274a
Readme Numbers updated

Ashwin Kannan
authored and
Ashwin Kannan
committed
b8b9d71
Update README.md
ashwinkannan94
authored
dcd1780
Update README.md
ashwinkannan94
authored
30ba21e
Update README.md
ashwinkannan94
authored
ce21d77
Up to date with master

Ashwin Kannan
authored and
Ashwin Kannan
committed
2c5f580
style guide and bugfix by Ashwin
Hobson Lane
committed
ccf61f1
style guide and bugfix by Ashwin
Hobson Lane
committed
76882f5

Commits on Dec 15, 2017

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

Ashwin Kannan
authored and
Ashwin Kannan
committed
172082d
code added

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

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

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

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

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

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

Ashwin Kannan
authored and
Ashwin Kannan
committed
6e6e2d8
Code that ran during the demo
Alex Rosengarten
committed
4abda2b

Commits on Dec 16, 2017

API Conversation 2
alxmrs
authored
c858092
Fine Tuning Readme
alxmrs
authored
c3549e8
Merge pull request #8 from aira/readme-api-discussion
alxmrs
authored
1573024
- Added names to string templates.
Alex Rosengarten
committed
2d2bbad
- Now we can communicate with the dash + android device
Alex Rosengarten
committed
1a2ce9e
Merge pull request #9 from aira/feature/color-hist
alxmrs
authored
48c4cb6
(Updated README)
alxmrs
authored
7b2f4e8
Merge branch 'master' into radar
hobson
authored
6d778b0
Merge pull request #6 from aira/radar
hobson
authored
b19c4ae

Commits on Dec 17, 2017

object_vectors is a list of lists
Hobson Lane
committed
b7f6675

Commits on Dec 18, 2017

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

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

Ashwin Kannan
authored and
Ashwin Kannan
committed
98498e3
add singulars to plurals.py
Hobson Lane
committed
f6bd531
no more utterance_frames arg
Hobson Lane
committed
cb503cd
fixed say error handling (os.system doesn't raise exceptions)
Hobson Lane
committed
17486ee
Merge pull request #10 from aira/feature/db
hobson
authored
e8ee0f5
(NLP Functions)
Alex Rosengarten
committed
95f6c96
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
77989c8
Merge branch 'master' of https://github.com/aira/object_detector_app
Alex Rosengarten
committed
39b19fd
fixed PR changes.

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

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

Ashwin Kannan
authored and
Ashwin Kannan
committed
6d16736
Update README.md
hobson
authored
7bd3dcb

Commits on Dec 19, 2017

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

Ashwin Kannan
authored and
Ashwin Kannan
committed
017128c
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
de17a4a
Merge branch 'master' of https://github.com/aira/object_detector_app into Ashwin

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

Ashwin Kannan
authored and
Ashwin Kannan
committed
212b13e
minor changes

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

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

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

Ashwin Kannan
authored and
Ashwin Kannan
committed
72fcdef
(Deployment)
Alex Rosengarten
committed
0a9bbb9
removed loc variable

Ashwin Kannan
authored and
Ashwin Kannan
committed
b21d7ca
(Merge with Ashwin's PR)
Alex Rosengarten
committed
8166ad8
Merge branch 'Ashwin' of https://github.com/aira/object_detector_app into feature/nlp
Alex Rosengarten
committed
9a1f786
- renamed Describe --> DescribeScene
Alex Rosengarten
committed
146a62d
- Fixed color command
Alex Rosengarten
committed
6ff9183
Merge pull request #12 from aira/Ashwin
alxmrs
authored
4631c86
Merge branch 'master' of https://github.com/aira/object_detector_app into feature/nlp
Alex Rosengarten
committed
cb22f4a
Revert "(Deployment)"
Alex Rosengarten
committed
e8210d1
(Deployment start)
Alex Rosengarten
committed
e02a0d1
Merge branch 'master' of https://github.com/aira/object_detector_app into feature/deploy
Alex Rosengarten
committed
1670c0e
Merge branch 'master' of https://github.com/aira/object_detector_app
Alex Rosengarten
committed
7cb26b8
Merge pull request #13 from aira/feature/nlp
hobson
authored
2ed2c90
(Creating Deploy Scripts)
Alex Rosengarten
committed
11ac8ae
(Merge with Master)
Alex Rosengarten
committed
28089d6
(Creating Deploy Scripts)
Alex Rosengarten
committed
efbb325
(gitignoring log)
Alex Rosengarten
committed
8193982
(gitignoring process id log)
Alex Rosengarten
committed
36087e4
(Merge with Master)
Alex Rosengarten
committed
b2555fc
- Added shutdown script
Alex Rosengarten
committed
355cca2
(Revering weird merge change)
Alex Rosengarten
committed
209fc8a
Merge pull request #14 from aira/feature/deploy
hobson
authored
4ef1f52
Merge branch 'master' of https://github.com/aira/object_detector_app
Alex Rosengarten
committed
b4de378

Commits on Dec 20, 2017

Update CONTRIBUTING.md
hobson
authored
89f072e
Update CONTRIBUTING.md
hobson
authored
35a2bd3
get rid of the annoying red json comment highlighting
hobson
authored
b36f946
indent
hobson
authored
b1b8941
Update README.md
hobson
authored
e7ddfe0
Update README.md
hobson
authored
98bbf5a
Update README.md
hobson
authored
547f0a9
Update README.md
hobson
authored
5a9c520
Update README.md
hobson
authored
c3b3505
mqtt fixes

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

Ashwin Kannan
authored and
Ashwin Kannan
committed
e174a3e

Commits on Dec 21, 2017

simple fix.

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

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

Ashwin Kannan
authored and
Ashwin Kannan
committed
0380176

Commits on Dec 27, 2017

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

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

Commits on Dec 28, 2017

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

Commits on Apr 13, 2018

NSF science contribution docs
hobson
committed
30185b7