Merge branch 'main' of https://github.com/pytorch/test-infra

pytorch · Jun 10, 2024 · bf46b27 · bf46b27
2 parents d580b5f + c4d4a2a
commit bf46b27
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 3 deletions.
diff --git a/.github/arc-node-config.yaml b/.github/arc-node-config.yaml
@@ -50,6 +50,23 @@ nodeConfig:
       - key: "karpenter.sh/capacity-type"
         operator: In
         values: ["on-demand"]
+  - nodeType: compute-amd64-avx2
+    requirements:
+      - key: "karpenter.k8s.aws/instance-category"
+        operator: In
+        values: ["m4"]
+      - key: "karpenter.k8s.aws/instance-cpu"
+        operator: In
+        values: ["40"]
+      - key: "kubernetes.io/arch"
+        operator: In
+        values: ["amd64"]
+      - key: kubernetes.io/os
+        operator: In
+        values: ["linux"]
+      - key: "karpenter.sh/capacity-type"
+        operator: In
+        values: ["on-demand"]
   - nodeType: compute-amd64-avx512
     requirements:
       - key: "karpenter.k8s.aws/instance-category"

diff --git a/.github/arc-runner-config.yaml b/.github/arc-runner-config.yaml
@@ -15,6 +15,14 @@ runnerConfig:
     runnerLabel: linux.2xlarge
     containerMode: dind-rootless
     workingDiskSpace: 150Gi
+  - cpu: 20.0
+    maxRunners: 100
+    memory: 80Gi
+    minRunners: 0
+    nodeType: compute-amd64-avx2
+    runnerLabel: linux.10xlarge.avx2
+    containerMode: dind-rootless
+    workingDiskSpace: 200Gi
   - cpu: 16.0
     maxRunners: 100
     memory: 16Gi

diff --git a/.github/scale-config.yml b/.github/scale-config.yml
@@ -27,6 +27,12 @@ runner_types:
     is_ephemeral: false
     max_available: 1000
     os: linux
+  linux.10xlarge.avx2:
+    disk_size: 200
+    instance_type: m4.10xlarge
+    is_ephemeral: false
+    max_available: 60
+    os: linux
   linux.24xl.spr-metal:
     disk_size: 200
     instance_type: c7i.metal-24xl

diff --git a/torchci/rockset/inductor/__sql/torchao_query.sql b/torchci/rockset/inductor/__sql/torchao_query.sql
@@ -21,6 +21,7 @@ WITH performance_results AS (
   FORMAT_ISO8601(
     DATE_TRUNC(: granularity, _event_time)
   ) AS granularity_bucket,
+  head_sha,
   head_branch,
 FROM
   inductor.torchao_perf_stats
@@ -67,6 +68,7 @@ results AS (
     performance_results.workflow_id AS workflow_id,
     performance_results.job_id AS job_id,
     performance_results.head_branch AS head_branch,
+    performance_results.head_sha AS head_sha,
     CASE
       WHEN performance_results.filename LIKE '%_torchbench' THEN 'torchbench'
       WHEN performance_results.filename LIKE '%_timm_models' THEN 'timm_models'
@@ -148,6 +150,7 @@ WHERE
   ARRAY_CONTAINS(SPLIT(:suites, ','), LOWER(results.suite))
   AND (ARRAY_CONTAINS(SPLIT(:compilers, ','), LOWER(results.compiler)) OR :compilers = '')
   AND (ARRAY_CONTAINS(SPLIT(:branches, ','), results.head_branch) OR :branches = '')
+  AND (ARRAY_CONTAINS(SPLIT(:commits, ','), results.head_sha) OR :commits = '')
 ORDER BY
   granularity_bucket DESC,
   workflow_id DESC,

diff --git a/torchci/rockset/inductor/torchao_query.lambda.json b/torchci/rockset/inductor/torchao_query.lambda.json
@@ -6,6 +6,11 @@
       "type": "string",
       "value": "main"
     },
+    {
+      "name": "commits",
+      "type": "string",
+      "value": ""
+    },
     {
       "name": "compilers",
       "type": "string",
@@ -44,7 +49,7 @@
     {
       "name": "stopTime",
       "type": "string",
-      "value": "2024-06-06T00:00:00.00Z"
+      "value": "2024-06-08T00:00:00.00Z"
     },
     {
       "name": "suites",
@@ -58,7 +63,7 @@
     },
     {
       "name": "workflowId",
-      "type": "string",
+      "type": "int",
       "value": "0"
     }
   ],

diff --git a/torchci/rockset/prodVersions.json b/torchci/rockset/prodVersions.json
@@ -84,7 +84,7 @@
   "inductor": {
     "compilers_benchmark_performance": "ee1751ed1f0e68cd",
     "compilers_benchmark_performance_branches": "8896fe6bbd61e7dc",
-    "torchao_query": "011929830b89f966",
+    "torchao_query": "89dd8524b4784c7b",
     "torchao_query_branches": "dae2141eab66e839"
   },
   "torchbench": {