Skip to content

DPL: get rid of gsl::span. #14523

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

Merged
ktf merged 1 commit into from
Jul 18, 2025
Merged

DPL: get rid of gsl::span. #14523

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
4 changes: 2 additions & 2 deletions Framework/Core/include/Framework/DeviceMetricsInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <array>
#include <cstddef>
#include <cstdint>
#include <gsl/span>
#include <span>
#include <string>
#include <vector>

Expand Down Expand Up @@ -217,7 +217,7 @@ struct DeviceMetricsInfoHelpers {
info.changed.clear();
}
}
static size_t metricsStorageSize(gsl::span<DeviceMetricsInfo const> infos)
static size_t metricsStorageSize(std::span<DeviceMetricsInfo const> infos)
{
// Count the size of the metrics storage
size_t totalSize = 0;
Expand Down
17 changes: 8 additions & 9 deletions Framework/GUISupport/src/FrameworkGUIDebugger.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@

#include <algorithm>
#include <iostream>
#include <set>
#include <string>
#include <cinttypes>
#include <numeric>
Expand Down Expand Up @@ -210,8 +209,8 @@ enum MetricTypes {
// so that we can display driver and device metrics in the same plot
// without an if.
struct AllMetricsStore {
gsl::span<DeviceMetricsInfo const> metrics[TOTAL_TYPES_OF_METRICS];
gsl::span<TopologyNodeInfo const> specs[TOTAL_TYPES_OF_METRICS];
std::span<DeviceMetricsInfo const> metrics[TOTAL_TYPES_OF_METRICS];
std::span<TopologyNodeInfo const> specs[TOTAL_TYPES_OF_METRICS];
};

void displaySparks(
Expand Down Expand Up @@ -376,8 +375,8 @@ void displayDeviceMetrics(const char* label,
ImPlotAxisFlags axisFlags = 0;

for (size_t si = 0; si < TOTAL_TYPES_OF_METRICS; ++si) {
gsl::span<DeviceMetricsInfo const> metricsInfos = metricStore.metrics[si];
gsl::span<TopologyNodeInfo const> specs = metricStore.specs[si];
std::span<DeviceMetricsInfo const> metricsInfos = metricStore.metrics[si];
std::span<TopologyNodeInfo const> specs = metricStore.specs[si];
for (int di = 0; di < metricsInfos.size(); ++di) {
for (size_t mi = 0; mi < metricsInfos[di].metrics.size(); ++mi) {
if (state[gmi].visible == false) {
Expand Down Expand Up @@ -1175,10 +1174,10 @@ std::function<void(void)> getGUIDebugger(std::vector<DeviceInfo> const& infos,

AllMetricsStore metricsStore;

metricsStore.metrics[DEVICE_METRICS] = gsl::span(metricsInfos);
metricsStore.metrics[DRIVER_METRICS] = gsl::span(&driverInfo.metrics, 1);
metricsStore.specs[DEVICE_METRICS] = gsl::span(deviceNodesInfos);
metricsStore.specs[DRIVER_METRICS] = gsl::span(driverNodesInfos);
metricsStore.metrics[DEVICE_METRICS] = std::span(metricsInfos);
metricsStore.metrics[DRIVER_METRICS] = std::span(&driverInfo.metrics, 1);
metricsStore.specs[DEVICE_METRICS] = std::span(deviceNodesInfos);
metricsStore.specs[DRIVER_METRICS] = std::span(driverNodesInfos);
displayMetrics(guiState, driverInfo, infos, metadata, controls, metricsStore);
displayDriverInfo(driverInfo, driverControl);

Expand Down