From 105b6dbe2522a882eee4bbf3d3e2357fc596a1b3 Mon Sep 17 00:00:00 2001 From: AI2Table <76231236+ai2table@users.noreply.github.com> Date: Wed, 5 Jun 2024 17:25:59 -0700 Subject: [PATCH 1/3] G6 support --- pkg/addons/assets/efa-device-plugin.yaml | 2 ++ pkg/apis/eksctl.io/v1alpha5/gpu_validation_test.go | 8 ++++++++ pkg/utils/instance/instance.go | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pkg/addons/assets/efa-device-plugin.yaml b/pkg/addons/assets/efa-device-plugin.yaml index ca8f663100..730a28759b 100644 --- a/pkg/addons/assets/efa-device-plugin.yaml +++ b/pkg/addons/assets/efa-device-plugin.yaml @@ -56,6 +56,7 @@ spec: - g4dn.8xlarge - g4dn.metal - g5.48xlarge + - g6.48xlarge - hpc6a.48xlarge - i3en.12xlarge - i3en.24xlarge @@ -113,6 +114,7 @@ spec: - g4dn.8xlarge - g4dn.metal - g5.48xlarge + - g6.48xlarge - hpc6a.48xlarge - i3en.12xlarge - i3en.24xlarge diff --git a/pkg/apis/eksctl.io/v1alpha5/gpu_validation_test.go b/pkg/apis/eksctl.io/v1alpha5/gpu_validation_test.go index a7aa6f7723..33796d387a 100644 --- a/pkg/apis/eksctl.io/v1alpha5/gpu_validation_test.go +++ b/pkg/apis/eksctl.io/v1alpha5/gpu_validation_test.go @@ -61,6 +61,10 @@ var _ = Describe("GPU instance support", func() { gpuInstanceType: "asdf", amiFamily: api.NodeImageFamilyAmazonLinux2, }), + Entry("AL2", gpuInstanceEntry{ + gpuInstanceType: "g6.12xlarge", + amiFamily: api.NodeImageFamilyAmazonLinux2, + }), Entry("AL2", gpuInstanceEntry{ gpuInstanceType: "g5.12xlarge", amiFamily: api.NodeImageFamilyAmazonLinux2, @@ -124,6 +128,10 @@ var _ = Describe("GPU instance support", func() { gpuInstanceType: "g4dn.xlarge", amiFamily: api.NodeImageFamilyAmazonLinux2, }), + Entry("AL2", gpuInstanceEntry{ + gpuInstanceType: "g6.12xlarge", + amiFamily: api.NodeImageFamilyAmazonLinux2, + }), Entry("AL2", gpuInstanceEntry{ gpuInstanceType: "g5.12xlarge", amiFamily: api.NodeImageFamilyAmazonLinux2, diff --git a/pkg/utils/instance/instance.go b/pkg/utils/instance/instance.go index 0e4ad0193b..024012bb3a 100644 --- a/pkg/utils/instance/instance.go +++ b/pkg/utils/instance/instance.go @@ -49,7 +49,8 @@ func IsNvidiaInstanceType(instanceType string) bool { strings.HasPrefix(instanceType, "p5") || strings.HasPrefix(instanceType, "g3") || strings.HasPrefix(instanceType, "g4") || - strings.HasPrefix(instanceType, "g5") + strings.HasPrefix(instanceType, "g5") || + strings.HasPrefix(instanceType, "g6") } // IsInferentiaInstanceType returns true if the instance type requires AWS Neuron From 09dd74fbe5061146ec1c5c695b474ba1c866f05c Mon Sep 17 00:00:00 2001 From: Practicus AI <76231236+practicusai@users.noreply.github.com> Date: Thu, 6 Jun 2024 05:56:03 -0700 Subject: [PATCH 2/3] Update pkg/addons/assets/efa-device-plugin.yaml Co-authored-by: Chetan Patwal --- pkg/addons/assets/efa-device-plugin.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/addons/assets/efa-device-plugin.yaml b/pkg/addons/assets/efa-device-plugin.yaml index 730a28759b..f35411b046 100644 --- a/pkg/addons/assets/efa-device-plugin.yaml +++ b/pkg/addons/assets/efa-device-plugin.yaml @@ -56,6 +56,10 @@ spec: - g4dn.8xlarge - g4dn.metal - g5.48xlarge + - g6.8xlarge + - g6.12xlarge + - g6.16xlarge + - g6.24xlarge - g6.48xlarge - hpc6a.48xlarge - i3en.12xlarge From a1f05d345f7ab9da5615aade80243e8a0ecc04d2 Mon Sep 17 00:00:00 2001 From: Practicus AI <76231236+practicusai@users.noreply.github.com> Date: Thu, 6 Jun 2024 05:56:11 -0700 Subject: [PATCH 3/3] Update pkg/addons/assets/efa-device-plugin.yaml Co-authored-by: Chetan Patwal --- pkg/addons/assets/efa-device-plugin.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/addons/assets/efa-device-plugin.yaml b/pkg/addons/assets/efa-device-plugin.yaml index f35411b046..71f2dc15e4 100644 --- a/pkg/addons/assets/efa-device-plugin.yaml +++ b/pkg/addons/assets/efa-device-plugin.yaml @@ -118,6 +118,10 @@ spec: - g4dn.8xlarge - g4dn.metal - g5.48xlarge + - g6.8xlarge + - g6.12xlarge + - g6.16xlarge + - g6.24xlarge - g6.48xlarge - hpc6a.48xlarge - i3en.12xlarge