Merge pull request #995 from cmatthias/master

Update EC2 dicts with more recent instance types
Yelp · Apr 8, 2015 · 4da63dc · 4da63dc
2 parents 52b41b3 + 3ab8da2
commit 4da63dc
Showing 1 changed file with 62 additions and 0 deletions.
diff --git a/mrjob/aws.py b/mrjob/aws.py
@@ -22,32 +22,94 @@
 # from http://aws.amazon.com/ec2/instance-types/
 EC2_INSTANCE_TYPE_TO_COMPUTE_UNITS = {
     't1.micro': 2,
+    't2.micro': 1,
+    't2.small': 1,
+    't2.medium': 1,
     'm1.small': 1,
     'm1.large': 4,
     'm1.xlarge': 8,
     'm2.xlarge': 6.5,
     'm2.2xlarge': 13,
     'm2.4xlarge': 26,
+    'm3.medium': 3,
+    'm3.large': 6.5,
+    'm3.xlarge': 13,
+    'm3.2xlarge': 26,
     'c1.medium': 5,
     'c1.xlarge': 20,
+    'c3.large': 7,
+    'c3.xlarge': 14,
+    'c3.2xlarge': 28,
+    'c3.4xlarge': 55,
+    'c3.8xlarge': 108,
+    'c4.large': 8,
+    'c4.xlarge': 16,
+    'c4.2xlarge': 31,
+    'c4.4xlarge': 62,
+    'c4.8xlarge': 132,
     'cc1.4xlarge': 33.5,
     'cg1.4xlarge': 33.5,
+    'g2.2xlarge': 26,
+    'r3.large': 6.5,
+    'r3.xlarge': 13,
+    'r3.2xlarge': 26,
+    'r3.4xlarge': 52,
+    'r3.8xlarge': 104,
+    'i2.xlarge': 14,
+    'i2.2xlarge': 27,
+    'i2.4xlarge': 53,
+    'i2.8xlarge': 104,
+    'd2.xlarge': 14,
+    'd2.2xlarge': 28,
+    'd2.4xlarge': 56,
+    'd2.8xlarge': 116,
 }
 
 # map from instance type to GB of memory
 # from http://aws.amazon.com/ec2/instance-types/
 EC2_INSTANCE_TYPE_TO_MEMORY = {
     't1.micro': 0.6,
+    't2.micro': 1,
+    't2.small': 2,
+    't2.medium': 4,
     'm1.small': 1.7,
     'm1.large': 7.5,
     'm1.xlarge': 15,
     'm2.xlarge': 17.5,
     'm2.2xlarge': 34.2,
     'm2.4xlarge': 68.4,
+    'm3.medium': 3.75,
+    'm3.large': 7.5,
+    'm3.xlarge': 15,
+    'm3.2xlarge': 30,
     'c1.medium': 1.7,
     'c1.xlarge': 7,
+    'c3.large': 3.75,
+    'c3.xlarge': 7.5,
+    'c3.2xlarge': 15,
+    'c3.4xlarge': 30,
+    'c3.8xlarge': 60,
+    'c4.large': 3.75,
+    'c4.xlarge': 7.5,
+    'c4.2xlarge': 15,
+    'c4.4xlarge': 30,
+    'c4.8xlarge': 60,
     'cc1.4xlarge': 23,
     'cg1.4xlarge': 22,
+    'g2.2xlarge': 15,
+    'r3.large': 15,
+    'r3.xlarge': 30.5,
+    'r3.2xlarge': 61,
+    'r3.4xlarge': 122,
+    'r3.8xlarge': 244,
+    'i2.xlarge': 30.5,
+    'i2.2xlarge': 61,
+    'i2.4xlarge': 122,
+    'i2.8xlarge': 244,
+    'd2.xlarge': 30.5,
+    'd2.2xlarge': 61,
+    'd2.4xlarge': 122,
+    'd2.8xlarge': 244,
 }