Checkpoint scope work. (#241)

Signed-off-by: Samuel K. Gutierrez <[email protected]>
hpc · Jul 24, 2024 · 312f9a1 · 312f9a1
1 parent 5caed3a
commit 312f9a1
Show file tree

Hide file tree

Showing 7 changed files with 293 additions and 321 deletions.
diff --git a/src/quo-vadis.cc b/src/quo-vadis.cc
@@ -103,6 +103,7 @@ qv_scope_nobjs(
     qvi_catch_and_return();
 }
 
+// TODO(skg) Rename to qv_scope_group_rank.
 int
 qv_scope_taskid(
     qv_scope_t *scope,
@@ -112,11 +113,12 @@ qv_scope_taskid(
         return QV_ERR_INVLD_ARG;
     }
     try {
-        return qvi_scope_taskid(scope, taskid);
+        return qvi_scope_group_rank(scope, taskid);
     }
     qvi_catch_and_return();
 }
 
+// TODO(skg) Rename to qv_scope_group_size.
 int
 qv_scope_ntasks(
     qv_scope_t *scope,
@@ -126,7 +128,7 @@ qv_scope_ntasks(
         return QV_ERR_INVLD_ARG;
     }
     try {
-        return qvi_scope_ntasks(scope, ntasks);
+        return qvi_scope_group_size(scope, ntasks);
     }
     qvi_catch_and_return();
 }

diff --git a/src/qvi-hwpool.cc b/src/qvi-hwpool.cc
@@ -43,6 +43,7 @@
 // approach using the device IDs instead of the bit positions.
 
 #include "qvi-hwpool.h"
+#include "qvi-bbuff.h"
 #include "qvi-bbuff-rmi.h"
 #include "qvi-utils.h"
 

diff --git a/src/qvi-hwpool.h b/src/qvi-hwpool.h
@@ -17,7 +17,6 @@
 #define QVI_HWPOOL_H
 
 #include "qvi-common.h" // IWYU pragma: keep
-#include "qvi-bbuff.h"
 #include "qvi-hwloc.h"
 
 /**
@@ -61,15 +60,11 @@ struct qvi_hwpool_dev_s : qvi_hwpool_res_s {
       , affinity(dev.affinity)
       , id(dev.id)
       , pci_bus_id(dev.pci_bus_id)
-      , uuid(dev.uuid)
-    {
-    }
+      , uuid(dev.uuid) { }
     /** Constructor using std::shared_ptr<qvi_hwloc_device_s>. */
     explicit qvi_hwpool_dev_s(
         const std::shared_ptr<qvi_hwloc_device_s> &shdev
-    ) : qvi_hwpool_dev_s(*shdev.get())
-    {
-    }
+    ) : qvi_hwpool_dev_s(*shdev.get()) { }
     /** Destructor. */
     virtual ~qvi_hwpool_dev_s(void) = default;
     /** Equality operator. */

diff --git a/src/qvi-rmi.cc b/src/qvi-rmi.cc
@@ -26,6 +26,7 @@
 // TODO(skg) We need to implement timeouts.
 
 #include "qvi-rmi.h"
+#include "qvi-bbuff.h"
 #include "qvi-bbuff-rmi.h"
 #include "qvi-hwpool.h"
 #include "qvi-utils.h"
@@ -950,7 +951,7 @@ qvi_rmi_client_connect(
 }
 
 qvi_hwloc_t *
-qvi_rmi_client_hwloc_get(
+qvi_rmi_client_hwloc(
     qvi_rmi_client_t *client
 ) {
     return client->config.hwloc;

diff --git a/src/qvi-rmi.h b/src/qvi-rmi.h
@@ -95,7 +95,7 @@ qvi_rmi_client_free(
  *
  */
 qvi_hwloc_t *
-qvi_rmi_client_hwloc_get(
+qvi_rmi_client_hwloc(
     qvi_rmi_client_t *client
 );