Cpu eval2 by carolinewang01 · Pull Request #85 · dssg/air_pollution_estimation

carolinewang01 · 2019-08-19T15:48:11Z

Includes

base eval code (updated to reflect latest eval bugfixes)
Sam's tracking bug fix

…modular

…ine, changing update_frame_level_table to accept args as well

…c2 for testing deployment

…ontinues running despite failures

…ing properly as well

…val)

…'t refer to tracking types in the types of traffic analysers

…tion_estimation into ec2_eval_pipeline solving bugs on ec2

…tion_estimation into ec2_eval_pipeline last minute attempt to get eval stats

…coords

…un during review process

Maren-Eckhoff

Remove the output.txt, and readme_resources/images/example_credentials.png

Maren-Eckhoff · 2019-08-21T08:53:37Z

.gitignore

-
+# ignore goturn caffe model 
+src/goturn.caffemodel 
+src/goturn.prototxt


why would these files and up here?

Funmi told me that to run the goturn tracker, you need these 2 files to be in the same directory as the module you're running.

Maren-Eckhoff · 2019-08-21T09:40:56Z

notebooks/20190807_CW_xml-from-s3-to-parsed.ipynb

@@ -0,0 +1,2464 @@
+{


delete notebook.

Maren-Eckhoff · 2019-08-21T09:41:27Z

notebooks/20190815_make_report_figs.ipynb

@@ -0,0 +1,122 @@
+{


remove notebook

Maren-Eckhoff · 2019-08-21T09:42:41Z

requirements.txt

 pandas==0.24.2
 psycopg2==2.6.2
 seaborn>=0.9
+sklearn


specify the version

Maren-Eckhoff · 2019-08-21T09:44:54Z

src/create_dev_tables.py

@@ -0,0 +1,9 @@
+from traffic_analysis.d00_utils.create_primary_sql_tables import create_primary_sql_tables


correct import

I removed the module actually because it is rendered unnecessary by the setup.py

Maren-Eckhoff · 2019-08-21T10:01:22Z

src/eval_pipeline.py

@@ -0,0 +1,138 @@
+import numpy as np


this is too much code in the pipeline file. If you need many steps, then please move them into a function run_eval_pipeline that sits in d07_pipelines and call that function here.

Maren-Eckhoff · 2019-08-21T10:06:49Z

src/eval_pipeline.py

+s3_credentials = creds[paths['s3_creds']]
+
+# settings
+verbose = True


that could be in the eval_pipeline_settings

Maren-Eckhoff · 2019-08-21T11:10:16Z

src/traffic_analysis/d00_utils/create_sql_tables.py

+def create_primary_sql_tables(db_frame_level_name: str, 
+                              db_video_level_name: str,
+                              db_vehicle_types_name: str = None,
+                              db_cameras_name: str = None,


remove unused inputs

Maren-Eckhoff · 2019-08-21T11:13:11Z

src/setup.py


 # create PSQL tables to insert vehicle statistics into 
-create_sql_tables(drop=False)
+create_primary_sql_tables(drop=False)


I think you changed the inputs. Do you not need to pass in the table names?

Yes you're right, I've addressed this

Maren-Eckhoff · 2019-08-21T11:14:18Z

src/traffic_analysis/d00_utils/create_sql_tables.py

+        dl.execute_raw_sql_query(sql=command)
+
+
+def create_eval_sql_tables(creds: dict,


remove unused import

Which import are you referring to? I think all of them are currently used.

…imation into CPU_eval2

carolinewang01 added 30 commits August 1, 2019 17:24

solved merge conflicts with tracking into pipeline branch

858f5cc

made traffic analyser a passable param, so that run_pipeline is more …

4b5f8ec

…modular

resolve conflicts with frame level eval

d653ce1

edited params

cf0c20f

changed create_dev_tables.py to accept args, began writing eval_pipel…

4128ed6

…ine, changing update_frame_level_table to accept args as well

changed paths and parameters

8806990

fixed merge conflicts with dev

ed1e9c2

under advise of code reviewers, created dictionary for creating tracker

5b151e5

finished writing eval pipeline, no debugging yet

b6575b0

solved minor compilation errors

1587cce

added print statements, corrected more minor bugs, ready to move to e…

3beda22

…c2 for testing deployment

resolved minor typos, first tests of eval in pipeline

493ca8b

incorporated sams naming bug fixes, added safety to ensure pipeline c…

e35915a

…ontinues running despite failures

got annotations and videos to load properly, video_level_eval is runn…

76e2287

…ing properly as well

fixed merge conflicst with dev caused by merging pr 64 (Frame level e…

a9436e1

…val)

solved merge conflicts

462db08

added verbosity statements, refactored eval_pipeline so that it doesn…

8cf5d08

…'t refer to tracking types in the types of traffic analysers

debugging tracking analyser fumi changes

f0ea566

added fixed detect_and_track_objects function

43230b5

corrected spacing issues

ee39733

solved import errors

075f226

begun adding column orders for eval tbls

b62f9ca

Merge branch 'ec2_eval_pipeline' of https://github.com/dssg/air_pollu…

bcb6bbf

…tion_estimation into ec2_eval_pipeline solving bugs on ec2

added col orders for eval tables

1c32fa6

got eval pipeline to run on one type of tracker

fc7b85a

added tracking runtime code

bf350dd

fixed merge conflicts with dev + funmi's bugfix

16eccee

removed chunk stopping'

101d6e4

added np import

0c6c037

Merge branch 'ec2_eval_pipeline' of https://github.com/dssg/air_pollu…

f165a75

…tion_estimation into ec2_eval_pipeline last minute attempt to get eval stats

carolinewang01 added 11 commits August 16, 2019 11:44

corrected return values for frame level and video level eval

3844ed6

removed try except

4e5b7b2

printing statements to try and fix stop-tracking boxes fix

7e9ed82

bug fix to deal with if prev bboxes tracked is empty

e42f6d5

changed bool to checking for size of np array

d444979

deleted prints

0b77982

added try except back

d5d279d

added error handling for when the multitracker returns negative bbox …

ce8feff

…coords

added more bbox formatting ocrrections, addedd looping thru param sets

93ea1d3

solved merge conflicts

4e8517d

resolved merge conflicts with dev

65a1127

carolinewang01 requested review from Maren-Eckhoff and SamBlakeman August 19, 2019 15:48

carolinewang01 self-assigned this Aug 19, 2019

carolinewang01 and others added 6 commits August 19, 2019 18:19

added a needed import

73e37f9

jupyter notebooks that walk through model selection for evaluation

78ec9de

added data to run eval ipynbs

980ea41

resolved merge conflicts with dev

fbf3fe8

changed default eval psql table names to include test in case it is r…

1ba6049

…un during review process

solved bugs introduced by merging

49cdb8e

Maren-Eckhoff requested changes Aug 21, 2019

View reviewed changes

Maren-Eckhoff added big_scary_PR under_review labels Aug 21, 2019

jackattack1415 and others added 7 commits August 21, 2019 19:06

patching

f73ccd5

maren changes

72100f7

print statemnets to investigate negative stop issues

87e74dc

Merge branch 'CPU_eval2' of https://github.com/dssg/air_pollution_est…

7b073f5

…imation into CPU_eval2

removed print statements

22d9b1e

created clearer names for eval data files

814d055

put verbose setting in params

87c2aab

		@@ -0,0 +1,9 @@
		from traffic_analysis.d00_utils.create_primary_sql_tables import create_primary_sql_tables

		dl.execute_raw_sql_query(sql=command)


		def create_eval_sql_tables(creds: dict,

Conversation

carolinewang01 commented Aug 19, 2019

Uh oh!

Maren-Eckhoff left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants