TL/UCP: avoid unrelated config table formatting

Author: jeffnvidia

src/components/tl/ucp/tl_ucp.c

@@ -48,263 +48,216 @@ ucc_status_t ucc_tl_ucp_memh_pack(const ucc_base_context_t *context, ucc_mem_map
 ucc_status_t ucc_tl_ucp_mem_unmap(const ucc_base_context_t *context, ucc_mem_map_mode_t mode,
                                   ucc_mem_map_tl_t *memh);
 
+/* clang-format off */
 ucc_config_field_t ucc_tl_ucp_lib_config_table[] = {
-    {"",
-     "",
-     NULL,
-     ucc_offsetof(ucc_tl_ucp_lib_config_t, super),
+    {"", "", NULL, ucc_offsetof(ucc_tl_ucp_lib_config_t, super),
      UCC_CONFIG_TYPE_TABLE(ucc_tl_lib_config_table)},
 
-    {"ALLGATHER_BATCHED_NUM_POSTS",
-     "auto",
+    {"ALLGATHER_BATCHED_NUM_POSTS", "auto",
      "Maximum number of outstanding send and receive messages in allgather "
      "batched algorithm",
      ucc_offsetof(ucc_tl_ucp_lib_config_t, allgather_batched_num_posts),
      UCC_CONFIG_TYPE_ULUNITS},
 
-    {"ALLTOALL_PAIRWISE_NUM_POSTS",
-     "auto",
+    {"ALLTOALL_PAIRWISE_NUM_POSTS", "auto",
      "Maximum number of outstanding send and receive messages in alltoall "
      "pairwise algorithm",
      ucc_offsetof(ucc_tl_ucp_lib_config_t, alltoall_pairwise_num_posts),
      UCC_CONFIG_TYPE_ULUNITS},
 
-    {"ALLTOALLV_PAIRWISE_NUM_POSTS",
-     "auto",
+    {"ALLTOALLV_PAIRWISE_NUM_POSTS", "auto",
      "Maximum number of outstanding send and receive messages in alltoallv "
      "pairwise algorithm",
      ucc_offsetof(ucc_tl_ucp_lib_config_t, alltoallv_pairwise_num_posts),
      UCC_CONFIG_TYPE_ULUNITS},
 
-    /* TODO: add radix to config once it's fully supported by the algorithm
-        {"ALLTOALLV_HYBRID_RADIX", "2",
-         "Radix of the Hybrid Alltoallv algorithm",
-         ucc_offsetof(ucc_tl_ucp_lib_config_t, alltoallv_hybrid_radix),
-         UCC_CONFIG_TYPE_UINT},
-    */
-    {"ALLTOALLV_HYBRID_NUM_SCRATCH_SENDS",
-     "1",
+/* TODO: add radix to config once it's fully supported by the algorithm
+    {"ALLTOALLV_HYBRID_RADIX", "2",
+     "Radix of the Hybrid Alltoallv algorithm",
+     ucc_offsetof(ucc_tl_ucp_lib_config_t, alltoallv_hybrid_radix),
+     UCC_CONFIG_TYPE_UINT},
+*/
+    {"ALLTOALLV_HYBRID_NUM_SCRATCH_SENDS", "1",
      "Number of send operations issued from scratch buffer per radix step",
      ucc_offsetof(ucc_tl_ucp_lib_config_t, alltoallv_hybrid_num_scratch_sends),
      UCC_CONFIG_TYPE_UINT},
 
-    {"ALLTOALLV_HYBRID_NUM_SCRATCH_RECVS",
-     "3",
+    {"ALLTOALLV_HYBRID_NUM_SCRATCH_RECVS", "3",
      "Number of recv operations issued from scratch buffer per radix step",
      ucc_offsetof(ucc_tl_ucp_lib_config_t, alltoallv_hybrid_num_scratch_recvs),
      UCC_CONFIG_TYPE_UINT},
 
-    {"ALLTOALLV_HYBRID_PAIRWISE_NUM_POSTS",
-     "3",
+    {"ALLTOALLV_HYBRID_PAIRWISE_NUM_POSTS", "3",
      "The maximum number of pairwise messages to send before waiting for "
      "completion",
      ucc_offsetof(ucc_tl_ucp_lib_config_t, alltoallv_hybrid_pairwise_num_posts),
      UCC_CONFIG_TYPE_UINT},
 
-    {"ALLTOALLV_HYBRID_BUFF_SIZE",
-     "256k",
+    {"ALLTOALLV_HYBRID_BUFF_SIZE", "256k",
      "Total size of scratch buffer, used for sends and receives",
      ucc_offsetof(ucc_tl_ucp_lib_config_t, alltoallv_hybrid_buff_size),
      UCC_CONFIG_TYPE_MEMUNITS},
 
-    {"ALLTOALLV_HYBRID_CHUNK_BYTE_LIMIT",
-     "12k",
+    {"ALLTOALLV_HYBRID_CHUNK_BYTE_LIMIT", "12k",
      "Max size of data send in pairwise step of hybrid alltoallv algorithm",
      ucc_offsetof(ucc_tl_ucp_lib_config_t, alltoallv_hybrid_chunk_byte_limit),
      UCC_CONFIG_TYPE_MEMUNITS},
 
-    {"ALLTOALL_ONESIDED_PERCENT_BW",
-     "100",
+    {"ALLTOALL_ONESIDED_PERCENT_BW", "100",
      "Percentage (1-100) of NIC bandwidth to use for congestion avoidance",
      ucc_offsetof(ucc_tl_ucp_lib_config_t, alltoall_onesided_percent_bw),
      UCC_CONFIG_TYPE_UINT},
 
-    {"ALLTOALL_ONESIDED_ALG",
-     "auto",
+    {"ALLTOALL_ONESIDED_ALG", "auto",
      "Algorithm to be used with onesided Alltoall",
      ucc_offsetof(ucc_tl_ucp_lib_config_t, alltoall_onesided_alg),
      UCC_CONFIG_TYPE_ENUM(ucc_tl_ucp_alltoall_onesided_names)},
 
-    {"KN_RADIX",
-     "0",
+    {"KN_RADIX", "0",
      "Radix of all algorithms based on knomial pattern. When set to a "
      "positive value it is used as a convenience parameter to set all "
      "other KN_RADIX values",
-     ucc_offsetof(ucc_tl_ucp_lib_config_t, kn_radix),
-     UCC_CONFIG_TYPE_UINT},
+     ucc_offsetof(ucc_tl_ucp_lib_config_t, kn_radix), UCC_CONFIG_TYPE_UINT},
 
-    {"BARRIER_KN_RADIX",
-     "8",
+    {"BARRIER_KN_RADIX", "8",
      "Radix of the recursive-knomial barrier algorithm",
      ucc_offsetof(ucc_tl_ucp_lib_config_t, barrier_kn_radix),
      UCC_CONFIG_TYPE_UINT},
 
-    {"FANIN_KN_RADIX",
-     "4",
-     "Radix of the knomial tree fanin algorithm",
+    {"FANIN_KN_RADIX", "4", "Radix of the knomial tree fanin algorithm",
      ucc_offsetof(ucc_tl_ucp_lib_config_t, fanin_kn_radix),
      UCC_CONFIG_TYPE_UINT},
 
-    {"FANOUT_KN_RADIX",
-     "4",
-     "Radix of the knomial tree fanout algorithm",
+    {"FANOUT_KN_RADIX", "4", "Radix of the knomial tree fanout algorithm",
      ucc_offsetof(ucc_tl_ucp_lib_config_t, fanout_kn_radix),
      UCC_CONFIG_TYPE_UINT},
 
-    {"ALLREDUCE_KN_RADIX",
-     "auto",
+    {"ALLREDUCE_KN_RADIX", "auto",
      "Radix of the recursive-knomial allreduce algorithm",
      ucc_offsetof(ucc_tl_ucp_lib_config_t, allreduce_kn_radix),
      UCC_CONFIG_TYPE_UINT_RANGED},
 
-    {"ALLREDUCE_SLIDING_WIN_BUF_SIZE",
-     "65536",
+    {"ALLREDUCE_SLIDING_WIN_BUF_SIZE", "65536",
      "Buffer size of the sliding window allreduce algorithm",
      ucc_offsetof(ucc_tl_ucp_lib_config_t, allreduce_sliding_window_buf_size),
      UCC_CONFIG_TYPE_MEMUNITS},
 
-    {"ALLREDUCE_SLIDING_WIN_PUT_WINDOW_SIZE",
-     "0",
+    {"ALLREDUCE_SLIDING_WIN_PUT_WINDOW_SIZE", "0",
      "Max concurrent puts in SW Allreduce. 0 means set to team size",
-     ucc_offsetof(
-         ucc_tl_ucp_lib_config_t, allreduce_sliding_window_put_window_size),
+     ucc_offsetof(ucc_tl_ucp_lib_config_t,
+                  allreduce_sliding_window_put_window_size),
      UCC_CONFIG_TYPE_UINT},
 
-    {"ALLREDUCE_SLIDING_WIN_NUM_GET_BUFS",
-     "0",
+    {"ALLREDUCE_SLIDING_WIN_NUM_GET_BUFS", "0",
      "Number of get buffers for sliding window AR. 0 means set to team size",
-     ucc_offsetof(
-         ucc_tl_ucp_lib_config_t, allreduce_sliding_window_num_get_bufs),
+     ucc_offsetof(ucc_tl_ucp_lib_config_t,
+                  allreduce_sliding_window_num_get_bufs),
      UCC_CONFIG_TYPE_UINT},
 
-    {"ALLREDUCE_SRA_KN_RADIX",
-     "auto",
+    {"ALLREDUCE_SRA_KN_RADIX", "auto",
      "Radix of the scatter-reduce-allgather (SRA) knomial allreduce algorithm",
      ucc_offsetof(ucc_tl_ucp_lib_config_t, allreduce_sra_kn_radix),
      UCC_CONFIG_TYPE_UINT_RANGED},
 
-    {"ALLREDUCE_SRA_KN_PIPELINE",
-     "auto",
+    {"ALLREDUCE_SRA_KN_PIPELINE", "auto",
      "Pipelining settings for SRA Knomial allreduce algorithm",
      ucc_offsetof(ucc_tl_ucp_lib_config_t, allreduce_sra_kn_pipeline),
      UCC_CONFIG_TYPE_PIPELINE_PARAMS},
 
-    {"REDUCE_SCATTER_KN_RADIX",
-     "4",
+    {"REDUCE_SCATTER_KN_RADIX", "4",
      "Radix of the knomial reduce-scatter algorithm",
      ucc_offsetof(ucc_tl_ucp_lib_config_t, reduce_scatter_kn_radix),
      UCC_CONFIG_TYPE_UINT},
 
-    {"ALLGATHER_KN_RADIX",
-     "auto",
-     "Radix of the knomial allgather algorithm",
+    {"ALLGATHER_KN_RADIX", "auto", "Radix of the knomial allgather algorithm",
      ucc_offsetof(ucc_tl_ucp_lib_config_t, allgather_kn_radix),
      UCC_CONFIG_TYPE_UINT_RANGED},
 
-    {"ALLGATHER_KN_MIXED_RADICES",
-     "",
+    {"ALLGATHER_KN_MIXED_RADICES", "",
      "Optional exact mixed-radix schedule for knomial allgather, for example "
      "4,4,6. Every radix must be at least 2 and their product must equal the "
      "team size. Invalid schedules are rejected",
      ucc_offsetof(ucc_tl_ucp_lib_config_t, allgather_kn_mixed_radices),
      UCC_CONFIG_TYPE_STRING},
 
-    {"BCAST_KN_RADIX",
-     "4",
-     "Radix of the recursive-knomial bcast algorithm",
+    {"BCAST_KN_RADIX", "4", "Radix of the recursive-knomial bcast algorithm",
      ucc_offsetof(ucc_tl_ucp_lib_config_t, bcast_kn_radix),
      UCC_CONFIG_TYPE_UINT},
 
-    {"BCAST_SAG_KN_RADIX",
-     "auto",
+    {"BCAST_SAG_KN_RADIX", "auto",
      "Radix of the scatter-allgather (SAG) knomial bcast algorithm",
      ucc_offsetof(ucc_tl_ucp_lib_config_t, bcast_sag_kn_radix),
      UCC_CONFIG_TYPE_UINT_RANGED},
 
-    {"REDUCE_KN_RADIX",
-     "4",
-     "Radix of the knomial tree reduce algorithm",
+    {"REDUCE_KN_RADIX", "4", "Radix of the knomial tree reduce algorithm",
      ucc_offsetof(ucc_tl_ucp_lib_config_t, reduce_kn_radix),
      UCC_CONFIG_TYPE_UINT},
 
-    {"REDUCE_SRG_KN_PIPELINE",
-     "auto",
+    {"REDUCE_SRG_KN_PIPELINE", "auto",
      "Pipelining settings for SRG Knomial reduce algorithm",
      ucc_offsetof(ucc_tl_ucp_lib_config_t, reduce_srg_kn_pipeline),
      UCC_CONFIG_TYPE_PIPELINE_PARAMS},
 
-    {"REDUCE_SRG_KN_RADIX",
-     "auto",
+    {"REDUCE_SRG_KN_RADIX", "auto",
      "Radix of the scatter-reduce-gather (SRG) knomial reduce algorithm",
      ucc_offsetof(ucc_tl_ucp_lib_config_t, reduce_srg_kn_radix),
      UCC_CONFIG_TYPE_UINT_RANGED},
 
-    {"GATHER_KN_RADIX",
-     "4",
-     "Radix of the knomial tree gather algorithm",
+    {"GATHER_KN_RADIX", "4", "Radix of the knomial tree gather algorithm",
      ucc_offsetof(ucc_tl_ucp_lib_config_t, gather_kn_radix),
      UCC_CONFIG_TYPE_UINT},
 
-    {"GATHERV_LINEAR_NUM_POSTS",
-     "0",
+    {"GATHERV_LINEAR_NUM_POSTS", "0",
      "Maximum number of outstanding send and receive messages in gatherv "
      "linear algorithm",
      ucc_offsetof(ucc_tl_ucp_lib_config_t, gatherv_linear_num_posts),
      UCC_CONFIG_TYPE_UINT},
 
-    {"SCATTER_KN_RADIX",
-     "4",
-     "Radix of the knomial scatter algorithm",
+    {"SCATTER_KN_RADIX", "4", "Radix of the knomial scatter algorithm",
      ucc_offsetof(ucc_tl_ucp_lib_config_t, scatter_kn_radix),
      UCC_CONFIG_TYPE_UINT},
 
-    {"SCATTER_KN_ENABLE_RECV_ZCOPY",
-     "auto",
+    {"SCATTER_KN_ENABLE_RECV_ZCOPY", "auto",
      "Receive scatter data to user buffer with correct offset using zcopy",
      ucs_offsetof(ucc_tl_ucp_lib_config_t, scatter_kn_enable_recv_zcopy),
      UCC_CONFIG_TYPE_ON_OFF_AUTO},
 
-    {"SCATTERV_LINEAR_NUM_POSTS",
-     "16",
+    {"SCATTERV_LINEAR_NUM_POSTS", "16",
      "Maximum number of outstanding send and receive messages in scatterv "
      "linear algorithm",
      ucc_offsetof(ucc_tl_ucp_lib_config_t, scatterv_linear_num_posts),
      UCC_CONFIG_TYPE_UINT},
 
-    {"REDUCE_AVG_PRE_OP",
-     "1",
+    {"REDUCE_AVG_PRE_OP", "1",
      "Reduce will perform division by team_size in early stages of the "
      "algorithm,\n"
      "else - in result",
      ucc_offsetof(ucc_tl_ucp_lib_config_t, reduce_avg_pre_op),
      UCC_CONFIG_TYPE_BOOL},
 
-    {"REDUCE_SCATTER_RING_BIDIRECTIONAL",
-     "y",
+    {"REDUCE_SCATTER_RING_BIDIRECTIONAL", "y",
      "Launch 2 inverted rings concurrently during ReduceScatter Ring algorithm",
      ucc_offsetof(ucc_tl_ucp_lib_config_t, reduce_scatter_ring_bidirectional),
      UCC_CONFIG_TYPE_BOOL},
 
-    {"REDUCE_SCATTERV_RING_BIDIRECTIONAL",
-     "y",
+    {"REDUCE_SCATTERV_RING_BIDIRECTIONAL", "y",
      "Launch 2 inverted rings concurrently during ReduceScatterv Ring "
      "algorithm",
      ucc_offsetof(ucc_tl_ucp_lib_config_t, reduce_scatterv_ring_bidirectional),
      UCC_CONFIG_TYPE_BOOL},
 
-    {"USE_TOPO",
-     "try",
+    {"USE_TOPO", "try",
      "Allow usage of tl ucp topo",
      ucc_offsetof(ucc_tl_ucp_lib_config_t, use_topo),
      UCC_CONFIG_TYPE_TERNARY},
 
-    {"RANKS_REORDERING",
-     "y",
+    {"RANKS_REORDERING", "y",
      "Use topology information in TL UCP to reorder ranks. Requires topo info",
      ucc_offsetof(ucc_tl_ucp_lib_config_t, use_reordering),
      UCC_CONFIG_TYPE_BOOL},
 
     {NULL}};
+/* clang-format on */
 
 const char* ucc_tl_ucp_local_copy_names[] = {
     [UCC_TL_UCP_LOCAL_COPY_TYPE_UCP]  = "ucp",