Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions .github/workflows/action-recognition.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
name: Action Recognition
on:
push:
branches: [ main ]
tags: [ "preprocessor-action-recognition-[0-9]+.[0-9]+.[0-9]+" ]
paths: [ "preprocessors/action-recognition/**" ]
pull_request:
branches: [ main ]
paths: [ "preprocessors/action-recognition/**" ]
workflow_run:
workflows: [ "Schemas (Trigger)" ]
types:
- completed
workflow_dispatch:

# push:
# branches: [ main ]
# tags: [ "preprocessor-action-recognition-[0-9]+.[0-9]+.[0-9]+" ]
# paths: [ "preprocessors/action-recognition/**" ]
# pull_request:
# branches: [ main ]
# paths: [ "preprocessors/action-recognition/**" ]
# workflow_run:
# workflows: [ "Schemas (Trigger)" ]
# types:
# - completed
env:
REGISTRY: ghcr.io
IMAGE_NAME: shared-reality-lab/image-preprocessor-action-recognition
Expand Down
23 changes: 12 additions & 11 deletions .github/workflows/svg-action-handler.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
name: Action Recognition Handler
on:
push:
branches: [ main ]
tags: [ "handler-svg-action-recognition-[0-9]+.[0-9]+.[0-9]+" ]
paths: [ "handlers/svg-action-recognition/**" ]
pull_request:
branches: [ main ]
paths: [ "handlers/svg-action-recognition/**" ]
workflow_run:
workflows: [ "Schemas (Trigger)" ]
types:
- completed
workflow_dispatch:

# push:
# branches: [ main ]
# tags: [ "handler-svg-action-recognition-[0-9]+.[0-9]+.[0-9]+" ]
# paths: [ "handlers/svg-action-recognition/**" ]
# pull_request:
# branches: [ main ]
# paths: [ "handlers/svg-action-recognition/**" ]
# workflow_run:
# workflows: [ "Schemas (Trigger)" ]
# types:
# - completed
env:
REGISTRY: ghcr.io
IMAGE_NAME: shared-reality-lab/image-handler-svg-action-recognition
Expand Down
11 changes: 0 additions & 11 deletions build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -227,12 +227,6 @@ services:
context: .
dockerfile: ./handlers/svg-semantic-seg/Dockerfile
image: "semseg-svg:latest"
action-recognition:
build:
context: .
dockerfile: ./preprocessors/action-recognition/Dockerfile
image: "action-recognition:latest"

high-charts-handler:
build:
context: .
Expand Down Expand Up @@ -273,11 +267,6 @@ services:
context: .
dockerfile: ./preprocessors/nominatim/Dockerfile
image: "nominatim-preprocessor:latest"
svg-action-recognition:
build:
context: .
dockerfile: ./handlers/svg-action-recognition/Dockerfile
image: "svg-action-recognition:latest"
text-followup-handler:
build:
context: .
Expand Down
31 changes: 1 addition & 30 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ services:
labels:
ca.mcgill.a11y.image.handler: enable
ca.mcgill.a11y.image.required_dependencies: "semantic-segmentation,object-grouping,object-detection,graphic-caption"
ca.mcgill.a11y.image.optional_dependencies: "action-recognition,collage-detector-preprocessor,graphic-tagger"
ca.mcgill.a11y.image.optional_dependencies: "collage-detector-preprocessor,graphic-tagger"
volumes:
- sc-store:/tmp/sc-store
environment:
Expand Down Expand Up @@ -508,25 +508,6 @@ services:
environment:
- PII_LOGGING_ENABLED=${PII_LOGGING_ENABLED}

action-recognition:
profiles: [test, default]
image: ghcr.io/shared-reality-lab/image-preprocessor-action-recognition:${REGISTRY_TAG}
restart: "no"
labels:
ca.mcgill.a11y.image.preprocessor: 4
ca.mcgill.a11y.image.port: 5000
ca.mcgill.a11y.image.cacheTimeout: 3600
ca.mcgill.a11y.image.required_dependencies: ""
ca.mcgill.a11y.image.optional_dependencies: "object-detection"
deploy:
resources:
reservations:
devices:
- driver: nvidia
capabilities: ["gpu", "utility", "compute"]
environment:
- PII_LOGGING_ENABLED=${PII_LOGGING_ENABLED}

ocr-handler:
profiles: [test, default]
image: ghcr.io/shared-reality-lab/image-handler-ocr:${REGISTRY_TAG}
Expand Down Expand Up @@ -580,16 +561,6 @@ services:
ca.mcgill.a11y.image.optional_dependencies: ""
environment:
- PII_LOGGING_ENABLED=${PII_LOGGING_ENABLED}

svg-action-recognition-handler:
profiles: [test, default]
image: ghcr.io/shared-reality-lab/image-handler-svg-action-recognition:${REGISTRY_TAG}
labels:
ca.mcgill.a11y.image.handler: enable
ca.mcgill.a11y.image.required_dependencies: "object-detection,action-recognition"
ca.mcgill.a11y.image.optional_dependencies: ""
environment:
- PII_LOGGING_ENABLED=${PII_LOGGING_ENABLED}

monarch-link-app:
profiles: [production, test, default]
Expand Down
9 changes: 0 additions & 9 deletions test-docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,6 @@ services:
device_ids: ['0']
capabilities: ["gpu", "utility", "compute"]

action-recognition:
deploy:
resources:
reservations:
devices:
- driver: nvidia
device_ids: ['0']
capabilities: ["gpu", "utility", "compute"]

object-detection:
deploy:
resources:
Expand Down