Merge pull request #109 from Azure-Samples/yadavm_factoryai

Yadavm factoryai

Author: initmahesh

factory-ai-vision/.gitignore

@@ -49,7 +49,7 @@ MANIFEST
 # PyInstaller
 #  Usually these files are written by a python script from a template
 #  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
+#*.manifest
 *.spec
 
 # Installer logs

factory-ai-vision/10

@@ -0,0 +1 @@
+This will take  min at normal connection speeds.  Status can be checked on the Azure Stack Edge device

factory-ai-vision/EdgeSolution/deployment.cpu.template.json

@@ -88,7 +88,18 @@
             "restartPolicy": "always",
             "settings": {
               "image": "${MODULES.InferenceModule.cpuamd64}",
-              "createOptions": "{\"HostConfig\":{\"Binds\":[\"/tmp/.X11-unix:/tmp/.X11-unix\",\"/dev:/dev\"],\"NetworkMode\":\"host\",\"IpcMode\":\"host\",\"Privileged\":true},\"NetworkingConfig\":{\"EndpointsConfig\":{\"host\":{}}},\"Env\":[\"DISPLAY=:0\"]}"
+              "createOptions": {
+                "HostConfig": {
+                  "NetworkMode": "host",
+                  "runtime": "runc"
+                },
+                "NetworkingConfig": {
+                  "EndpointsConfig": {
+                    "host": {}
+                  }
+                },
+                "Env": ["DISPLAY=:0"]
+              }
             }
           }
         }
@@ -97,7 +108,9 @@
     "$edgeHub": {
       "properties.desired": {
         "schemaVersion": "1.0",
-        "routes": {},
+        "routes": {
+          "metrics": "FROM /messages/modules/InferenceModule/outputs/metrics INTO $upstream"
+        },
         "storeAndForwardConfiguration": {
           "timeToLiveSecs": 7200
         }

factory-ai-vision/EdgeSolution/deployment.gpu.template.json

@@ -88,7 +88,17 @@
             "restartPolicy": "always",
             "settings": {
               "image": "${MODULES.InferenceModule.gpuamd64}",
-              "createOptions": "{\"HostConfig\":{\"Binds\":[\"/tmp/.X11-unix:/tmp/.X11-unix\",\"/dev:/dev\"],\"NetworkMode\":\"host\",\"IpcMode\":\"host\",\"Privileged\":true},\"NetworkingConfig\":{\"EndpointsConfig\":{\"host\":{}}},\"Env\":[\"DISPLAY=:0\"]}"
+              "createOptions": {
+                "HostConfig": {
+                  "NetworkMode": "host",
+                  "runtime": "nvidia"
+                },
+                "NetworkingConfig": {
+                  "EndpointsConfig": {
+                    "host": {}
+                  }
+                }
+              }
             }
           }
         }
@@ -97,7 +107,9 @@
     "$edgeHub": {
       "properties.desired": {
         "schemaVersion": "1.0",
-        "routes": {},
+        "routes": {
+          "metrics": "FROM /messages/modules/InferenceModule/outputs/metrics INTO $upstream"
+        },
         "storeAndForwardConfiguration": {
           "timeToLiveSecs": 7200
         }

factory-ai-vision/EdgeSolution/modules/InferenceModule/.gitignore

@@ -28,7 +28,7 @@ MANIFEST
 # PyInstaller
 #  Usually these files are written by a python script from a template
 #  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
+#*.manifest
 *.spec
 
 # Installer logs

factory-ai-vision/EdgeSolution/modules/InferenceModule/Dockerfile.cpuamd64

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/azureml/onnxruntime:latest-openvino-cpu
+FROM mcr.microsoft.com/azureml/onnxruntime:latest
 
 WORKDIR /app
 
@@ -29,6 +29,7 @@ COPY object_detection.py ./
 COPY utility.py ./
 COPY default_model/cvexport.manifest default_model/
 COPY default_model default_model/
+COPY default_model_6parts default_model_6parts/
 COPY sample_video sample_video/
 RUN chmod 777 sample_video/video.mp4
 RUN chmod 777 default_model

factory-ai-vision/EdgeSolution/modules/InferenceModule/Dockerfile.gpuamd64

@@ -27,23 +27,27 @@ ENV LC_ALL en_US.UTF-8
 ARG DEVICE
 
 #Upgradin CUDA to 10.2
-RUn sudo apt-get install -y software-properties-common
-RUN wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1604/x86_64/cuda-ubuntu1604.pin
-RUN sudo mv cuda-ubuntu1604.pin /etc/apt/preferences.d/cuda-repository-pin-600
-RUN sudo apt-key adv --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1604/x86_64/7fa2af80.pub
-RUN sudo add-apt-repository "deb http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1604/x86_64/ /"
-RUN sudo apt-get update
-RUN sudo apt-get -y install cuda
+#RUN sudo apt-get install -y software-properties-common
+#RUN wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1604/x86_64/cuda-ubuntu1604.pin
+#RUN sudo mv cuda-ubuntu1604.pin /etc/apt/preferences.d/cuda-repository-pin-600
+#RUN sudo apt-key adv --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1604/x86_64/7fa2af80.pub
+#RUN sudo add-apt-repository "deb http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1604/x86_64/ /"
+#RUN sudo apt-get update
+#RUN sudo apt-get -y install cuda
 
 COPY requirements.txt ./
-RUN pip install -r requirements.txt && \
+RUN pip install --upgrade pip
+RUN pip install -U certifi --ignore-installed
+RUN pip install -r requirements.txt --ignore-installed && \
     pip install flask opencv-python onnx
+RUN pip install onnxruntime-gpu
 
 COPY main.py ./
 COPY object_detection.py ./
 COPY utility.py ./
 COPY default_model/cvexport.manifest default_model/
 COPY default_model default_model/
+COPY default_model_6parts default_model_6parts/
 COPY sample_video sample_video/
 RUN chmod 777 sample_video/video.mp4
 RUN chmod 777 default_model

factory-ai-vision/EdgeSolution/modules/InferenceModule/default_model_6parts/labels.txt

@@ -0,0 +1,6 @@
+Barrel
+Bottle
+Box
+Hammer
+Plastic bag
+Screwdriver