Resolve clang++ warnings (#325)

microsoft · Jul 11, 2024 · c4ca2fb · c4ca2fb
1 parent f4c3c8f
commit c4ca2fb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/apps/nccl/src/allreduce.hpp b/apps/nccl/src/allreduce.hpp
@@ -142,7 +142,6 @@ __global__ void __launch_bounds__(32, 1)
   const int localBlockIdx = blockIdx.x % nBlocksPerPeer;
   const int tid = threadIdx.x + localBlockIdx * blockDim.x;
   const int peerIdx = blockIdx.x / nBlocksPerPeer;
-  const int remoteRank = peerIdx < rank ? peerIdx : peerIdx + 1;
   // Double buffering
   size_t scratchBaseOffset = (flag & 1) ? 0 : 4 * worldSize * nelems * sizeof(mscclpp::LL8Packet);
   size_t srcOffset = channelDataOffset;
@@ -163,7 +162,7 @@ __global__ void __launch_bounds__(32, 1)
                                                    blockDim.x * nBlocksPerPeer, flag);
 
   // step 2: Reduce Data
-  for (int idx = threadIdx.x + blockIdx.x * blockDim.x; idx < nelems; idx += blockDim.x * gridDim.x) {
+  for (size_t idx = threadIdx.x + blockIdx.x * blockDim.x; idx < nelems; idx += blockDim.x * gridDim.x) {
     uint32_t data = 0;
     for (int index = 0; index < nPeers; index++) {
       const int remoteRank = index < rank ? index : index + 1;

diff --git a/python/mscclpp/core_py.cpp b/python/mscclpp/core_py.cpp
@@ -96,15 +96,18 @@ void register_core(nb::module_& m) {
       .def("any", &TransportFlags::any)
       .def("all", &TransportFlags::all)
       .def("count", &TransportFlags::count)
-      .def(nb::self |= nb::self)
       .def(nb::self | nb::self)
       .def(nb::self | Transport())
-      .def(nb::self &= nb::self)
       .def(nb::self & nb::self)
       .def(nb::self & Transport())
-      .def(nb::self ^= nb::self)
       .def(nb::self ^ nb::self)
       .def(nb::self ^ Transport())
+      .def(
+          "__ior__", [](TransportFlags& lhs, const TransportFlags& rhs) { return lhs |= rhs; }, nb::is_operator())
+      .def(
+          "__iand__", [](TransportFlags& lhs, const TransportFlags& rhs) { return lhs &= rhs; }, nb::is_operator())
+      .def(
+          "__ixor__", [](TransportFlags& lhs, const TransportFlags& rhs) { return lhs ^= rhs; }, nb::is_operator())
       .def(~nb::self)
       .def(nb::self == nb::self)
       .def(nb::self != nb::self);