Skip to content

Use std::optional for ET feeder node attributes and introduce INVALID_COMM_TYPE in protobuf #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hxu296 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use std::optional for ET feeder node attributes and introduce INVALID_COMM_TYPE in protobuf #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions schema/protobuf/et_def.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ enum CollectiveCommType {
REDUCE_SCATTER = 7;
REDUCE_SCATTER_BLOCK = 8;
BARRIER = 9;
INVALID_COMM_TYPE = 99;
}

message Node {
Expand Down
28 changes: 13 additions & 15 deletions src/feeder/et_feeder_node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ ETFeederNode::ETFeederNode(std::shared_ptr<ChakraProtoMsg::Node> node) {
this->is_cpu_op_ = static_cast<bool>(attr.bool_val());
} else if (attr_name == "num_ops") {
this->num_ops_ = static_cast<uint64_t>(attr.int64_val());
} else if (attr_name == "tensor_loc_") {
Copy link
Collaborator

@JoongunPark JoongunPark Feb 4, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

QQ: is the attribute name "tensor_loc_" not "tensor_loc"?
What upstream tool uses that name? STG?
I think Chakra converter does not use that attribute name.

this->tensor_loc_ = attr.uint32_val();
} else if (attr_name == "tensor_size") {
this->tensor_size_ = attr.uint64_val();
} else if (attr_name == "comm_type") {
Expand Down Expand Up @@ -106,41 +108,37 @@ uint64_t ETFeederNode::runtime() {
}

uint64_t ETFeederNode::num_ops() {
return num_ops_;
}

uint32_t ETFeederNode::tensor_loc() {
return tensor_loc_;
return num_ops_.value_or(0);
}

uint64_t ETFeederNode::tensor_size() {
return tensor_size_;
return tensor_size_.value_or(0);
}

ChakraProtoMsg::CollectiveCommType ETFeederNode::comm_type() {
return comm_type_;
return comm_type_.value_or(ChakraProtoMsg::CollectiveCommType::INVALID_COMM_TYPE);
}

uint32_t ETFeederNode::comm_priority() {
return comm_priority_;
return comm_priority_.value_or(0);
}

uint64_t ETFeederNode::comm_size() {
return comm_size_;
return comm_size_.value_or(0);
}

uint32_t ETFeederNode::comm_src() {
return comm_src_;
return comm_src_.value_or(0);
}

uint32_t ETFeederNode::comm_dst() {
return comm_dst_;
return comm_dst_.value_or(0);
}

uint32_t ETFeederNode::comm_tag() {
return comm_tag_;
return comm_tag_.value_or(0);
}

string ETFeederNode::pg_name() {
return pg_name_;
}
std::string ETFeederNode::pg_name() {
return pg_name_.value_or("");
}
24 changes: 14 additions & 10 deletions src/feeder/et_feeder_node.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include <unordered_map>
#include <unordered_set>
#include <vector>
#include <optional>

#include "et_def.pb.h"

Expand Down Expand Up @@ -53,20 +54,23 @@ class ETFeederNode {
std::unordered_map<std::string, const ChakraProtoMsg::AttributeProto&>
other_attrs_{};

// required metadata
uint64_t id_;
std::string name_;
bool is_cpu_op_;
uint64_t runtime_;
uint64_t num_ops_;
uint32_t tensor_loc_;
uint64_t tensor_size_;
ChakraProtoMsg::CollectiveCommType comm_type_;
uint32_t comm_priority_;
uint64_t comm_size_;
uint32_t comm_src_;
uint32_t comm_dst_;
uint32_t comm_tag_;
std::string pg_name_;

// optional metadata
std::optional<uint64_t> num_ops_;
std::optional<uint32_t> tensor_loc_;
std::optional<uint64_t> tensor_size_;
std::optional<ChakraProtoMsg::CollectiveCommType> comm_type_;
std::optional<uint32_t> comm_priority_;
std::optional<uint64_t> comm_size_;
std::optional<uint32_t> comm_src_;
std::optional<uint32_t> comm_dst_;
std::optional<uint32_t> comm_tag_;
std::optional<std::string> pg_name_;
};

} // namespace Chakra