Merge pull request #1 from ravi9/2022.3.0

Update to OV 2022.3.0. Installs OV notebooks

Author: ravi9

add_cron_job.sh

@@ -2,5 +2,4 @@
 (
     crontab -l 2>/dev/null
     echo "@reboot su ec2-user -c \"/home/ec2-user/.start_jupyter.sh\" "
-    echo "@reboot su ec2-user -c \"/home/ec2-user/.start_dlworkbench.sh\" "
 ) | crontab -

ec2builder-component.yaml

@@ -1,5 +1,5 @@
 name: OpenVinoInstallDocument
-description: This is OpenVINO and DL workbench install document.
+description: This is OpenVINO and OpenVINO Notebooks install document.
 schemaVersion: 1.0
 
 phases:
@@ -9,15 +9,15 @@ phases:
         action: WebDownload
         maxAttempts: 3
         inputs:
-          - source: https://raw.githubusercontent.com/psakamoori/scripts/main/install-ov-dlw.sh
+          - source: https://raw.githubusercontent.com/ravi9/openvino-ami/2022.3.0/install-ov-notebooks.sh
             destination: /tmp/
             overwrite: true
             ignoreCertificateErrors: true
-      - name: InstallOpenVinoAndDlworkbench
+      - name: InstallOpenVinoNotebooks
         action: ExecuteBash
         inputs:
           commands:
-            - sudo su ec2-user -c "bash /tmp/install-ov-dlw.sh"
+            - sudo su ec2-user -c "bash /tmp/install-ov-notebooks.sh"
 
   - name: validate
     steps:

ec2builder-test-component.yaml

@@ -1,5 +1,5 @@
 name: OpenVinoInstallTestDocument
-description: This is OpenVINO and DL workbench installation testing document.
+description: This is OpenVINO and OpenVINO Notebooks install testing document.
 schemaVersion: 1.0
 
 phases:
@@ -9,11 +9,11 @@ phases:
         action: WebDownload
         maxAttempts: 3
         inputs:
-          - source: https://raw.githubusercontent.com/psakamoori/scripts/main/test-pip-ov-install.sh
+          - source: https://raw.githubusercontent.com/ravi9/openvino-ami/2022.3.0/test-pip-ov-install.sh
             destination: /tmp/
             overwrite: true
             ignoreCertificateErrors: true
-      - name: InstallOpenVinoAndDlworkbenchTest
+      - name: InstallOpenVinoNotebooksTest
         action: ExecuteBash
         inputs:
           commands:

install-ov-dlw.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+# Script to install following on Amazon Linux 2 EC2 instance
+# Intel OpenVINO (DEV) and its dependencies,
+# Jupyter Lab
+# Install OpenVINO_Notebooks https://github.com/openvinotoolkit/openvino_notebooks
+
+# Install dependencies
+sudo yum -y update &&
+sudo yum -y upgrade &&
+sudo yum -y groupinstall "Development Tools" &&
+sudo yum install -y python3 python3-devel.x86_64 mesa-libGL
+
+sudo ln -s /usr/bin/pip3 /usr/bin/pip
+
+pip install --upgrade pip
+
+pip install jupyterlab ipywidgets virtualenv
+
+cd /home/ec2-user
+git clone --depth=1 https://github.com/openvinotoolkit/openvino_notebooks.git
+cd openvino_notebooks
+
+pip install -r requirements.txt
+
+# Install specific version of OPENCV
+OPENCV_VER=4.5.5.64
+pip install -U opencv-python-headless==$OPENCV_VER opencv-python==$OPENCV_VER
+
+# Name the ipython kernel to OpenVINO
+/usr/bin/python3 -m ipykernel install --user --name OpenVINO
+
+# Download scripts to start Jupyter
+curl https://raw.githubusercontent.com/psakamoori/scripts/main/start_jupyter.sh -o /home/ec2-user/.start_jupyter.sh
+
+# Give executable permissions to the scripts
+chmod 755 /home/ec2-user/.start_jupyter.sh
+
+# Add cronjob to start jupyter on start of the instance.
+curl https://raw.githubusercontent.com/psakamoori/scripts/main/add_cron_job.sh -o /home/ec2-user/.add_cron_job.sh
+
+sudo bash /home/ec2-user/.add_cron_job.sh

install-ov-notebooks.sh

@@ -0,0 +1,41 @@
+#!/bin/bash
+
+# Script to install following on Amazon Linux 2 EC2 instance
+# Intel OpenVINO (DEV) and its dependencies,
+# Jupyter Lab
+
+OV_VER=2022.3.0
+
+# Install dependencies and Docker
+sudo yum -y update &&
+sudo yum -y groupinstall "Development Tools"
+
+sudo ln -s /usr/bin/pip3 /usr/bin/pip
+
+# Install Python 3, Pip, Jupyterlab, OpenVINO and dependencies
+sudo yum install -y python3 &&
+    sudo yum install -y python3-devel.x86_64 &&
+    pip install --upgrade pip &&
+    pip install jupyterlab ipywidgets progress tqdm matplotlib scipy ipykernel virtualenv &&
+    pip install openvino-dev[pytorch,tensorflow2,onnx,mxnet]==$OV_VER
+
+# Install this specific version of CV and uninstall to bypass libgl errors.
+pip install -U opencv-python-headless==4.2.0.32 &&
+pip uninstall -y opencv-python
+
+# Clear pip cache
+pip cache purge
+
+# Name the ipython kernel to OpenVINO
+/usr/bin/python3 -m ipykernel install --user --name OpenVINO
+
+# Download scripts to start Jupyter
+curl https://raw.githubusercontent.com/psakamoori/scripts/$OV_VER/start_jupyter.sh -o /home/ec2-user/.start_jupyter.sh
+
+# Give executable permissions to the scripts
+chmod 755 /home/ec2-user/.start_jupyter.sh
+
+# Add cronjob to start jupyter on start of the instance.
+curl https://raw.githubusercontent.com/psakamoori/scripts/$OV_VER/add_cron_job.sh -o /home/ec2-user/.add_cron_job.sh
+
+sudo bash /home/ec2-user/.add_cron_job.sh