Skip to content

Commit

Permalink
Remove ClusterDescriptor path from constructor (#15554)
Browse files Browse the repository at this point in the history
### Ticket
Related to #13948

### Problem description
Related to UMD change tenstorrent/tt-umd#333

### What's changed
- Remove cluster descriptor path from Cluster's constructor.

### Checklist
- [x] Post commit CI passes:
https://github.com/tenstorrent/tt-metal/actions/runs/12081012971
- [x] Blackhole Post commit:
https://github.com/tenstorrent/tt-metal/actions/runs/12081017393
- [ ] Model regression CI testing passes (if applicable)
- [ ] Device performance regression CI testing passes (if applicable)
- [ ] New/Existing tests provide coverage for changes
  • Loading branch information
broskoTT authored Nov 29, 2024
1 parent 427a7c9 commit 53c32c0
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 8 deletions.
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

0 comments on commit 53c32c0

Please sign in to comment.