Merge pull request #220 from JaerongA/datajoint_pipeline

SainsburyWellcomeCentre · Jul 21, 2023 · 3c9ec7e · 3c9ec7e
2 parents 8bfec4b + c27b3a4
commit 3c9ec7e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/aeon/dj_pipeline/utils/video.py b/aeon/dj_pipeline/utils/video.py
@@ -25,10 +25,10 @@ def retrieve_video_frames(
     raw_data_dir = Path(raw_data_dir)
     assert raw_data_dir.exists()
 
-    # do some data loading
+    # Load video data
     videodata = io_api.load(
         root=raw_data_dir.as_posix(),
-        reader=io_reader.Video(camera_name),
+        reader=io_reader.Video(f"{camera_name}_*"),
         start=pd.Timestamp(start_time),
         end=pd.Timestamp(end_time),
     )

diff --git a/aeon/dj_pipeline/webapps/sciviz/docker-compose-remote.yaml b/aeon/dj_pipeline/webapps/sciviz/docker-compose-remote.yaml
@@ -1,15 +1,16 @@
+# cd aeon/dj_pipeline/webapps/sciviz/ 
 # HOST_UID=$(id -u) docker-compose -f docker-compose-remote.yaml up -d
-#
 
 version: '2.4'
 services:
   pharus:
-    cpus: 2.0
-    mem_limit: 4g
+    # cpus: 2.0
+    mem_limit: 16g
     image: jverswijver/pharus:0.8.5-PY_VER-3.9
     environment:
       # - FLASK_ENV=development # enables logging to console from Flask
       - PHARUS_SPEC_PATH=/main/specsheet.yaml # for dynamic utils spec
+    env_file: ./.env
     user: root
     volumes:
       - ./specsheet.yaml:/main/specsheet.yaml #copy the spec over to /main/specs/YOUR_SPEC_NAME
@@ -22,14 +23,15 @@ services:
         apk add --update git g++ &&
         git clone -b datajoint_pipeline https://github.com/SainsburyWellcomeCentre/aeon_mecha.git &&
         pip install -e ./aeon_mecha &&
-        gunicorn --bind 0.0.0.0:$${PHARUS_PORT} pharus.server:app
+        gunicorn --bind 0.0.0.0:$${PHARUS_PORT} --workers=3 pharus.server:app
+
     # ports:
     # - "5000:5000"
     networks:
       - main
   sci-viz:
     cpus: 2.0
-    mem_limit: 16g
+    mem_limit: 4g
     image: jverswijver/sci-viz:2.3.3-hotfix3
     environment:
       - CHOKIDAR_USEPOLLING=true

diff --git a/aeon/dj_pipeline/webapps/sciviz/specsheet.yaml b/aeon/dj_pipeline/webapps/sciviz/specsheet.yaml
@@ -454,8 +454,8 @@ SciViz:
               width: 2
               type: slideshow:aeon
               route: /videostream_video_streamer
-              batch_size: 3
-              chunk_size: 50
+              batch_size: 6
+              chunk_size: 30
               buffer_size: 30
               max_FPS: 50
               channels: