fix conflict rewritedata.py

Bears-R-Us · Jan 3, 2023 · 8f10e7f · 8f10e7f
2 parents 1fceff2 + 5ace89f
commit 8f10e7f
Show file tree

Hide file tree

Showing 4 changed files with 885 additions and 120 deletions.
diff --git a/server-config.py b/server-config.py
@@ -43,8 +43,11 @@ def run(ak_loc, my_loc):
     # If this gets to long for the shell we'll need to switch to exporting our env vars
     # If it's still too long, the Arkouda team will need to make a change to the build process.
     ak_srv_user_mods = '"' + " ".join(c_files) + '"' # setup our ARKOUDA_SERVER_USER_MODULES var
-    print(f"ARKOUDA_SERVER_USER_MODULES={ak_srv_user_mods} ARKOUDA_CONFIG_FILE={tmp_cfg} ARKOUDA_SKIP_CHECK_DEPS=true   make -C {ak_loc}")
+    print(f"ARKOUDA_SERVER_USER_MODULES={ak_srv_user_mods} ARKOUDA_CONFIG_FILE={tmp_cfg} make ARKOUDA_SKIP_CHECK_DEPS=true  -C {ak_loc}")
 
+    #print(f"unset ARKOUDA_DEVELOPER")
+    #print(f"ARKOUDA_QUICK_COMPILE=True")
+    #print(f"make ARKOUDA_SKIP_CHECK_DEPS=true  -C {ak_loc}")
 
 if __name__ == "__main__":
     # print(os.path.dirname(os.path.realpath(__file__)))

diff --git a/server/GraphMsg.chpl b/server/GraphMsg.chpl
@@ -173,7 +173,11 @@ module GraphMsg {
              }
 
              try {
-                      iv = mergedArgsort(2);
+                      if (totalDigits <=2) {
+                           iv = mergedArgsort(2);
+                      } else {
+                           iv = mergedArgsort(4);
+                      }
 
              } catch  {
                   try! smLogger.error(getModuleName(),getRoutineName(),getLineNumber(),
@@ -854,10 +858,14 @@ module GraphMsg {
                  try!  smLogger.error(getModuleName(),getRoutineName(),getLineNumber(),
                       "combine sort error");
           }
+          smLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),
+                      "after combine sort for srcR, dstR");
           set_neighbour(srcR,start_iR,neighbourR);
 
           if (DegreeSortFlag) {
                     degree_sort_u(src, dst, start_i, neighbour, srcR, dstR, start_iR, neighbourR,e_weight,WeightedFlag);
+                    smLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),
+                      "after degree sort");
           }
 
 
@@ -1027,8 +1035,9 @@ module GraphMsg {
                   var mw = wf.writer(kind=ionative);
 
                   for i in 0..NewNe-1 {
-                      mw.writeln("%-15i    %-15i".format(src[i],dst[i]));
+                      mw.writeln("%-15i    %-15i".format(mysrc[i],mydst[i]));
                   }
+                  mw.writeln("Num Edge=%i  Num Vertex=%i".format(NewNe, NewNv));
                   mw.close();
                   wf.close();