Skip to content
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.

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

Remove ClusterDescriptor path from constructor #15554

Merged
merged 3 commits into from
Nov 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 1 addition & 6 deletions tt_metal/llrt/tt_cluster.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -122,16 +122,12 @@ BoardType Cluster::get_board_type(chip_id_t chip_id) const {
}

void Cluster::generate_cluster_descriptor() {
this->cluster_desc_path_ = (this->target_type_ == TargetDevice::Silicon)
? tt_ClusterDescriptor::get_cluster_descriptor_file_path()
: "";

// Cluster descriptor yaml not available for Blackhole bring up
if (this->target_type_ == TargetDevice::Simulator) {
// Passing simulator reported physical devices as logical devices.
this->cluster_desc_ = tt_ClusterDescriptor::create_mock_cluster(tt_SimulationDevice::detect_available_device_ids(), this->arch_);
} else {
this->cluster_desc_ = tt_ClusterDescriptor::create_from_yaml(this->cluster_desc_path_);
this->cluster_desc_ = tt_ClusterDescriptor::create_from_yaml(tt_ClusterDescriptor::get_cluster_descriptor_file_path());
for (const auto &chip_id : this->cluster_desc_->get_all_chips()) {
if (this->cluster_desc_->get_board_type(chip_id) == BoardType::GALAXY) {
this->is_tg_cluster_ = true;
Expand Down Expand Up @@ -232,7 +228,6 @@ void Cluster::open_driver(const bool &skip_driver_allocs) {
const bool clean_system_resources = true;
device_driver = std::make_unique<tt::umd::Cluster>(
sdesc_path,
this->cluster_desc_path_,
all_chips_set,
num_host_mem_ch_per_mmio_device,
skip_driver_allocs,
Expand Down
1 change: 0 additions & 1 deletion tt_metal/llrt/tt_cluster.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,6 @@ class Cluster {
// Need to hold reference to cluster descriptor to detect total number of devices available in cluster
// UMD static APIs `detect_available_device_ids` and `detect_number_of_chips` only returns number of MMIO mapped
// devices
std::string cluster_desc_path_;
std::unique_ptr<tt_ClusterDescriptor> cluster_desc_;
// There is an entry for every device that can be targeted (MMIO and remote)
std::unordered_map<chip_id_t, metal_SocDescriptor> sdesc_per_chip_;
Expand Down
2 changes: 1 addition & 1 deletion tt_metal/third_party/umd
Loading