From b1f84c5ece31c5bd8f78b71775b2090fce4663f6 Mon Sep 17 00:00:00 2001 From: MCamp859 Date: Tue, 30 Oct 2018 14:53:01 -0400 Subject: [PATCH 01/17] =?UTF-8?q?Added=20details=20to=20=E2=80=9CInstall?= =?UTF-8?q?=20pod=20network=20add-on=E2=80=9D=20section.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: MCamp859 --- source/clear-linux/tutorials/kubernetes.rst | 31 ++++++++++++++++++--- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/source/clear-linux/tutorials/kubernetes.rst b/source/clear-linux/tutorials/kubernetes.rst index ca53bc4f..6e73d3a7 100644 --- a/source/clear-linux/tutorials/kubernetes.rst +++ b/source/clear-linux/tutorials/kubernetes.rst @@ -203,13 +203,36 @@ communicate. Check whether or not your add-on requires special flags when you initialize the master control plane. For example, if you choose the `flannel` add-on, -then you must add :command:`--pod-network-cidr 10.244.0.0/16` to the `kubeadm -init` command. +then you must add the following to the `kubeadm init` command: -Similarly, if you choose the `weave` add-on, then you must change the CNI -add-on directory parameter because the weave plugin installs itself in the +.. code-block:: bash + + --pod-network-cidr 10.244.0.0/16 + +Similarly, if you choose the `weave` add-on, then you must make the following +changes because the weave plugin installs itself in the :file:`/opt/cni/bin` directory. +If you are using Docker and `weave`, edit the :file:`kubeadm.conf` file to +add: + +.. code-block:: bash + + Environment="KUBELET_NETWORK_ARGS=--network-plugin=cni --cni-conf-dir=/etc/cni/net.d --cni-bin-dir=/opt/cni/bin" + +If you are using CRI-O and `weave`, edit the :file:`etc/crio/crio.conf` file +to change `plugin_dir` from: + +.. code-block:: bash + + plugin_dir = "/usr/libexec/cni/" + +to: + +.. code-block:: bash + + plugin_dir = "/opt/cni/bin" + Use your cluster **************** From 4e0c79ffae0a533fabee221af0cd2bf477701519 Mon Sep 17 00:00:00 2001 From: MCamp859 Date: Wed, 31 Oct 2018 11:47:26 -0400 Subject: [PATCH 02/17] =?UTF-8?q?Edited=20details=20in=20=E2=80=9CInstall?= =?UTF-8?q?=20pod=20network=20add-on=E2=80=9D=20section.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: MCamp859 --- source/clear-linux/tutorials/kubernetes.rst | 35 +++++++++++++++------ 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/source/clear-linux/tutorials/kubernetes.rst b/source/clear-linux/tutorials/kubernetes.rst index 6e73d3a7..76e6529e 100644 --- a/source/clear-linux/tutorials/kubernetes.rst +++ b/source/clear-linux/tutorials/kubernetes.rst @@ -210,7 +210,7 @@ then you must add the following to the `kubeadm init` command: --pod-network-cidr 10.244.0.0/16 Similarly, if you choose the `weave` add-on, then you must make the following -changes because the weave plugin installs itself in the +changes because the weave-net plugin installs itself in the :file:`/opt/cni/bin` directory. If you are using Docker and `weave`, edit the :file:`kubeadm.conf` file to @@ -220,18 +220,33 @@ add: Environment="KUBELET_NETWORK_ARGS=--network-plugin=cni --cni-conf-dir=/etc/cni/net.d --cni-bin-dir=/opt/cni/bin" -If you are using CRI-O and `weave`, edit the :file:`etc/crio/crio.conf` file -to change `plugin_dir` from: +If you are using CRI-O and `weave`, you must complete the following steps. + +#. Edit the :file:`/etc/crio/crio.conf` file to change `plugin_dir` from: + + .. code-block:: bash + + plugin_dir = "/usr/libexec/cni/" + + to: + + .. code-block:: bash + + plugin_dir = "/opt/cni/bin" + +#. Add the `loopback` CNI plugin to the plugin path with the command: + + .. code-block:: bash + + sudo ln -s /usr/libexec/cni/loopback /opt/cni/bin/loopback + +If you are using CRI-O and `flannel` and you want to use Kata Containers, edit +the :file:`/etc/crio/crio.conf` file to add: .. code-block:: bash - plugin_dir = "/usr/libexec/cni/" - -to: - -.. code-block:: bash - - plugin_dir = "/opt/cni/bin" + [crio.runtime] + manage_network_ns_lifecycle = true Use your cluster From 86a2b44d81b8ff637944b76a6598bb02bb724eca Mon Sep 17 00:00:00 2001 From: Tom Leavitt Date: Wed, 31 Oct 2018 10:33:54 -0700 Subject: [PATCH 03/17] update kvm curl command Update the command to download the latest kvm image --- source/clear-linux/get-started/virtual-machine-install/kvm.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/clear-linux/get-started/virtual-machine-install/kvm.rst b/source/clear-linux/get-started/virtual-machine-install/kvm.rst index ac192a9d..19846c20 100644 --- a/source/clear-linux/get-started/virtual-machine-install/kvm.rst +++ b/source/clear-linux/get-started/virtual-machine-install/kvm.rst @@ -55,7 +55,7 @@ Download and launch the virtual machine .. code-block:: bash - curl -O https://download.clearlinux.org/image/clear-$(curl https://download.clearlinux.org/latest)-kvm.img.xz + curl -O https://download.clearlinux.org/image/clear-$(curl https://download.clearlinux.org/image/latest-images | grep '[0-9]'-kvm) #. Uncompress the downloaded image: From 86e3645465d3907b18e3091a3a5504db4fb1fbbc Mon Sep 17 00:00:00 2001 From: Tom Leavitt Date: Wed, 31 Oct 2018 10:41:18 -0700 Subject: [PATCH 04/17] curl update for live image update curl command to download the latest live image --- .../get-started/virtual-machine-install/virtualbox.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/clear-linux/get-started/virtual-machine-install/virtualbox.rst b/source/clear-linux/get-started/virtual-machine-install/virtualbox.rst index 3765aa8b..a526f7a8 100644 --- a/source/clear-linux/get-started/virtual-machine-install/virtualbox.rst +++ b/source/clear-linux/get-started/virtual-machine-install/virtualbox.rst @@ -38,7 +38,7 @@ Create a virtual machine in VirtualBox .. code-block:: bash - curl -O https://download.clearlinux.org/image/clear-$(curl https://download.clearlinux.org/latest)-live.img.xz + curl -O https://download.clearlinux.org/image/$(curl https://download.clearlinux.org/image/latest-images | grep live) #. Decompress the downloaded image. Uncompressed image size is ~ **5GB**. @@ -193,4 +193,4 @@ To enable Hyper-V again, you should execute:: .. _VirtualBox hypervisor: https://www.virtualbox.org/ .. _latest: https://download.clearlinux.org/image/ .. _7zip: http://www.7-zip.org/ -.. _Virtualization Technology: https://www.intel.com/content/www/us/en/virtualization/virtualization-technology/intel-virtualization-technology.html \ No newline at end of file +.. _Virtualization Technology: https://www.intel.com/content/www/us/en/virtualization/virtualization-technology/intel-virtualization-technology.html From c692fbfd8ff561d03ad01b7768833d73007edf77 Mon Sep 17 00:00:00 2001 From: Tom Leavitt Date: Wed, 31 Oct 2018 10:42:26 -0700 Subject: [PATCH 05/17] update kvm image typo fixed typo of filename --- source/clear-linux/get-started/virtual-machine-install/kvm.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/clear-linux/get-started/virtual-machine-install/kvm.rst b/source/clear-linux/get-started/virtual-machine-install/kvm.rst index 19846c20..718bd559 100644 --- a/source/clear-linux/get-started/virtual-machine-install/kvm.rst +++ b/source/clear-linux/get-started/virtual-machine-install/kvm.rst @@ -55,7 +55,7 @@ Download and launch the virtual machine .. code-block:: bash - curl -O https://download.clearlinux.org/image/clear-$(curl https://download.clearlinux.org/image/latest-images | grep '[0-9]'-kvm) + curl -O https://download.clearlinux.org/image/$(curl https://download.clearlinux.org/image/latest-images | grep '[0-9]'-kvm) #. Uncompress the downloaded image: From fce6846e5c1b4340d43eaf6c599ead6adec03be2 Mon Sep 17 00:00:00 2001 From: Tom Leavitt Date: Wed, 31 Oct 2018 10:46:51 -0700 Subject: [PATCH 06/17] update vmware curl command Update the curl command to download the correct vmware image --- .../get-started/virtual-machine-install/vmw-player-preconf.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/clear-linux/get-started/virtual-machine-install/vmw-player-preconf.rst b/source/clear-linux/get-started/virtual-machine-install/vmw-player-preconf.rst index 1355506c..0af68bd7 100644 --- a/source/clear-linux/get-started/virtual-machine-install/vmw-player-preconf.rst +++ b/source/clear-linux/get-started/virtual-machine-install/vmw-player-preconf.rst @@ -64,7 +64,7 @@ this command: .. code-block:: bash - curl -O https://download.clearlinux.org/image/clear-$(curl https://download.clearlinux.org/latest)-vmware.vmdk.xz + curl -O https://download.clearlinux.org/image/$(curl https://download.clearlinux.org/image/latest-images | grep vmware) Visit :ref:`image-types` for additional information about all available |CL| images. From 5098d6de323ad3b795c455a18e839b82e3c99bec Mon Sep 17 00:00:00 2001 From: Tom Leavitt Date: Wed, 31 Oct 2018 10:49:34 -0700 Subject: [PATCH 07/17] curl-vmware2-update update the curl script to download correct file --- .../vmware-esxi-preconfigured-cl-image.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/clear-linux/get-started/virtual-machine-install/vmware-esxi-preconfigured-cl-image.rst b/source/clear-linux/get-started/virtual-machine-install/vmware-esxi-preconfigured-cl-image.rst index a1d84fa3..eb1ee92d 100644 --- a/source/clear-linux/get-started/virtual-machine-install/vmware-esxi-preconfigured-cl-image.rst +++ b/source/clear-linux/get-started/virtual-machine-install/vmware-esxi-preconfigured-cl-image.rst @@ -36,7 +36,7 @@ this command: .. code-block:: bash - curl -O https://download.clearlinux.org/image/clear-$(curl https://download.clearlinux.org/latest)-vmware.vmdk.xz + curl -O https://download.clearlinux.org/image/$(curl https://download.clearlinux.org/image/latest-images | grep vmware) Visit :ref:`image-types` for additional information about all available |CL| images. From 1d04a16d61ccfac791e148d03773819186efa37a Mon Sep 17 00:00:00 2001 From: MCamp859 Date: Thu, 1 Nov 2018 10:34:53 -0400 Subject: [PATCH 08/17] =?UTF-8?q?Added=20more=20details=20in=20=E2=80=9CIn?= =?UTF-8?q?stall=20pod=20network=20add-on=E2=80=9D=20section.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: MCamp859 --- source/clear-linux/tutorials/kubernetes.rst | 30 ++++++++++++--------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/source/clear-linux/tutorials/kubernetes.rst b/source/clear-linux/tutorials/kubernetes.rst index 76e6529e..999e1503 100644 --- a/source/clear-linux/tutorials/kubernetes.rst +++ b/source/clear-linux/tutorials/kubernetes.rst @@ -199,17 +199,29 @@ Install pod network add-on ************************** You must choose and install a `pod network add-on`_ to allow your pods to -communicate. +communicate. Check whether or not your add-on requires special flags when you +initialize the master control plane. -Check whether or not your add-on requires special flags when you initialize -the master control plane. For example, if you choose the `flannel` add-on, -then you must add the following to the `kubeadm init` command: +**Notes about flannel add-on** + +If you choose the `flannel` add-on, then you must add the following to the +`kubeadm init` command: .. code-block:: bash --pod-network-cidr 10.244.0.0/16 -Similarly, if you choose the `weave` add-on, then you must make the following +If you are using CRI-O and `flannel` and you want to use Kata Containers, edit +the :file:`/etc/crio/crio.conf` file to add: + +.. code-block:: bash + + [crio.runtime] + manage_network_ns_lifecycle = true + +**Notes about weave add-on** + +If you choose the `weave` add-on, then you must make the following changes because the weave-net plugin installs itself in the :file:`/opt/cni/bin` directory. @@ -240,14 +252,6 @@ If you are using CRI-O and `weave`, you must complete the following steps. sudo ln -s /usr/libexec/cni/loopback /opt/cni/bin/loopback -If you are using CRI-O and `flannel` and you want to use Kata Containers, edit -the :file:`/etc/crio/crio.conf` file to add: - -.. code-block:: bash - - [crio.runtime] - manage_network_ns_lifecycle = true - Use your cluster **************** From d2603e5aecd49d602a8e4dc17bf16a3abe4bf4ba Mon Sep 17 00:00:00 2001 From: MCamp859 Date: Thu, 1 Nov 2018 10:40:25 -0400 Subject: [PATCH 09/17] =?UTF-8?q?Edited=20more=20details=20in=20=E2=80=9CI?= =?UTF-8?q?nstall=20pod=20network=20add-on=E2=80=9D=20section.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: MCamp859 --- source/clear-linux/tutorials/kubernetes.rst | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/source/clear-linux/tutorials/kubernetes.rst b/source/clear-linux/tutorials/kubernetes.rst index 999e1503..b5761750 100644 --- a/source/clear-linux/tutorials/kubernetes.rst +++ b/source/clear-linux/tutorials/kubernetes.rst @@ -219,20 +219,19 @@ the :file:`/etc/crio/crio.conf` file to add: [crio.runtime] manage_network_ns_lifecycle = true -**Notes about weave add-on** +**Notes about Weave Net add-on** -If you choose the `weave` add-on, then you must make the following -changes because the weave-net plugin installs itself in the -:file:`/opt/cni/bin` directory. +If you choose the `Weave Net` add-on, then you must make the following changes +because it installs itself in the :file:`/opt/cni/bin` directory. -If you are using Docker and `weave`, edit the :file:`kubeadm.conf` file to +If you are using Docker and `Weave Net`, edit the :file:`kubeadm.conf` file to add: .. code-block:: bash Environment="KUBELET_NETWORK_ARGS=--network-plugin=cni --cni-conf-dir=/etc/cni/net.d --cni-bin-dir=/opt/cni/bin" -If you are using CRI-O and `weave`, you must complete the following steps. +If you are using CRI-O and `Weave Net`, you must complete the following steps. #. Edit the :file:`/etc/crio/crio.conf` file to change `plugin_dir` from: From e04f718fd268bde518032025248475bb12490aaa Mon Sep 17 00:00:00 2001 From: Kristal Dale Date: Thu, 1 Nov 2018 09:21:53 -0700 Subject: [PATCH 10/17] Re-enable show toctree. Update maxdepth to 1. Signed-off-by: Kristal Dale --- source/clear-linux/tutorials/tutorials.rst | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/source/clear-linux/tutorials/tutorials.rst b/source/clear-linux/tutorials/tutorials.rst index 6397dae9..e5d51254 100644 --- a/source/clear-linux/tutorials/tutorials.rst +++ b/source/clear-linux/tutorials/tutorials.rst @@ -5,16 +5,15 @@ Tutorials This section offers a range of tutorials that demonstrate: -* |CL-ATTR| features for cloud, client, distributed processing, and virtual environments +* |CL-ATTR| features for cloud, client, distributed processing, + and virtual environments * Use of |CL| with third-party tools * Development possibilities of |CL| with specific use cases Explore our tutorials to discover what you can do with |CL|! - .. toctree:: - :hidden: - :maxdepth: 2 + :maxdepth: 1 wordpress/wordpress flatpak/flatpak From 0d09f0a59f211cc09d28cefea3791299f974083b Mon Sep 17 00:00:00 2001 From: Kristal Dale Date: Thu, 1 Nov 2018 12:07:45 -0700 Subject: [PATCH 11/17] Correct broken link to next steps section (used old section title). Add Bundles as a related topic. Signed-off-by: Kristal Dale --- source/clear-linux/guides/maintenance/autospec.rst | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/source/clear-linux/guides/maintenance/autospec.rst b/source/clear-linux/guides/maintenance/autospec.rst index 8854d5ab..aa25a6cf 100644 --- a/source/clear-linux/guides/maintenance/autospec.rst +++ b/source/clear-linux/guides/maintenance/autospec.rst @@ -100,7 +100,7 @@ we build a new helloclear RPM. file:// #. If build failures or dependency issues occur, continue below. - Otherwise, skip directly to `Use your RPM`_. + Otherwise, skip directly to `Next steps`_. #. Navigate to the specific package. @@ -125,7 +125,7 @@ we build a new helloclear RPM. You've successfully created a RPM. -Skip to `Use your RPM`_ for next steps. +Skip to `Next steps`_. .. _build-source-code-with-existing-spec-file: @@ -152,7 +152,7 @@ method assumes that a spec file already exists. In this example, we run a You've successfully created a RPM. -Skip to `Use your RPM`_ for next steps. +Skip to `Next steps`_. .. _generate-a-new-spec-file: @@ -234,6 +234,7 @@ Related topics * :ref:`Mixer tool ` * :ref:`Mixin tool ` * :ref:`autospec ` +* :ref:`Bundles ` .. _rpm website: http://rpm.org From a083d600a885d9b9c8ca5fbeaa81185f3dfccc8c Mon Sep 17 00:00:00 2001 From: Michael Vincerra Date: Thu, 1 Nov 2018 15:03:09 -0700 Subject: [PATCH 12/17] Corrects Sphinx syntax errors for correct rendering. Signed-off-by: Michael Vincerra --- source/clear-linux/tutorials/greengrass.rst | 34 ++++++++++++--------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/source/clear-linux/tutorials/greengrass.rst b/source/clear-linux/tutorials/greengrass.rst index 1cef72c0..0d230a44 100644 --- a/source/clear-linux/tutorials/greengrass.rst +++ b/source/clear-linux/tutorials/greengrass.rst @@ -1,6 +1,6 @@ .. _greengrass: -Enable Greengrass and OpenVINO™ on |CL-ATTR| +Enable AWS Greengrass* and OpenVINO™ on |CL-ATTR| ########################################### Hardware accelerated Function-as-a-Service (FaaS) enables cloud developers @@ -15,7 +15,7 @@ edge devices with accelerators. This tutorial shows how to: * Set up the Intel® edge device with |CL-ATTR| -* Install the OpenVINO™ and AWS Greengrass software stacks +* Install the OpenVINO™ and AWS Greengrass* software stacks * Use AWS Greengrass and lambdas to deploy the FaaS samples from the cloud Supported Platforms @@ -31,10 +31,10 @@ The AWS Greengrass samples are located at the `Edge-Analytics-FaaS`_. We provide the following AWS Greengrass samples: -* :file:`greengrass_classification_sample.py` +* :file:`greengrass_classification_sample.py` This AWS Greengrass sample classifies a video stream using classification - networks such as AlexNet and GoogLeNet and publishes top-10 results on AWS + networks such as AlexNet and GoogLeNet and publishes top-10 results on AWS* IoT Cloud every second. * :file:`greengrass_object_detection_sample_ssd.py` @@ -56,7 +56,7 @@ Any custom pre-trained classification models can be used with the classification sample. For object detection, the sample models optimized for Intel® edge platforms -are present at :file:`/usr/share/openvino/models'. These models are provided +are present at :file:`/usr/share/openvino/models`. These models are provided as an example, but any custom pre-trained SSD models can be used with the object detection sample. @@ -86,7 +86,7 @@ For object detection using SqueezeNetSSD-5Class model, In these examples: -* is :file:`/usr/share/openvino/models +* is :file:`/usr/share/openvino/models` * is FP32 or FP16, depending on target device. @@ -122,8 +122,8 @@ services to use (see Greengrass user below). useradd passwd -#. Next, enable the :command:`sudo` command for your new ``. Add - `` to the `wheel` group: +#. Next, enable the :command:`sudo` command for your new ````. Add + ```` to the ``wheel`` group: .. code-block:: bash @@ -191,7 +191,8 @@ Creating and Packaging Lambda Functions .. note:: - This creates the tarball needed to create the AWS Greengrass environment on the edge device. + This creates the tarball needed to create the AWS Greengrass + environment on the edge device. #. Assure to download both the security resources and the AWS Greengrass core software. @@ -202,8 +203,9 @@ Creating and Packaging Lambda Functions #. Replace greengrassHelloWorld.py with Greengrass samples: - - greengrass_classification_sample.py - - greengrass_object_detection_sample_ssd.py + * greengrass_classification_sample.py + + * greengrass_object_detection_sample_ssd.py #. Zip these files with extracted Greengrass SDK folders from the previous step into :file:`greengrass_sample_python_lambda.zip`. @@ -211,18 +213,21 @@ Creating and Packaging Lambda Functions The zip should contain: * greengrasssdk + * greengrass sample For the sample, choose one of these: + - greengrass_classification_sample.py + - greengrass_object_detection_sample_ssd.py For example: .. code-block:: bash -zip -r greengrass_lambda.zip greengrasssdk -greengrass_object_detection_sample_ssd.py + zip -r greengrass_lambda.zip greengrasssdk + greengrass_object_detection_sample_ssd.py #. Follow steps 6-11 to `complete creating lambdas`_. @@ -250,10 +255,11 @@ configuring the lambda function for AWS Greengrass. #. In addition to the details mentioned in step 8, change the Memory limit to 2048MB to accommodate large input video streams. -#. Add the following environment variables as key-value pair when editing +#. Add the following environment variables as key-value pairs when editing the lambda configuration and click on update: .. list-table:: **Table 1. Environment Variables: Lambda Configuration** + :widths: 20 80 :header-rows: 1 From 02dbf2b8e24192b89042dc652ec3884bd8729941 Mon Sep 17 00:00:00 2001 From: Michael Vincerra Date: Thu, 1 Nov 2018 16:04:08 -0700 Subject: [PATCH 13/17] Applies additional syntax corrections for rendering. Signed-off-by: Michael Vincerra --- source/clear-linux/tutorials/greengrass.rst | 127 ++++++++++---------- 1 file changed, 64 insertions(+), 63 deletions(-) diff --git a/source/clear-linux/tutorials/greengrass.rst b/source/clear-linux/tutorials/greengrass.rst index 0d230a44..f91f12aa 100644 --- a/source/clear-linux/tutorials/greengrass.rst +++ b/source/clear-linux/tutorials/greengrass.rst @@ -1,7 +1,7 @@ .. _greengrass: Enable AWS Greengrass* and OpenVINO™ on |CL-ATTR| -########################################### +################################################# Hardware accelerated Function-as-a-Service (FaaS) enables cloud developers to deploy inference functionalities [1] on Intel® IoT edge devices with @@ -38,11 +38,11 @@ We provide the following AWS Greengrass samples: IoT Cloud every second. * :file:`greengrass_object_detection_sample_ssd.py` - + This AWS Greengrass sample detects objects in a video stream and - classifies them using single-shot multi-box detection (SSD) networks such + classifies them using single-shot multi-box detection (SSD) networks such as SSD Squeezenet, SSD Mobilenet, and SSD300. This sample publishes - detection outputs such as class label, class confidence, and bounding box + detection outputs such as class label, class confidence, and bounding box coordinates on AWS IoT Cloud every second. Converting Deep Learning Models @@ -75,7 +75,7 @@ For classification using BVLC Alexnet model: model_location>/deploy.prototxt --data_type --output_dir < output_dir> --input_shape [1,3,227,227] -For object detection using SqueezeNetSSD-5Class model, +For object detection using SqueezeNetSSD-5Class model: .. code-block:: bash @@ -210,24 +210,24 @@ Creating and Packaging Lambda Functions #. Zip these files with extracted Greengrass SDK folders from the previous step into :file:`greengrass_sample_python_lambda.zip`. -The zip should contain: - -* greengrasssdk + The zip should contain: + + * greengrasssdk -* greengrass sample - -For the sample, choose one of these: + * greengrass sample + + For the sample, choose one of these: -- greengrass_classification_sample.py + - greengrass_classification_sample.py -- greengrass_object_detection_sample_ssd.py + - greengrass_object_detection_sample_ssd.py -For example: + For example: -.. code-block:: bash + .. code-block:: bash - zip -r greengrass_lambda.zip greengrasssdk - greengrass_object_detection_sample_ssd.py + zip -r greengrass_lambda.zip greengrasssdk + greengrass_object_detection_sample_ssd.py #. Follow steps 6-11 to `complete creating lambdas`_. @@ -237,8 +237,8 @@ For example: make sure to name the handler as below depending on the AWS Greengrass sample you are using: - greengrass_object_detection_sample_ssd.function_handler (or) - greengrass_classification_sample.function_handler + * greengrass_object_detection_sample_ssd.function_handler (or) + * greengrass_classification_sample.function_handler Deploying Lambdas ================= @@ -258,28 +258,28 @@ configuring the lambda function for AWS Greengrass. #. Add the following environment variables as key-value pairs when editing the lambda configuration and click on update: -.. list-table:: **Table 1. Environment Variables: Lambda Configuration** + .. list-table:: **Table 1. Environment Variables: Lambda Configuration** + :widths: 20 80 + :header-rows: 1 - :widths: 20 80 - :header-rows: 1 - - * - Key - - Value - * - PARAM_MODEL_XML - - /, where is user specified and - contains IR.xml, the Intermediate Representation file from Intel® Model Optimizer - * - PARAM_INPUT_SOURCE - - /input.webm to be specified by user. Holds both input and - output data. For webcam, set PARAM_INPUT_SOURCE to ‘/dev/video0’ - * - PARAM_DEVICE - - For CPU, specify "CPU" - * - PARAM_CPU_EXTENSION_PATH - - /usr/lib64/libcpu_extension.so - * - PARAM_OUTPUT_DIRECTORY - - to be specified by user. Holds both input and output data - * - PARAM_NUM_TOP_RESULTS - - User specified for classification sample. - (e.g. 1 for top-1 result, 5 for top-5 results) + * - Key + - Value + * - PARAM_MODEL_XML + - /, where is user specified and + contains IR.xml, the Intermediate Representation file from Intel® Model Optimizer + * - PARAM_INPUT_SOURCE + - /input.webm to be specified by user. Holds both input and + output data. For webcam, set PARAM_INPUT_SOURCE to ‘/dev/video0’ + * - PARAM_DEVICE + - For CPU, specify "CPU" + * - PARAM_CPU_EXTENSION_PATH + - /usr/lib64/libcpu_extension.so + * - PARAM_OUTPUT_DIRECTORY + - to be specified by user. Holds both input and output + data + * - PARAM_NUM_TOP_RESULTS + - User specified for classification sample. + (e.g. 1 for top-1 result, 5 for top-5 results) #. Add subscription to subscribe, or publish messages from AWS Greengrass lambda function by following the steps 10-14 in `Configure the Lambda Function`_ @@ -293,33 +293,34 @@ configuring the lambda function for AWS Greengrass. Local Resources --------------- -#. Select this to `add local resources and access privileges`_. +#. Select `this link to add local resources and access privileges`_. -Following are the local resources needed for the CPU: + Following are the local resources needed for the CPU: -.. list-table:: **Local Resources** - :widths: 20, 20, 20, 20 - :header-rows: 1 + .. list-table:: **Local Resources** + :widths: 20, 20, 20, 20 + :header-rows: 1 - * - Name - - Resource type - - Local path - - Access - - * - ModelDir - - Volume - - to be specified by user - - Read-Only + * - Name + - Resource type + - Local path + - Access + + * - ModelDir + - Volume + - to be specified by user + - Read-Only - * - Webcam - - Device - - /dev/video0 - - Read-Only + * - Webcam + - Device + - /dev/video0 + - Read-Only - * - DataDir - - Volume - - to be specified by user. Holds both input and output data. - - Read and Write + * - DataDir + - Volume + - to be specified by user. Holds both input and output + data. + - Read and Write Deploy ------ @@ -398,7 +399,7 @@ References .. _view the output on IoT cloud: https://docs.aws.amazon.com/greengrass/latest/developerguide/lambda-check.html -.. _ add local resources and access privileges: https://docs.aws.amazon.com/greengrass/latest/developerguide/access-local-resources.html +.. _this link to add local resources and access privileges: https://docs.aws.amazon.com/greengrass/latest/developerguide/access-local-resources.html .. _Configure AWS Greengrass on AWS IoT: https://docs.aws.amazon.com/greengrass/latest/developerguide/gg-config.html From f6e5be79c1bfc963ed9a20752bf8635e7a012de2 Mon Sep 17 00:00:00 2001 From: Michael Vincerra Date: Thu, 1 Nov 2018 18:26:10 -0700 Subject: [PATCH 14/17] Resolves build errors: - Removes metadata from embedded tags - Changes from `` to ```` where previous syntax failures occurred. Signed-off-by: Michael Vincerra --- source/clear-linux/tutorials/greengrass.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/source/clear-linux/tutorials/greengrass.rst b/source/clear-linux/tutorials/greengrass.rst index f91f12aa..315f0804 100644 --- a/source/clear-linux/tutorials/greengrass.rst +++ b/source/clear-linux/tutorials/greengrass.rst @@ -37,7 +37,7 @@ We provide the following AWS Greengrass samples: networks such as AlexNet and GoogLeNet and publishes top-10 results on AWS* IoT Cloud every second. -* :file:`greengrass_object_detection_sample_ssd.py` +* :file:`greengrass_object_detection_sample_ssd.py` This AWS Greengrass sample detects objects in a video stream and classifies them using single-shot multi-box detection (SSD) networks such @@ -57,8 +57,8 @@ classification sample. For object detection, the sample models optimized for Intel® edge platforms are present at :file:`/usr/share/openvino/models`. These models are provided -as an example, but any custom pre-trained SSD models can be used with the -object detection sample. +as an example; however, any custom pre-trained SSD models can be used with +the object detection sample. Running Model Optimizer ======================= @@ -86,11 +86,11 @@ For object detection using SqueezeNetSSD-5Class model: In these examples: -* is :file:`/usr/share/openvino/models` +* ```` is :file:`/usr/share/openvino/models` -* is FP32 or FP16, depending on target device. +* ```` is FP32 or FP16, depending on target device. -* is the directory where the user wants to store the +* ```` is the directory where the user wants to store the Intermediate Representation (IR). IR contains .xml format corresponding to the network structure and .bin format corresponding to weights. This .xml file should be passed to . From 2cefc36098cbb1c2e843eb1eab9d3b09219abdce Mon Sep 17 00:00:00 2001 From: Michael Vincerra Date: Fri, 2 Nov 2018 09:14:39 -0700 Subject: [PATCH 15/17] Revise header level to test error: mistaken styles inclusion. Signed-off-by: Michael Vincerra --- source/clear-linux/reference/bundles/bundles.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/clear-linux/reference/bundles/bundles.rst b/source/clear-linux/reference/bundles/bundles.rst index a859dd8a..26c3acb9 100644 --- a/source/clear-linux/reference/bundles/bundles.rst +++ b/source/clear-linux/reference/bundles/bundles.rst @@ -7,7 +7,7 @@ This document provides a current list of `available bundles`_ as of ``12 September 2018``. Bundle list -*********** +=========== .. raw:: html :file: bundles.html From 68d9e7ca7610bc6cf0d0815323b765a9a39ccb33 Mon Sep 17 00:00:00 2001 From: Michael Vincerra Date: Fri, 2 Nov 2018 10:19:58 -0700 Subject: [PATCH 16/17] Removes inline styles to address error: - Root cause unknown; likely PHP or Drupal related - Previous PR 277 did NOT include any edits to bundle.html - Inline styles are overwritten by higher-levell css Signed-off-by: Michael Vincerra --- .../reference/bundles/bundles.html | 47 +------------------ 1 file changed, 1 insertion(+), 46 deletions(-) diff --git a/source/clear-linux/reference/bundles/bundles.html b/source/clear-linux/reference/bundles/bundles.html index 2cfc7caa..08fecac5 100644 --- a/source/clear-linux/reference/bundles/bundles.html +++ b/source/clear-linux/reference/bundles/bundles.html @@ -1,51 +1,6 @@ Bundles in Clear Linux OS for Intel® Architecture - + From 296dbbfa160604b3b20de5d16ad5e4e4b301e996 Mon Sep 17 00:00:00 2001 From: Michael Vincerra Date: Fri, 2 Nov 2018 11:58:42 -0700 Subject: [PATCH 17/17] Removes element from bundles.html to address css error. Signed-off-by: Michael Vincerra --- source/clear-linux/reference/bundles/bundles.html | 5 ----- 1 file changed, 5 deletions(-) diff --git a/source/clear-linux/reference/bundles/bundles.html b/source/clear-linux/reference/bundles/bundles.html index 08fecac5..1125802f 100644 --- a/source/clear-linux/reference/bundles/bundles.html +++ b/source/clear-linux/reference/bundles/bundles.html @@ -1,8 +1,3 @@ - - Bundles in Clear Linux OS for Intel® Architecture - - -