Fix machine instance types (#284)

Author: 0x2b3bfa0

iterative/aws/provider.go

@@ -415,6 +415,8 @@ func getInstanceType(instanceType string, instanceGPU string) string {
 
 	if val, ok := instanceTypes[instanceType+"+"+instanceGPU]; ok {
 		return val
+	} else if val, ok := instanceTypes[instanceType]; ok && instanceGPU == "" {
+		return val
 	}
 
 	return instanceType

iterative/azure/provider.go

@@ -389,6 +389,8 @@ func getInstanceType(instanceType string, instanceGPU string) string {
 
 	if val, ok := instanceTypes[instanceType+"+"+instanceGPU]; ok {
 		return val
+	} else if val, ok := instanceTypes[instanceType]; ok && instanceGPU == "" {
+		return val
 	}
 
 	return instanceType

iterative/gcp/provider.go

@@ -441,9 +441,9 @@ func getInstanceType(instanceType string, instanceGPU string) (map[string]map[st
 
 	if val, ok := instanceTypes[instanceType+"+"+instanceGPU]; ok {
 		return val, nil
-	}
-
-	if val, ok := instanceTypes[instanceType]; ok {
+	} else if val, ok := instanceTypes[instanceType]; ok && instanceGPU == "" {
+		return val, nil
+	} else if val, ok := instanceTypes[instanceType]; ok {
 		return map[string]map[string]string{
 			"accelerator": {
 				"count": val["accelerator"]["count"],

iterative/kubernetes/provider.go

@@ -384,6 +384,8 @@ func getInstanceType(instanceType string, instanceGPU string) (map[string]map[st
 
 	if val, ok := instanceTypes[instanceType+"+"+instanceGPU]; ok {
 		return val, nil
+	} else if val, ok := instanceTypes[instanceType]; ok && instanceGPU == "" {
+		return val, nil
 	} else if val, ok := instanceTypes[instanceType]; ok {
 		// Allow users to specify custom accelerator selectors.
 		return map[string]map[string]string{