Merge pull request #2 from ravi9/2023.1.0

Update to 2023.1.0

Author: ravi9

README.md

@@ -1,2 +1,3 @@
-# scripts
-Install scripts for Intel tools and sdks
+# OpenVINO AMI Setup
+
+This repo contains scripts to install OpenVINO notebooks in AWS using EC2 Builder.

install-ov-notebooks.sh

@@ -1,34 +1,28 @@
 #!/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
+# Script to install OpenVINO_Notebooks on Amazon Linux 2023 based EC2 instance
+# 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
+sudo yum install -y git-all mesa-libGL
 
+# Create Python Virtual Env and install OV Notebooks
 cd /home/ec2-user
+source /home/ec2-user/.bashrc
+python3 -m venv openvino_env
+source openvino_env/bin/activate
+export PATH=/home/ec2-user/openvino_env/bin:/home/ec2-user/.local/bin:/home/ec2-user/bin:/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin:$PATH
 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
+# Install OpenVINO Notebook dependencies.
+/home/ec2-user/openvino_env/bin/pip install -r requirements.txt
 
 # Name the ipython kernel to OpenVINO
-/usr/bin/python3 -m ipykernel install --user --name OpenVINO
+/home/ec2-user/openvino_env/bin/python -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

start_jupyter.sh

@@ -10,9 +10,20 @@ curl -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-da
 # Setup the ec2-user environment
 cd /home/ec2-user
 source /home/ec2-user/.bashrc
-export PATH=/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/home/ec2-user/.local/bin:/home/ec2-user/bin:$PATH
-
+source /home/ec2-user/openvino_env/bin/activate
+export PATH=/home/ec2-user/openvino_env/bin:/home/ec2-user/.local/bin:/home/ec2-user/bin:/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin:$PATH
 export TF_ENABLE_ONEDNN_OPTS=1
 
 # Start Jupyter Notebook server with $INSTANCE_ID as the password
-/home/ec2-user/.local/bin/jupyter lab --no-browser --NotebookApp.allow_password_change=False --NotebookApp.token="$INSTANCE_ID" --ip 0.0.0.0 --port 8888 >/tmp/jupyter.log 2>&1 &
+cd /home/ec2-user/openvino_notebooks
+
+/home/ec2-user/.local/bin/jupyter lab \
+--no-browser \
+--NotebookApp.allow_password_change=False \
+--NotebookApp.token="$INSTANCE_ID" \
+--ip 0.0.0.0 \
+--port 8888 &
+
+# For debugging
+#--port 8888 >/tmp/jupyter.log 2>&1 &
+

test-pip-ov-install.sh

@@ -1,30 +1,12 @@
 #!/bin/bash
 
-# Test script which tests: omz_downloader, omz_converter, benchmark_app, mo, OpenVINO Python imports.
+# Test script which tests: OpenVINO Python imports.
 
 # Path where all the pip-installed OpenVINO binaries
-BIN_PREFIX=/home/ec2-user/.local/bin/
-
-# Download googlenet-v1-tf model from OpenVINO Model Zoo (OMZ)
-$BIN_PREFIX/omz_downloader --name googlenet-v1-tf
-
-# Convert googlenet-v1-tf model to OpenVINO IR
-$BIN_PREFIX/omz_converter --name googlenet-v1-tf
-
-# Benchmark googlenet-v1-tf model with OpenVINO Benchmark App...¶
-$BIN_PREFIX/benchmark_app -m public/googlenet-v1-tf/FP32/googlenet-v1-tf.xml -niter 1
-
-# Test with model optimizer
-$BIN_PREFIX/mo \
-    --framework=tf \
-    --data_type FP32 \
-    --output_dir ./public/googlenet-v1-tf/FP32 \
-    --model_name=googlenet-v1-tf \
-    --input_shape=[1,224,224,3] \
-    --input_model ./public/googlenet-v1-tf/inception_v1.frozen.pb
+BIN_PREFIX=/home/ec2-user/openvino_env/bin/
 
 ## Test Python Imports
 
-python3 -c "from openvino.inference_engine import IENetwork, IECore, get_version as get_ov_version; print('openvino version: ' + get_ov_version())"
+$BIN_PREFIX/python -c "import openvino as ov; print('OpenVINO Version: ' + ov.runtime.get_version())"
 
-python3 -c "from openvino.tools.benchmark.main import main"
+$BIN_PREFIX/python -c "from openvino.tools.benchmark.main import main"