Merge branch 'main' into ck/benchmark

apperception-db · Oct 19, 2023 · d5333c6 · d5333c6
2 parents 9187772 + 523056a
commit d5333c6
Show file tree

Hide file tree

Showing 118 changed files with 1,468,492 additions and 86,038 deletions.
diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
@@ -48,12 +48,6 @@ jobs:
         shell: micromamba-shell {0}
         run: poetry install --no-interaction --without dev --with test
 
-      - name: Install lap (Hack)
-        shell: micromamba-shell {0}
-        run: |
-          pip install --upgrade pip
-          pip install lap
-      
       - name: Check Installed Packages
         shell: micromamba-shell {0}
         run: pip list

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -24,8 +24,8 @@ jobs:
         mkdir -p ./build/data/assets
         cp ./data/assets/* ./build/data/assets/
 
-    - name: Publish Website
-      uses: JamesIves/github-pages-deploy-action@v4
-      with:
-        folder: 'build'
-        single-commit: true
+    # - name: Publish Website
+    #   uses: JamesIves/github-pages-deploy-action@v4
+    #   with:
+    #     folder: 'build'
+    #     single-commit: true
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -45,12 +45,6 @@ jobs:
         shell: micromamba-shell {0}
         run: poetry install --no-interaction --without dev --with test
 
-      - name: Install lap (Hack)
-        shell: micromamba-shell {0}
-        run: |
-          pip install --upgrade pip
-          pip install lap
-      
       - name: Check Installed Packages
         shell: micromamba-shell {0}
         run: pip list
@@ -83,7 +77,7 @@ jobs:
           name: workflow-coverage
           path: ./coverage.xml
 
-      # - name: Commit formatted changes
+      # - name: Commit generated test inputs
       #   run: ./scripts/commit-and-push.sh "[CI] update test"
 
   test-video-processor:
@@ -128,12 +122,6 @@ jobs:
         shell: micromamba-shell {0}
         run: poetry install --no-interaction --without dev --with test
 
-      - name: Install lap (Hack)
-        shell: micromamba-shell {0}
-        run: |
-          pip install --upgrade pip
-          pip install lap
-      
       - name: Check Installed Packages
         shell: micromamba-shell {0}
         run: pip list
@@ -280,7 +268,6 @@ jobs:
         run: |
           python ./scripts/ingest_road.py
           python ./scripts/import_tables.py
-          jupyter nbconvert --execute --to notebook ./scripts/optimized-scenic/add_attributes.ipynb
         env:
           AP_PORT: 25440
 

diff --git a/.gitignore b/.gitignore
@@ -20,7 +20,6 @@ samples
 sweeps
 
 data/v1.0-mini
-data/nuscenes
 data/scenic/road_network
 
 models

diff --git a/README.md b/README.md
@@ -47,7 +47,7 @@ while maintaining up to 97.1% accuracy compared to unoptimized execution.
 ```
 - python >= 3.10 (Prefer Conda/Mamba)
 - docker
-- cuda >= 11.7 (If you want to use GPU)
+- cuda >= 11.7 (If using GPU)
 ```
 
 ## How to Setup Spatialyze Repo
@@ -76,28 +76,27 @@ mamba activate spatialyze
 
 # install python dependencies
 poetry install
-pip install lap  # a bug in lap/poetry/conda that lap needs to be installed using pip.
 ```
 
 ## Spatialyze Demo
 ### Start Spatialyze Geospatial Metadata Store [MobilityDB](https://github.com/MobilityDB/MobilityDB)
 ```bash
-docker volume create spatialyze-gs-store-data
-docker run --name     "spatialyze-gs-store"                        \
-           --detach                                                \
-           --publish  25432:5432                                   \
-           --volume   spatialyze-gs-store-data:/var/lib/postgresql \
+docker volume create spatialyze-gsstore-data
+docker run --name     "spatialyze-gsstore"                        \
+           --detach                                               \
+           --publish  25432:5432                                  \
+           --volume   spatialyze-gsstore-data:/var/lib/postgresql \
                       mobilitydb/mobilitydb
 ```
 Setup the MobilityDB with customized functions
 ```bash
-docker exec -it spatialyze-gs-store rm -rf /pg_extender
-docker cp scripts/pg-extender spatialyze-gs-store:/pg_extender
-docker exec -it -w /pg_extender spatialyze-gs-store python3 install.py
+docker exec -it spatialyze-gsstore rm -rf /pg_extender
+docker cp scripts/pg-extender spatialyze-gsstore:/pg_extender
+docker exec -it -w /pg_extender spatialyze-gsstore python3 install.py
 ```
 To run MobilityDB every system restart
 ```bash
-docker update --restart unless-stopped spatialyze-gs-store
+docker update --restart unless-stopped spatialyze-gsstore
 ```
 
 ### Try the demo (WIP 🚧)
@@ -120,3 +119,6 @@ This paper is currently under review for [VLDB](https://vldb.org/2024/).
     primaryClass={cs.DB}
 }
 ```
+
+## Codecov
+<img width=100% src="https://codecov.io/gh/apperception-db/spatialyze/graphs/icicle.svg?token=A4FHKVI1Ua">
diff --git a/codecov.yml b/codecov.yml
@@ -1,10 +1,6 @@
 ignore:
-  - "spatialyze/legacy"
   - "spatialyze/video_processor/modules"
   - "spatialyze/video_processor/stages/detection_estimation/*"
   - "spatialyze/video_processor/stages/segment_trajectory/*"
   - "spatialyze/video_processor/stages/strongsort_with_skip.py"
-  - "spatialyze/video_processor/utils/preprocess.py"
-  - "spatialyze/video_processor/utils/process_pipeline.py"
-  - "spatialyze/video_processor/utils/query_analyzer.py"
   - "**/__init__.py"
diff --git a/data/nuscenes/mini/attribute.json b/data/nuscenes/mini/attribute.json
@@ -0,0 +1,42 @@
+[
+{
+"token": "cb5118da1ab342aa947717dc53544259",
+"name": "vehicle.moving",
+"description": "Vehicle is moving."
+},
+{
+"token": "c3246a1e22a14fcb878aa61e69ae3329",
+"name": "vehicle.stopped",
+"description": "Vehicle, with a driver/rider in/on it, is currently stationary but has an intent to move."
+},
+{
+"token": "58aa28b1c2a54dc88e169808c07331e3",
+"name": "vehicle.parked",
+"description": "Vehicle is stationary (usually for longer duration) with no immediate intent to move."
+},
+{
+"token": "a14936d865eb4216b396adae8cb3939c",
+"name": "cycle.with_rider",
+"description": "There is a rider on the bicycle or motorcycle."
+},
+{
+"token": "5a655f9751944309a277276b8f473452",
+"name": "cycle.without_rider",
+"description": "There is NO rider on the bicycle or motorcycle."
+},
+{
+"token": "03aa62109bf043afafdea7d875dd4f43",
+"name": "pedestrian.sitting_lying_down",
+"description": "The human is sitting or lying down."
+},
+{
+"token": "4d8821270b4a47e3a8a300cbec48188e",
+"name": "pedestrian.standing",
+"description": "The human is standing."
+},
+{
+"token": "ab83627ff28b465b85c427162dec722f",
+"name": "pedestrian.moving",
+"description": "The human is moving."
+}
+]