From c70c6c81fc13ba281ba9e6ce0982683410caeea6 Mon Sep 17 00:00:00 2001 From: daveshrestha-intel Date: Wed, 9 Oct 2024 14:58:36 -0700 Subject: [PATCH 1/3] Updated multiple examples and validated updates For examples\gcp-rhel-vm: Had to remove local versions.tf due to conflict of older version with root\version.tf thus just deleted the local versions.tf as it is not needed. After this was done - example VALIDATED. For examples\gcp-windows-vm: Had to remove local versions.tf due to conflict of older version with root\version.tf thus just deleted the local versions.tf as it is not needed. After this was done - example VALIDATED. For examples\gcp-windows-vm-ico-by-densify: variables.tf needed to be modified to set recommendedType = "c4-standard-4"- these changes were also don on readme.md, densify_recommendation.auto.tvars files - VALIDATED. For examples\gcp-linux-vm-ico-by-densify: variables.tf needed to be modified to set recommendedType = "c4-standard-4"- these changes were also don on readme.md, densify_recommendation.auto.tvars files - VALIDATED. --- examples/gcp-linux-vm-ico-by-densify/README.md | 4 ++-- .../densify_recommendations.auto.tfvars | 2 +- examples/gcp-linux-vm-ico-by-densify/variables.tf | 4 ++-- examples/gcp-rhel-vm/versions.tf | 10 ---------- examples/gcp-windows-vm-ico-by-densify/README.md | 4 ++-- .../densify_recommendations.auto.tfvars | 2 +- examples/gcp-windows-vm-ico-by-densify/variables.tf | 4 ++-- examples/gcp-windows-vm/versions.tf | 10 ---------- 8 files changed, 10 insertions(+), 30 deletions(-) delete mode 100644 examples/gcp-rhel-vm/versions.tf delete mode 100644 examples/gcp-windows-vm/versions.tf diff --git a/examples/gcp-linux-vm-ico-by-densify/README.md b/examples/gcp-linux-vm-ico-by-densify/README.md index b43672a..d5b800a 100644 --- a/examples/gcp-linux-vm-ico-by-densify/README.md +++ b/examples/gcp-linux-vm-ico-by-densify/README.md @@ -47,7 +47,7 @@ variable "densify_recommendations" { default = { ico-test = { currentType = "n1-standard-2" - recommendedType = "c3-standard-4" + recommendedType = "c4-standard-4" approvalType = "all" savingsEstimate = "26.6" predictedUptime = "94.32" @@ -62,7 +62,7 @@ variable "densify_fallback"{ type = map(string) default = { currentType = "n1-standard-2" - recommendedType = "c3-standard-4" + recommendedType = "c4-standard-4" approvalType = "all" savingsEstimate = "0" predictedUptime = "0" diff --git a/examples/gcp-linux-vm-ico-by-densify/densify_recommendations.auto.tfvars b/examples/gcp-linux-vm-ico-by-densify/densify_recommendations.auto.tfvars index 751a2bd..144738e 100644 --- a/examples/gcp-linux-vm-ico-by-densify/densify_recommendations.auto.tfvars +++ b/examples/gcp-linux-vm-ico-by-densify/densify_recommendations.auto.tfvars @@ -1,7 +1,7 @@ densify_recommendations = { "ico-test" = { currentType = "n1-standard-2" - recommendedType = "c3-standard-4" + recommendedType = "c4-standard-4" approvalType = "all" predictedUptime = "95.0" recommendationType = "Modernize" diff --git a/examples/gcp-linux-vm-ico-by-densify/variables.tf b/examples/gcp-linux-vm-ico-by-densify/variables.tf index 72fcbad..813dc12 100644 --- a/examples/gcp-linux-vm-ico-by-densify/variables.tf +++ b/examples/gcp-linux-vm-ico-by-densify/variables.tf @@ -15,7 +15,7 @@ variable "densify_recommendations" { default = { ico-test = { currentType = "n1-standard-2" - recommendedType = "c3-standard-4" + recommendedType = "c4-standard-4" approvalType = "all" savingsEstimate = "26.6" predictedUptime = "94.32" @@ -30,7 +30,7 @@ variable "densify_fallback"{ type = map(string) default = { currentType = "n1-standard-2" - recommendedType = "c3-standard-4" + recommendedType = "c4-standard-4" approvalType = "all" savingsEstimate = "0" predictedUptime = "0" diff --git a/examples/gcp-rhel-vm/versions.tf b/examples/gcp-rhel-vm/versions.tf deleted file mode 100644 index f7a50b4..0000000 --- a/examples/gcp-rhel-vm/versions.tf +++ /dev/null @@ -1,10 +0,0 @@ -terraform { - required_version = "~> 1.6" # see https://releases.hashicorp.com/terraform/ - - required_providers { - google = { - source = "hashicorp/google" - version = "~> 5.11" - } - } -} \ No newline at end of file diff --git a/examples/gcp-windows-vm-ico-by-densify/README.md b/examples/gcp-windows-vm-ico-by-densify/README.md index 7a99d54..d588982 100644 --- a/examples/gcp-windows-vm-ico-by-densify/README.md +++ b/examples/gcp-windows-vm-ico-by-densify/README.md @@ -46,7 +46,7 @@ variable "densify_recommendations" { default = { ico-test = { currentType = "n1-standard-2" - recommendedType = "c3-standard-4" + recommendedType = "c4-standard-4" approvalType = "all" savingsEstimate = "26.6" predictedUptime = "94.32" @@ -61,7 +61,7 @@ variable "densify_fallback"{ type = map(string) default = { currentType = "n1-standard-2" - recommendedType = "c3-standard-4" + recommendedType = "c4-standard-4" approvalType = "all" savingsEstimate = "0" predictedUptime = "0" diff --git a/examples/gcp-windows-vm-ico-by-densify/densify_recommendations.auto.tfvars b/examples/gcp-windows-vm-ico-by-densify/densify_recommendations.auto.tfvars index 751a2bd..144738e 100644 --- a/examples/gcp-windows-vm-ico-by-densify/densify_recommendations.auto.tfvars +++ b/examples/gcp-windows-vm-ico-by-densify/densify_recommendations.auto.tfvars @@ -1,7 +1,7 @@ densify_recommendations = { "ico-test" = { currentType = "n1-standard-2" - recommendedType = "c3-standard-4" + recommendedType = "c4-standard-4" approvalType = "all" predictedUptime = "95.0" recommendationType = "Modernize" diff --git a/examples/gcp-windows-vm-ico-by-densify/variables.tf b/examples/gcp-windows-vm-ico-by-densify/variables.tf index 97ef006..81260d6 100644 --- a/examples/gcp-windows-vm-ico-by-densify/variables.tf +++ b/examples/gcp-windows-vm-ico-by-densify/variables.tf @@ -15,7 +15,7 @@ variable "densify_recommendations" { default = { ico-test = { currentType = "n1-standard-2" - recommendedType = "c3-standard-4" + recommendedType = "c4-standard-4" approvalType = "all" savingsEstimate = "26.6" predictedUptime = "94.32" @@ -30,7 +30,7 @@ variable "densify_fallback"{ type = map(string) default = { currentType = "n1-standard-2" - recommendedType = "c3-standard-4" + recommendedType = "c4-standard-4" approvalType = "all" savingsEstimate = "0" predictedUptime = "0" diff --git a/examples/gcp-windows-vm/versions.tf b/examples/gcp-windows-vm/versions.tf deleted file mode 100644 index f7a50b4..0000000 --- a/examples/gcp-windows-vm/versions.tf +++ /dev/null @@ -1,10 +0,0 @@ -terraform { - required_version = "~> 1.6" # see https://releases.hashicorp.com/terraform/ - - required_providers { - google = { - source = "hashicorp/google" - version = "~> 5.11" - } - } -} \ No newline at end of file From af42677f0f42b9f311b12f92fda49d4d2b89fd40 Mon Sep 17 00:00:00 2001 From: daveshrestha-intel Date: Fri, 11 Oct 2024 11:49:17 -0700 Subject: [PATCH 2/3] Updated all of the AI, TDX, and ICO modules and readme with update for C4 Updated all of the AI, TDX, and ICO modules and readme with update for C4 --- examples/gcp-linux-fastchat-simple/README.md | 4 ++-- examples/gcp-linux-fastchat-simple/main.tf | 2 +- examples/gcp-linux-stable-diffusion/README.md | 2 +- examples/gcp-linux-stable-diffusion/main.tf | 3 +-- examples/gcp-linux-tdx-vm/README.md | 2 +- examples/gcp-linux-tdx-vm/main.tf | 2 +- examples/gcp-rhel-vm/README.md | 2 +- examples/gen-ai-xeon-opea-codegen/main.tf | 2 +- 8 files changed, 9 insertions(+), 10 deletions(-) diff --git a/examples/gcp-linux-fastchat-simple/README.md b/examples/gcp-linux-fastchat-simple/README.md index 4f063c3..48760ca 100644 --- a/examples/gcp-linux-fastchat-simple/README.md +++ b/examples/gcp-linux-fastchat-simple/README.md @@ -6,9 +6,9 @@ © Copyright 2024, Intel Corporation -## GCP C3 4th Gen Xeon(code named Sapphire Rapids) & Intel® Optimized Cloud Recipe for FastChat +## GCP C4 5th Gen Xeon(code named Emerald Rapids) & Intel® Optimized Cloud Recipe for FastChat -This demo will showcase Large Language Model(LLM) CPU inference using 4th Gen Xeon Scalable Processors on GCP. +This demo will showcase Large Language Model(LLM) CPU inference using 5th Gen Xeon Scalable Processors on GCP. ## Usage diff --git a/examples/gcp-linux-fastchat-simple/main.tf b/examples/gcp-linux-fastchat-simple/main.tf index 6211660..2f7a8e5 100644 --- a/examples/gcp-linux-fastchat-simple/main.tf +++ b/examples/gcp-linux-fastchat-simple/main.tf @@ -16,7 +16,7 @@ module "linux_vm" { boot_image_family = "ubuntu-2204-lts" name = "intel-fastchat-${random_id.rid.dec}" zone = "us-central1-a" - machine_type = "c3-standard-22" + machine_type = "c4-standard-32" allow_stopping_for_update = true tags = ["fschat-${random_id.rid.dec}"] user_data = templatefile("./cloud_init.yml", {}) diff --git a/examples/gcp-linux-stable-diffusion/README.md b/examples/gcp-linux-stable-diffusion/README.md index aea06c6..2ca5be8 100644 --- a/examples/gcp-linux-stable-diffusion/README.md +++ b/examples/gcp-linux-stable-diffusion/README.md @@ -8,7 +8,7 @@ ## 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. +This demo will showcase Stable Diffusion CPU inferencing using 5th Gen Xeon Scalable Processors on GCP. ## Usage diff --git a/examples/gcp-linux-stable-diffusion/main.tf b/examples/gcp-linux-stable-diffusion/main.tf index fddbea4..4f2dd52 100644 --- a/examples/gcp-linux-stable-diffusion/main.tf +++ b/examples/gcp-linux-stable-diffusion/main.tf @@ -16,8 +16,7 @@ module "linux_vm" { 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" + machine_type = "c4-standard-32" allow_stopping_for_update = true tags = ["diffusion-${random_id.rid.dec}"] user_data = templatefile("./cloud_init.yml", {}) diff --git a/examples/gcp-linux-tdx-vm/README.md b/examples/gcp-linux-tdx-vm/README.md index a040206..9173c71 100644 --- a/examples/gcp-linux-tdx-vm/README.md +++ b/examples/gcp-linux-tdx-vm/README.md @@ -8,7 +8,7 @@ ## Intel GCP VM on default network -This module creates a Intel Confiddential Compute Linux VM on the default network with Intel Xeon 4th Generation Scalable processors (code-named Sapphire Rapids) VM with Confidential Computing and Intel Trust Domain Extension (Intel TDX) technology. +This module creates a Intel Confiddential Compute Linux VM on the default network with Intel Xeon 5th Generation Scalable processors (code-named Emerald Rapids) VM with Confidential Computing and Intel Trust Domain Extension (Intel TDX) technology. Update the project with a your project id in GCP. It is located on the variables.tf file under this example folder for "GCP-Linux-VM" diff --git a/examples/gcp-linux-tdx-vm/main.tf b/examples/gcp-linux-tdx-vm/main.tf index 307bbd8..d790d3e 100644 --- a/examples/gcp-linux-tdx-vm/main.tf +++ b/examples/gcp-linux-tdx-vm/main.tf @@ -17,7 +17,7 @@ module "linux_vm" { enable_confidential_compute = var.enable_confidential_compute confidential_instance_type = var.confidential_instance_type on_host_maintenance = "TERMINATE" - machine_type = "c3-standard-4" + machine_type = "c4-standard-4" access_config = [{ diff --git a/examples/gcp-rhel-vm/README.md b/examples/gcp-rhel-vm/README.md index 7814d02..a43a58a 100644 --- a/examples/gcp-rhel-vm/README.md +++ b/examples/gcp-rhel-vm/README.md @@ -8,7 +8,7 @@ ## Intel Red Hat Enterprise Linux GCP VM Example -This module creates a Red Hat Enterprise Linux (RHEL) VM on the Intel Sapphire Rapids CPU. The virtual machine is created on an Intel Sapphire Rapids c3-standard-4 by default. +This module creates a Red Hat Enterprise Linux (RHEL) VM on the Intel 5th Gen Emerald Rapids CPU. The virtual machine is created on an Intel Sapphire Rapids c3-standard-4 by default. Update the project with a your project id in GCP. It is located on the variables.tf file under this example folder for "GCP-RHEL-VM". diff --git a/examples/gen-ai-xeon-opea-codegen/main.tf b/examples/gen-ai-xeon-opea-codegen/main.tf index 8b1d59f..3802f05 100644 --- a/examples/gen-ai-xeon-opea-codegen/main.tf +++ b/examples/gen-ai-xeon-opea-codegen/main.tf @@ -22,7 +22,7 @@ module "linux_vm" { }, ] } -#Required firewall rules +Required firewall rules resource "google_compute_firewall" "rules" { project = var.project name = "ai-opea-codegen-${random_id.rid.dec}" From 1a32c687851c6c71d6021b40f3c2fa63148e104b Mon Sep 17 00:00:00 2001 From: daveshrestha-intel Date: Fri, 11 Oct 2024 13:13:30 -0700 Subject: [PATCH 3/3] Updated readme for RHEL --- examples/gcp-rhel-vm/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/gcp-rhel-vm/README.md b/examples/gcp-rhel-vm/README.md index a43a58a..33c8711 100644 --- a/examples/gcp-rhel-vm/README.md +++ b/examples/gcp-rhel-vm/README.md @@ -8,7 +8,7 @@ ## Intel Red Hat Enterprise Linux GCP VM Example -This module creates a Red Hat Enterprise Linux (RHEL) VM on the Intel 5th Gen Emerald Rapids CPU. The virtual machine is created on an Intel Sapphire Rapids c3-standard-4 by default. +This module creates a Red Hat Enterprise Linux (RHEL) VM. The virtual machine is created on an Intel 5th Gen Xeon Scalable Processors (Emerald Rapids) on c4-standard-4 by default VM. Update the project with a your project id in GCP. It is located on the variables.tf file under this example folder for "GCP-RHEL-VM".