From 7e7e643210810028b034b00474db9449979a0426 Mon Sep 17 00:00:00 2001
From: Sebastian Grimberg <sjg@amazon.com>
Date: Wed, 10 Jan 2024 10:26:54 -0800
Subject: [PATCH] Fix 64-bit index bug found by compiler warning

---
 extern/patch/metis/patch_build.diff           | 40 +++++++++++++++++++
 .../mfem/patch_getnodalvalues_device_fix.diff | 15 +++++++
 2 files changed, 55 insertions(+)
 create mode 100644 extern/patch/mfem/patch_getnodalvalues_device_fix.diff

diff --git a/extern/patch/metis/patch_build.diff b/extern/patch/metis/patch_build.diff
index d16882037..ec8b37257 100644
--- a/extern/patch/metis/patch_build.diff
+++ b/extern/patch/metis/patch_build.diff
@@ -124,3 +124,43 @@ index 3fb0e6e..6e88b53 100644
        return;
  
      if (graph->nbnd > 0)
+diff --git a/libmetis/parmetis.c b/libmetis/parmetis.c
+index 631d811..418b606 100644
+--- a/libmetis/parmetis.c
++++ b/libmetis/parmetis.c
+@@ -308,7 +308,7 @@ void FM_2WayNodeRefine1SidedP(ctrl_t *ctrl, graph_t *graph,
+     * Get into the FM loop
+     *******************************************************/
+     mptr[0] = nmind = nbad = 0;
+-    mindiff = abs(pwgts[0]-pwgts[1]);
++    mindiff = iabs(pwgts[0]-pwgts[1]);
+     for (nswaps=0; nswaps<nvtxs; nswaps++) {
+       if ((higain = rpqGetTop(queue)) == -1) 
+         break;
+@@ -333,7 +333,7 @@ void FM_2WayNodeRefine1SidedP(ctrl_t *ctrl, graph_t *graph,
+ 
+       pwgts[2] -= (vwgt[higain]-rinfo[higain].edegrees[from]);
+ 
+-      newdiff = abs(pwgts[to]+vwgt[higain] - (pwgts[from]-rinfo[higain].edegrees[from]));
++      newdiff = iabs(pwgts[to]+vwgt[higain] - (pwgts[from]-rinfo[higain].edegrees[from]));
+       if (pwgts[2] < mincut || (pwgts[2] == mincut && newdiff < mindiff)) {
+         mincut      = pwgts[2];
+         mincutorder = nswaps;
+@@ -537,7 +537,7 @@ void FM_2WayNodeRefine2SidedP(ctrl_t *ctrl, graph_t *graph,
+     * Get into the FM loop
+     *******************************************************/
+     mptr[0] = nmind = 0;
+-    mindiff = abs(pwgts[0]-pwgts[1]);
++    mindiff = iabs(pwgts[0]-pwgts[1]);
+     to = (pwgts[0] < pwgts[1] ? 0 : 1);
+     for (nswaps=0; nswaps<nvtxs; nswaps++) {
+       u[0] = rpqSeeTopVal(queues[0]);  
+@@ -580,7 +580,7 @@ void FM_2WayNodeRefine2SidedP(ctrl_t *ctrl, graph_t *graph,
+ 
+       pwgts[2] -= (vwgt[higain]-rinfo[higain].edegrees[other]);
+ 
+-      newdiff = abs(pwgts[to]+vwgt[higain] - (pwgts[other]-rinfo[higain].edegrees[other]));
++      newdiff = iabs(pwgts[to]+vwgt[higain] - (pwgts[other]-rinfo[higain].edegrees[other]));
+       if (pwgts[2] < mincut || (pwgts[2] == mincut && newdiff < mindiff)) {
+         mincut      = pwgts[2];
+         mincutorder = nswaps;
diff --git a/extern/patch/mfem/patch_getnodalvalues_device_fix.diff b/extern/patch/mfem/patch_getnodalvalues_device_fix.diff
new file mode 100644
index 000000000..1f41b8123
--- /dev/null
+++ b/extern/patch/mfem/patch_getnodalvalues_device_fix.diff
@@ -0,0 +1,15 @@
+diff --git a/fem/gridfunc.cpp b/fem/gridfunc.cpp
+index 310d8d704..bd5504d63 100644
+--- a/fem/gridfunc.cpp
++++ b/fem/gridfunc.cpp
+@@ -1924,9 +1924,9 @@ void GridFunction::GetNodalValues(Vector &nval, int vdim) const
+    Array<double> values;
+    Array<int> overlap(fes->GetNV());
+    nval.SetSize(fes->GetNV());
+-
+    nval = 0.0;
+    overlap = 0;
++   nval.HostReadWrite();
+    for (i = 0; i < fes->GetNE(); i++)
+    {
+       fes->GetElementVertices(i, vertices);