Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Checkpoint scope work. #241

Merged
merged 1 commit into from
Jul 24, 2024
Merged

Checkpoint scope work. #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/quo-vadis.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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();
}
Expand Down
1 change: 1 addition & 0 deletions src/qvi-hwpool.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
9 changes: 2 additions & 7 deletions src/qvi-hwpool.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#define QVI_HWPOOL_H

#include "qvi-common.h" // IWYU pragma: keep
#include "qvi-bbuff.h"
#include "qvi-hwloc.h"

/**
Expand Down Expand Up @@ -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. */
Expand Down
3 changes: 2 additions & 1 deletion src/qvi-rmi.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/qvi-rmi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
);

Expand Down
Loading
Loading