Skip to content

Commit

Permalink
Merge branch 'main' into zejun/add_unified_runtime_op_for_flow_in_jso…
Browse files Browse the repository at this point in the history
…n_trace_file
  • Loading branch information
zejun-chen authored Jan 16, 2025
2 parents 539879c + 3234660 commit 80e72f5
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 2 deletions.
1 change: 0 additions & 1 deletion libkineto/include/ActivityType.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ enum class ActivityType {
XPU_RUNTIME, // host side xpu runtime events
COLLECTIVE_COMM, // collective communication
MTIA_WORKLOADD, // MTIA workloadd events
MTIA_COLLECTIVE_COMM, // MTIA collective communication events

// PRIVATEUSE1 Activity types are used for custom backends.
// The corresponding device type is `DeviceType::PrivateUse1` in PyTorch.
Expand Down
1 change: 0 additions & 1 deletion libkineto/src/ActivityType.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ static constexpr std::array<ActivityTypeName, activityTypeCount + 1> map{
{"xpu_runtime", ActivityType::XPU_RUNTIME},
{"collective_comm", ActivityType::COLLECTIVE_COMM},
{"mtia_workloadd", ActivityType::MTIA_WORKLOADD},
{"mtia_collective_comm", ActivityType::MTIA_COLLECTIVE_COMM},
{"privateuse1_runtime", ActivityType::PRIVATEUSE1_RUNTIME},
{"privateuse1_driver", ActivityType::PRIVATEUSE1_DRIVER},
{"ENUM_COUNT", ActivityType::ENUM_COUNT}}};
Expand Down

0 comments on commit 80e72f5

Please sign in to comment.