Merge branch 'dev_refactor_xccl_primitive' of github.com:Oneflow-Inc/…

…oneflow into dev_refactor_xccl_primitive
Oneflow-Inc · Jan 9, 2025 · ca258af · ca258af
2 parents a9cd8df + 1809053
commit ca258af
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/community_release.yml b/.github/workflows/community_release.yml
@@ -7,7 +7,7 @@ on:
   schedule:
     # beijing: 6 pm.
     # utc: 10 am.
-    - cron: "0 10 * * *"
+    - cron: "0 10 * * sat"
   workflow_dispatch:
     inputs:
       priv_branch:

diff --git a/.github/workflows/priv_release.yml b/.github/workflows/priv_release.yml
@@ -7,7 +7,7 @@ on:
   schedule:
     # beijing: 12 pm.
     # utc: 4 am.
-    - cron: "0 4 * * *"
+    - cron: "0 4 * * sun"
   workflow_dispatch:
     inputs:
       priv_branch:

diff --git a/oneflow/core/common/device_type.proto b/oneflow/core/common/device_type.proto
@@ -9,4 +9,5 @@ enum DeviceType {
   kMeta = 4;
   kMLU = 5;  // Cambricon MLU
   kNPU = 6;  // Ascend NPU
+  kXPU = 7;  // KunLunXin
 }
diff --git a/oneflow/ir/lib/OneFlow/UserOpConversion.cpp b/oneflow/ir/lib/OneFlow/UserOpConversion.cpp
@@ -488,6 +488,8 @@ ::oneflow::DeviceType getDeviceTypeFromAttrDictionary(DictionaryAttr attributes)
     return ::oneflow::DeviceType::kMLU;
   } else if (device_tag.str() == "npu") {
     return ::oneflow::DeviceType::kNPU;
+  } else if (device_tag.str() == "xpu") {
+    return ::oneflow::DeviceType::kXPU;
   } else {
     LOG(FATAL) << "unsupported device tag: " << device_tag.str();
     return ::oneflow::DeviceType::kInvalidDevice;