@@ -67,10 +67,10 @@ def generate_topology_config_file(output_file: str, input_file: str, block_sizes
6767 queue_name = queue_config ["Name" ]
6868
6969 # Retrieve capacity info from the queue_name, if there
70- # queue_capacity_type = CAPACITY_TYPE_MAP.get(queue_config.get("CapacityType", "ONDEMAND"))
71- # if queue_capacity_type != CAPACITY_TYPE_MAP.get("CAPACITY_BLOCK"):
72- # log.info("ParallelCluster does not create topology for %s", queue_capacity_type)
73- # continue
70+ queue_capacity_type = CAPACITY_TYPE_MAP .get (queue_config .get ("CapacityType" , "ONDEMAND" ))
71+ if queue_capacity_type != CAPACITY_TYPE_MAP .get ("CAPACITY_BLOCK" ):
72+ log .info ("ParallelCluster does not create topology for %s" , queue_capacity_type )
73+ continue
7474
7575 queue_capacity_reservation_target = queue_config .get ("CapacityReservationTarget" , {})
7676 queue_capacity_reservation = (
@@ -95,11 +95,11 @@ def generate_topology_config_file(output_file: str, input_file: str, block_sizes
9595 else queue_capacity_reservation
9696 )
9797 ### Check for if reservation is for NVLink and size matches min_block_size_list
98- # if compute_resource_config.get('InstanceType') == 'p6e-gb200.36xlarge':
99- if min_block_size_list == compute_min_count or max_block_size_list == compute_max_count :
100- block_count += 1
101- ### Each Capacity Reservation ID is a Capacity Block and we associate each slurm block with a single capacity Block
102- topology_config += "BlockName=Block" + str (block_count )+ " Nodes=" + str (queue_name ) + "-" + str (node_type ) + "-" + str (compute_resource_name ) + "-[1-" + str (compute_max_count ) + "]\n "
98+ if compute_resource_config .get ('InstanceType' ) == 'p6e-gb200.36xlarge' :
99+ if min_block_size_list == compute_min_count or max_block_size_list == compute_max_count :
100+ block_count += 1
101+ ### Each Capacity Reservation ID is a Capacity Block and we associate each slurm block with a single capacity Block
102+ topology_config += "BlockName=Block" + str (block_count )+ " Nodes=" + str (queue_name ) + "-" + str (node_type ) + "-" + str (compute_resource_name ) + "-[1-" + str (compute_max_count ) + "]\n "
103103
104104 topology_config += "BlockSizes=" + str (block_sizes )+ "\n "
105105 except (KeyError , AttributeError ) as e :
0 commit comments