Merge pull request #31 from intel/lmelo-changes04

Fastchat Example Refactor, Add Stable Diffusion Example

Author: wsfowler

examples/gcp-linux-fastchat-simple/README.md

@@ -33,11 +33,6 @@ terraform apply
 2. SSH into newly created GCP VM
 3. **Run `source /usr/local/bin/run_demo.sh`**
 4. On your local computer, open a browser and navigate to **http://<VM_PLUBLIC_IP>:7860**. Get your Public IP from the "Compute Engine" section of the VM in the GCP console.
-5. Or use the https://xxxxxxx.gradio.live URL that is generated during the demo startup(see on screen logs)
-
-<p align="center">
-  <img src="https://github.com/intel/terraform-intel-gcp-vm/blob/main/images/gradio.png?raw=true" alt="Gradio_Output" width="900"/>
-</p>
 
 Note: You may need permissions to run Terraform https://cloud.google.com/docs/terraform/get-started-with-terraform 
 

examples/gcp-linux-fastchat-simple/main.tf

@@ -1,3 +1,7 @@
+resource "random_id" "rid" {
+  byte_length = 3
+}
+
 variable "project" {
   type        = string
   description = "GCP Project ID"
@@ -10,10 +14,11 @@ module "linux_vm" {
   project             = var.project
   boot_image_project  = "ubuntu-os-cloud"
   boot_image_family   = "ubuntu-2204-lts"
-  name                = "intel-fastchat"
+  name                = "intel-fastchat-${random_id.rid.dec}"
   zone                = "us-central1-a"
-  machine_type        = "c3-standard-44"  
-  tags                = ["fschat"]
+  machine_type        = "c3-standard-22"
+  allow_stopping_for_update = true	  
+  tags                = ["fschat-${random_id.rid.dec}"]
   user_data           = templatefile("./cloud_init.yml", {})
   access_config = [{
     nat_ip                 = null
@@ -24,14 +29,14 @@ module "linux_vm" {
 
 resource "google_compute_firewall" "rules" {
   project     =  var.project
-  name        = "fastchat-firewall"
+  name        = "fastchat-firewall-${random_id.rid.dec}"
   network     = "default"
   description = "Allows access to FastChat Webserver."
-
+  
   allow {
     protocol  = "tcp"
-    ports     = ["7860"]
+    ports     = ["22", "5000", "5001", "7860"]
   }
   source_ranges = [ "0.0.0.0/0" ]
-  target_tags = ["fschat"]
+  target_tags = ["fschat-${random_id.rid.dec}"]
 }

examples/gcp-linux-stable-diffusion/README.md

@@ -0,0 +1,52 @@
+<p align="center">
+  <img src="https://github.com/intel/terraform-intel-gcp-vm/blob/main/images/logo-classicblue-800px.png?raw=true" alt="Intel Logo" width="250"/>
+</p>
+
+# Intel Cloud Optimization Modules for Terraform
+
+© Copyright 2023, Intel Corporation
+
+## GCP C3 4th Gen Xeon(code named Sapphire Rapids) & Intel® Optimized Cloud Recipe for Stable Diffusion
+
+This demo will showcase Stable Diffusion CPU inferencing using 4th Gen Xeon Scalable Processors on GCP.
+
+## Usage
+
+1. Log on to GCP Portal
+2. Enter the GCP Cloud Shell (terminal button on top right of page)
+3. Run the following commands in order: 
+
+
+```bash
+git clone https://github.com/intel/terraform-intel-gcp-vm.git
+cd terraform-intel-gcp-vm/examples/gcp-linux-stable-diffusion
+terraform init 
+terraform apply
+
+# (enter your GCP project ID and "yes" to confirm)
+
+```
+
+## Run the Stable Diffusion Intel® OpenVino Optimized Demo
+
+**NOTE - Wait ~5 minutes for the software to install**
+
+**1-SSH into newly created GCP VM and run `source /usr/local/bin/run_demo.sh`**
+
+**2-On your computer open a browser and navigate to http://<VM_PLUBLIC_IP>:5000**
+
+## OPTIONAL - Run the default stock Stable Diffusion demo (not optimized)
+
+**1-SSH into VM and run `source /usr/local/bin/not_optimized_run_demo.sh`**
+
+**2-Browse to port 5001 instead http://<VM_PLUBLIC_IP>:5001**
+
+
+Note: You may need permissions to run Terraform https://cloud.google.com/docs/terraform/get-started-with-terraform 
+
+### Pre-requisites for running on a Workstation (bypass if using GCP Cloud Shell)
+
+1. Google Cloud CLI: https://cloud.google.com/sdk/docs/install
+2. CGP account access configured: https://registry.terraform.io/providers/hashicorp/google/latest/docs/guides/provider_reference.html#running-terraform-on-your-workstation
+3. Terraform: https://learn.hashicorp.com/tutorials/terraform/install-cli
+4. Git: https://git-scm.com/book/en/v2/Getting-Started-Installing-Git

examples/gcp-linux-stable-diffusion/cloud_init.yml

@@ -0,0 +1,15 @@
+#cloud-config
+package_update: true
+package_upgrade: true
+
+package:
+  - git
+
+ansible:
+  install_method: distro
+  package_name: ansible
+  pull:
+    url: "https://github.com/intel/optimized-cloud-recipes.git"
+    playbook_name: "recipes/ai-stable_diffusion-amx-ubuntu/recipe.yml"
+
+    

examples/gcp-linux-stable-diffusion/main.tf

@@ -0,0 +1,43 @@
+resource "random_id" "rid" {
+  byte_length = 3
+}
+
+variable "project" {
+  type        = string
+  description = "GCP Project ID"
+}
+
+
+#GCP Linux VM with Intel Cloud Optimized Recipe for FastChat
+module "linux_vm" {
+  source              = "intel/gcp-vm/intel"
+  project             = var.project
+  boot_image_project  = "ubuntu-os-cloud"
+  boot_image_family   = "ubuntu-2204-lts"
+  name                = "intel-diffusion-${random_id.rid.dec}"
+  zone                = "us-central1-a"
+  machine_type        = "c3-standard-44"
+  #machine_type        = "n2-standard-32"
+  allow_stopping_for_update = true	  
+  tags                = ["diffusion-${random_id.rid.dec}"]
+  user_data           = templatefile("./cloud_init.yml", {})
+  access_config = [{
+    nat_ip                 = null
+    public_ptr_domain_name = null
+    network_tier           = "PREMIUM"
+  }, ]
+}
+
+resource "google_compute_firewall" "rules" {
+  project     =  var.project
+  name        = "diffusion-firewall-${random_id.rid.dec}"
+  network     = "default"
+  description = "Allows access to Stable Diffusion"
+
+  allow {
+    protocol  = "tcp"
+    ports     = ["22", "5000", "5001", "7860"]
+  }
+  source_ranges = [ "0.0.0.0/0" ]
+  target_tags = ["diffusion-${random_id.rid.dec}"]
+}