Skip to content
This repository has been archived by the owner on Nov 16, 2023. It is now read-only.

Commit

Permalink
Merge pull request #213 from linkernetworks/linker
Browse files Browse the repository at this point in the history 
Update Factory (Installer updated to v0.1.35, supports vpu now)
  • Loading branch information
@initmahesh
initmahesh authored Oct 28, 2020
2 parents 927593c + 6095816 commit 598afc2
Show file tree
Hide file tree
Showing 62 changed files with 800 additions and 517 deletions.
118 changes: 85 additions & 33 deletions factory-ai-vision/EdgeSolution/deployment.cpu.arm64v8.template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@
"createOptions": {
"HostConfig": {
"PortBindings": {
"8080/tcp": [
"8181/tcp": [
{
"HostPort": "8080"
"HostPort": "8181"
}
]
}
Expand All @@ -89,41 +89,26 @@
"ENDPOINT": {
"value": "$CUSTOM_VISION_ENDPOINT"
},
"DBNAME": { "value": "vision_on_edge" },
"DBHOST": { "value": "172.18.0.1" },
"DBUSER": { "value": "vision_on_edge" },
"DBPASS": { "value": "vision_on_edge" },
"DF_INFERENECE_IS_GPU": { "value": false }
"DBNAME": {
"value": "vision_on_edge"
},
"DBHOST": {
"value": "172.18.0.1"
},
"DBUSER": {
"value": "vision_on_edge"
},
"DBPASS": {
"value": "vision_on_edge"
},
"DF_INFERENECE_IS_GPU": {
"value": false
}
},
"settings": {
"image": "${MODULES.WebModule.arm64v8-ubuntu}"
}
},
"WebDBModule": {
"version": "1.0",
"type": "docker",
"status": "running",
"restartPolicy": "always",
"env": {
"POSTGRES_PASSWORD": { "value": "vision_on_edge" },
"POSTGRES_USER": { "value": "vision_on_edge" },
"POSTGRES_DB": { "value": "vision_on_edge" }
},
"settings": {
"image": "${MODULES.WebDBModule.arm64v8}",
"createOptions": {
"HostConfig": {
"PortBindings": {
"5432/tcp": [
{
"HostPort": "5432"
}
]
}
}
}
}
},
"InferenceModule": {
"version": "1.0",
"type": "docker",
Expand Down Expand Up @@ -157,6 +142,54 @@
}
}
}
},
"lvaEdge": {
"version": "1.0",
"type": "docker",
"status": "running",
"restartPolicy": "always",
"settings": {
"image": "mcr.microsoft.com/media/live-video-analytics:1.0.4",
"createOptions": {
"HostConfig": {
"LogConfig": {
"Type": "",
"Config": {
"max-size": "10m",
"max-file": "10"
}
},
"IpcMode": "host"
}
}
}
},
"rtspsim": {
"version": "1.0",
"type": "docker",
"status": "running",
"restartPolicy": "always",
"settings": {
"image": "${MODULES.RtspSimModule}",
"createOptions": {
"HostConfig": {
"LogConfig": {
"Type": "",
"Config": {
"max-size": "10m",
"max-file": "10"
}
},
"PortBindings": {
"554/tcp": [
{
"HostPort": "554"
}
]
}
}
}
}
}
}
}
Expand All @@ -165,7 +198,8 @@
"properties.desired": {
"schemaVersion": "1.0",
"routes": {
"metrics": "FROM /messages/modules/InferenceModule/outputs/metrics INTO $upstream"
"metrics": "FROM /messages/modules/InferenceModule/outputs/metrics INTO $upstream",
"InferenceToLVA": "FROM /messages/modules/InferenceModule/outputs/InferenceToLVA INTO BrokeredEndpoint(\"/modules/lvaEdge/inputs/recordingTrigger\")"
},
"storeAndForwardConfiguration": {
"timeToLiveSecs": 7200
Expand All @@ -177,6 +211,24 @@
},
"VisionSampleModule": {
"properties.desired": {}
},
"lvaEdge": {
"properties.desired": {
"applicationDataDirectory": "/var/media",
"azureMediaServicesArmId": "/subscriptions/$SUBSCRIPTION_ID/resourcegroups/$RESOURCE_GROUP/providers/microsoft.media/mediaservices/$SERVICE_NAME",
"aadTenantId": "$TENANT_ID",
"aadServicePrincipalAppId": "$SERVICE_PRINCIPAL_APP_ID",
"aadServicePrincipalSecret": "$SERVICE_PRINCIPAL_SECRET",
"aadEndpoint": "https://login.microsoftonline.com",
"aadResourceId": "https://management.core.windows.net/",
"armEndpoint": "https://management.azure.com/",
"diagnosticsEventsOutputName": "AmsDiagnostics",
"operationalEventsOutputName": "AmsOperational",
"logLevel": "Information",
"logCategories": "Application,Events",
"allowUnsecuredEndpoints": true,
"telemetryOptOut": false
}
}
}
}
2 changes: 1 addition & 1 deletion factory-ai-vision/EdgeSolution/deployment.cpu.opencv.backend_only.template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"PortBindings": {
"8181/tcp": [
{
"HostPort": "8080"
"HostPort": "8181"
}
]
}
Expand Down
20 changes: 0 additions & 20 deletions factory-ai-vision/EdgeSolution/deployment.cpu.opencv.template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,26 +137,6 @@
}
}
},
"WebDBModule": {
"version": "1.0",
"type": "docker",
"status": "running",
"restartPolicy": "always",
"env": {
"POSTGRES_PASSWORD": {
"value": "vision_on_edge"
},
"POSTGRES_USER": {
"value": "vision_on_edge"
},
"POSTGRES_DB": {
"value": "vision_on_edge"
}
},
"settings": {
"image": "${MODULES.WebDBModule}"
}
},
"InferenceModule": {
"version": "1.0",
"type": "docker",
Expand Down
54 changes: 10 additions & 44 deletions factory-ai-vision/EdgeSolution/deployment.cpu.template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,9 @@
"DBPASS": {
"value": "vision_on_edge"
},
"DF_INFERENECE_IS_GPU": { "value": false }
"DF_INFERENECE_IS_GPU": {
"value": false
}
},
"settings": {
"image": "${MODULES.WebModule}",
Expand All @@ -132,44 +134,6 @@
}
}
},
"WebDBModule": {
"version": "1.0",
"type": "docker",
"status": "running",
"restartPolicy": "always",
"env": {
"POSTGRES_PASSWORD": {
"value": "vision_on_edge"
},
"POSTGRES_USER": {
"value": "vision_on_edge"
},
"POSTGRES_DB": {
"value": "vision_on_edge"
}
},
"settings": {
"image": "${MODULES.WebDBModule}",
"createOptions": {
"HostConfig": {
"LogConfig": {
"Type": "",
"Config": {
"max-size": "10m",
"max-file": "10"
}
},
"PortBindings": {
"5432/tcp": [
{
"HostPort": "5432"
}
]
}
}
}
}
},
"InferenceModule": {
"version": "1.0",
"type": "docker",
Expand Down Expand Up @@ -247,18 +211,20 @@
"settings": {
"image": "${MODULES.RtspSimModule}",
"createOptions": {
"HostConfig":{
"HostConfig": {
"LogConfig": {
"Type": "",
"Config": {
"max-size": "10m",
"max-file": "10"
}
},
"PortBindings":{
"554/tcp":[{
"HostPort":"554"
}]
"PortBindings": {
"554/tcp": [
{
"HostPort": "554"
}
]
}
}
}
Expand Down
Loading

0 comments on commit 598afc2

Please sign in to comment.