Add EPYC 3rd Gen CO2 data

Author: lloesche

resotodata/__main__.py

@@ -327,7 +327,26 @@ def get_ccfdataset() -> dict:
             ["./node_modules/.bin/ts-node", "export.ts"], cwd=tmpdir, check=True, capture_output=True, text=True
         )
 
-    return json.loads(result.stdout)
+    ccfdataset = json.loads(result.stdout)
+
+    # Add missing AMD EPYC 3rd Gen data to AWS
+    aws_cloud_constants = ccfdataset.get("aws", {}).get("AWS_CLOUD_CONSTANTS", {})
+    azure_cloud_constants = ccfdataset.get("azure", {}).get("AZURE_CLOUD_CONSTANTS", {})
+    if (
+        not "AMD EPYC 3rd Gen" in aws_cloud_constants["MIN_WATTS_BY_COMPUTE_PROCESSOR"]
+        and "AMD EPYC 3rd Gen" in azure_cloud_constants["MIN_WATTS_BY_COMPUTE_PROCESSOR"]
+    ):
+        aws_cloud_constants["MIN_WATTS_BY_COMPUTE_PROCESSOR"]["AMD EPYC 3rd Gen"] = azure_cloud_constants[
+            "MIN_WATTS_BY_COMPUTE_PROCESSOR"
+        ]["AMD EPYC 3rd Gen"]
+        aws_cloud_constants["MAX_WATTS_BY_COMPUTE_PROCESSOR"]["AMD EPYC 3rd Gen"] = azure_cloud_constants[
+            "MAX_WATTS_BY_COMPUTE_PROCESSOR"
+        ]["AMD EPYC 3rd Gen"]
+        aws_cloud_constants["MEMORY_BY_COMPUTE_PROCESSOR"]["AMD EPYC 3rd Gen"] = azure_cloud_constants[
+            "MEMORY_BY_COMPUTE_PROCESSOR"
+        ]["AMD EPYC 3rd Gen"]
+
+    return ccfdataset
 
 
 def get_aws_instances() -> dict:

resotodata/cloud.py

@@ -3,3 +3,54 @@
 
 regions = LazyLoadedDict("regions.json")
 instances = LazyLoadedDict("instances.json")
+
+instances2ccfmap = {
+    "aws": {
+        "cpu": {
+            "AMD EPYC 7571": "AMD EPYC 1st Gen",
+            "AMD EPYC 7R13 Processor": "AMD EPYC 3rd Gen",
+            "AMD EPYC 7R32": "AMD EPYC 2nd Gen",
+            "AWS Graviton Processor": None,
+            "AWS Graviton2 Processor": "AWS Graviton2",
+            "AWS Graviton3 Processor": None,
+            "Apple M1 chip with 8-core CPU, 8-core GPU, and 16-core Neural Engine": "",
+            "High Frequency Intel Xeon E7-8880 v3 (Haswell)": "Haswell",
+            "Intel Core i7-8700B CPU": "Coffee Lake",
+            "Intel Skylake E5 2686 v5": "Skylake",
+            "Intel Xeon 8375C (Ice Lake)": None,
+            "Intel Xeon E5-2650": "Sandy Bridge",
+            "Intel Xeon E5-2666 v3 (Haswell)": "Haswell",
+            "Intel Xeon E5-2670": "Sandy Bridge",
+            "Intel Xeon E5-2670 (Sandy Bridge)": "Sandy Bridge",
+            "Intel Xeon E5-2670 v2 (Ivy Bridge)": "Ivy Bridge",
+            "Intel Xeon E5-2670 v2 (Ivy Bridge/Sandy Bridge)": "Ivy Bridge",
+            "Intel Xeon E5-2676 v3 (Haswell)": "Haswell",
+            "Intel Xeon E5-2680 v2 (Ivy Bridge)": "Ivy Bridge",
+            "Intel Xeon E5-2686 v4 (Broadwell)": "Broadwell",
+            "Intel Xeon Family": None,
+            "Intel Xeon Platinum 8124M": "Skylake",
+            "Intel Xeon Platinum 8151": "Skylake",
+            "Intel Xeon Platinum 8175": "Skylake",
+            "Intel Xeon Platinum 8175 (Skylake)": "Skylake",
+            "Intel Xeon Platinum 8252": "Cascade Lake",
+            "Intel Xeon Platinum 8259 (Cascade Lake)": "Cascade Lake",
+            "Intel Xeon Platinum 8259CL": "Cascade Lake",
+            "Intel Xeon Platinum 8275CL (Cascade Lake)": "Cascade Lake",
+            "Intel Xeon Platinum 8275L": "Cascade Lake",
+            "Intel Xeon Platinum 8280L (Cascade Lake)": "Cascade Lake",
+            "Intel Xeon Scalable (Icelake)": None,
+            "Intel Xeon Scalable (Skylake)": "Skylake",
+        },
+        "gpu": {
+            "AMD Radeon Pro V520": "AMD Radeon Pro V520",
+            "NVIDIA A100": "Nvidia Tesla A100",
+            "NVIDIA A10G": "Nvidia A10G",
+            "NVIDIA GRID K520": "Nvidia K520",
+            "NVIDIA T4 Tensor Core": "Nvidia T4",
+            "NVIDIA T4G Tensor Core": "Nvidia T4",
+            "NVIDIA Tesla K80": "Nvidia Tesla K80",
+            "NVIDIA Tesla M60": "Nvidia Tesla M60",
+            "NVIDIA Tesla V100": "Nvidia Tesla V100",
+        },
+    }
+}

resotodata/data/ccfdataset.json

@@ -14,7 +14,8 @@
                 "Ivy Bridge": 9.67,
                 "AMD EPYC 1st Gen": 89.6,
                 "AMD EPYC 2nd Gen": 129.78,
-                "AWS Graviton2": 129.78
+                "AWS Graviton2": 129.78,
+                "AMD EPYC 3rd Gen": 128
             },
             "MIN_WATTS_AVG": 0.74,
             "MIN_WATTS_BY_COMPUTE_PROCESSOR": {
@@ -37,7 +38,8 @@
                 "Nvidia Tesla A100": 46,
                 "Nvidia Tesla P4": 9,
                 "Nvidia Tesla P100": 36,
-                "AMD Radeon Pro V520": 26
+                "AMD Radeon Pro V520": 26,
+                "AMD EPYC 3rd Gen": 0.45
             },
             "MAX_WATTS_AVG": 3.5,
             "MAX_WATTS_BY_COMPUTE_PROCESSOR": {
@@ -60,7 +62,8 @@
                 "Nvidia Tesla A100": 407,
                 "Nvidia Tesla P4": 76.5,
                 "Nvidia Tesla P100": 306,
-                "AMD Radeon Pro V520": 229
+                "AMD Radeon Pro V520": 229,
+                "AMD EPYC 3rd Gen": 2.02
             },
             "NETWORKING_COEFFICIENT": 0.001,
             "MEMORY_COEFFICIENT": 0.000392,