Merge branch 'main' into charm-pingack

Author: ritvikrao

src/conv-core/shmem/cmishmem.C

@@ -59,7 +59,7 @@ CmiIpcBlock* CmiMsgToIpcBlock(CmiIpcManager* manager, char* src, std::size_t len
     if (block == nullptr) {
       return nullptr;
     } else {
-      CmiAssertMsg((block->dst == manager->mine) && (manager->mine == CmiMyNode()));
+      CmiAssert((block->dst == manager->mine) && (manager->mine == CmiMyNode()));
       dst = (char*)CmiIpcBlockToMsg(block, true);
       memcpy(dst, src, len);
       CmiFree(src);
@@ -159,7 +159,7 @@ std::pair<CmiIpcBlock*, CmiIpcAllocStatus> CmiAllocIpcBlock(CmiIpcManager* meta,
 
 void CmiFreeIpcBlock(CmiIpcManager* meta, CmiIpcBlock* block) {
   auto bin = whichBin_(block->size);
-  CmiAssertMsg(bin < kNumCutOffPoints);
+  CmiAssert(bin < kNumCutOffPoints);
   auto& shared = meta->shared[block->src];
   auto& free = shared->free[bin];
   while (!pushBlock_(free, block->orig, shared))

src/libs/ck-libs/allGather/allGather.C

@@ -1,4 +1,8 @@
 #include "allGather.h"
+#if defined(_WIN32)
+//for getpid()
+#include "process.h"
+#endif
 
 int AllGather::gen_rand()
 {
@@ -129,7 +133,7 @@ void AllGather::Flood(int sender, CkNcpyBuffer src)
                    CK_BUFFER_REG);
   dst.get(src);
   for (int i = 0; i < n; i++)
-    if (graph[CkMyPe()][i] == 1 and i != sender)
+    if (graph[CkMyPe()][i] == 1 && i != sender)
       thisProxy[i].Flood(sender, src);
 }