UCT/MLX5: fix format

Author: JeynmannZ

src/uct/api/v2/uct_v2.h

@@ -1459,7 +1459,7 @@ ucs_status_t uct_md_mem_elem_pack(uct_md_h md, uct_mem_h memh, uct_rkey_t rkey,
  * The enumeration allows specifying which fields in @ref uct_ep_op_info_t are
  * present, for backward compatibility support.
  */
- enum uct_ep_op_info_field {
+enum uct_ep_op_info_field {
     UCT_EP_OP_INFO_FIELD_AM     = UCS_BIT(0), /**< am_id, am_hdr* fields */
     UCT_EP_OP_INFO_FIELD_DATA   = UCS_BIT(1), /**< data/length (short/bcopy) */
     UCT_EP_OP_INFO_FIELD_IOV    = UCS_BIT(2), /**< iov/iovcnt (zcopy) */

src/uct/ib/mlx5/rc/rc_mlx5_ep.c

@@ -58,7 +58,7 @@ uct_rc_mlx5_base_ep_query(uct_ep_h tl_ep, uct_ep_attr_t *ep_attr)
         qp = ep->tx.wq.super.verbs.qp;
 #if HAVE_DEVX
     } else if (ep->tx.wq.super.type == UCT_IB_MLX5_OBJ_TYPE_DEVX) {
-        devx_obj = ep->tx.wq.super.devx.obj;
+        devx_obj         = ep->tx.wq.super.devx.obj;
         attr.field_mask |= UCT_IB_MLX5_EXT_QP_QUERY_ATTR_FIELD_QP_NUM;
         attr.qp_num      = ep->tx.wq.super.qp_num;
 #endif
@@ -73,9 +73,8 @@ uct_rc_mlx5_base_ep_query(uct_ep_h tl_ep, uct_ep_attr_t *ep_attr)
                                     &attr);
 }
 
-ucs_status_t
-uct_rc_mlx5_ep_outstanding_extract(uct_ep_h ep,
-                                   const uct_ep_outstanding_extract_params_t *params)
+ucs_status_t uct_rc_mlx5_ep_outstanding_extract(
+        uct_ep_h ep, const uct_ep_outstanding_extract_params_t *params)
 {
     return uct_ib_mlx5_ext_ep_outstanding_extract(ep, params);
 }

src/uct/ib/mlx5/rc/rc_mlx5_iface.c

@@ -975,16 +975,16 @@ static UCS_CLASS_DEFINE_NEW_FUNC(uct_rc_mlx5_iface_t, uct_iface_t, uct_md_h,
 
 static UCS_CLASS_DEFINE_DELETE_FUNC(uct_rc_mlx5_iface_t, uct_iface_t);
 
-static ucs_status_t
-uct_rc_mlx5_iface_query_v2(uct_iface_h tl_iface, uct_iface_attr_v2_t *iface_attr)
+static ucs_status_t uct_rc_mlx5_iface_query_v2(uct_iface_h tl_iface,
+                                               uct_iface_attr_v2_t *iface_attr)
 {
     uct_ib_mlx5_ext_iface_query_attr_t ext_attr = {};
     const uint64_t base_mask = UCT_IFACE_ATTR_FIELD_CAP_FLAGS |
                                UCT_IFACE_ATTR_FIELD_MAX_PUT_SGL_ZCOPY_COUNT |
                                UCT_IFACE_ATTR_FIELD_TX_TOKEN |
                                UCT_IFACE_ATTR_FIELD_RX_TOKEN;
-    const uint64_t sgl_mask = UCT_IFACE_ATTR_FIELD_CAP_FLAGS |
-                              UCT_IFACE_ATTR_FIELD_MAX_PUT_SGL_ZCOPY_COUNT;
+    const uint64_t sgl_mask  = UCT_IFACE_ATTR_FIELD_CAP_FLAGS |
+                               UCT_IFACE_ATTR_FIELD_MAX_PUT_SGL_ZCOPY_COUNT;
     size_t max_sgl;
     ucs_status_t status;
 
@@ -998,11 +998,13 @@ uct_rc_mlx5_iface_query_v2(uct_iface_h tl_iface, uct_iface_attr_v2_t *iface_attr
     if (iface_attr->field_mask & sgl_mask) {
         max_sgl = uct_ib_mlx5_ext_max_put_sgl_zcopy_count();
         if (iface_attr->field_mask & UCT_IFACE_ATTR_FIELD_CAP_FLAGS) {
-            iface_attr->cap.flags |=
-                    (max_sgl > 0) ? UCT_IFACE_FLAG_V2_PUT_SGL_ZCOPY : 0;
+            iface_attr->cap.flags |= (max_sgl > 0) ?
+                                             UCT_IFACE_FLAG_V2_PUT_SGL_ZCOPY :
+                                             0;
         }
 
-        if (iface_attr->field_mask & UCT_IFACE_ATTR_FIELD_MAX_PUT_SGL_ZCOPY_COUNT) {
+        if (iface_attr->field_mask &
+            UCT_IFACE_ATTR_FIELD_MAX_PUT_SGL_ZCOPY_COUNT) {
             iface_attr->max_put_sgl_zcopy_count = max_sgl;
         }
     }
@@ -1023,14 +1025,12 @@ uct_rc_mlx5_iface_query_v2(uct_iface_h tl_iface, uct_iface_attr_v2_t *iface_attr
     }
 
     if (iface_attr->field_mask & UCT_IFACE_ATTR_FIELD_TX_TOKEN) {
-        ext_attr.field_mask |=
-                UCT_IB_MLX5_EXT_IFACE_QUERY_ATTR_FIELD_TX_TOKEN;
+        ext_attr.field_mask |= UCT_IB_MLX5_EXT_IFACE_QUERY_ATTR_FIELD_TX_TOKEN;
         ext_attr.tx_token    = iface_attr->tx_token;
     }
 
     if (iface_attr->field_mask & UCT_IFACE_ATTR_FIELD_RX_TOKEN) {
-        ext_attr.field_mask |=
-                UCT_IB_MLX5_EXT_IFACE_QUERY_ATTR_FIELD_RX_TOKEN;
+        ext_attr.field_mask |= UCT_IB_MLX5_EXT_IFACE_QUERY_ATTR_FIELD_RX_TOKEN;
         ext_attr.rx_token    = iface_attr->rx_token;
     }
 

test/gtest/Makefile.am

@@ -130,7 +130,6 @@ gtest_SOURCES = \
 	uct/test_uct_iface.cc \
 	uct/test_uct_perf.cc \
 	uct/v2/test_uct_query.cc \
-	uct/v2/test_uct_outstanding_extract.cc \
 	uct/test_zcopy_comp.cc \
 	uct/uct_p2p_test.cc \
 	uct/uct_test.cc \