1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
|
diff --git a/src/backend/common/ArrayFireTypesIO.hpp b/src/backend/common/ArrayFireTypesIO.hpp
index e7a2e085e..5da74a9c2 100644
--- a/src/backend/common/ArrayFireTypesIO.hpp
+++ b/src/backend/common/ArrayFireTypesIO.hpp
@@ -21,7 +21,7 @@ struct fmt::formatter<af_seq> {
}
template<typename FormatContext>
- auto format(const af_seq& p, FormatContext& ctx) -> decltype(ctx.out()) {
+ auto format(const af_seq& p, FormatContext& ctx) const -> decltype(ctx.out()) {
// ctx.out() is an output iterator to write to.
if (p.begin == af_span.begin && p.end == af_span.end &&
p.step == af_span.step) {
@@ -73,18 +73,16 @@ struct fmt::formatter<arrayfire::common::Version> {
}
template<typename FormatContext>
- auto format(const arrayfire::common::Version& ver, FormatContext& ctx)
+ auto format(const arrayfire::common::Version& ver, FormatContext& ctx) const
-> decltype(ctx.out()) {
if (ver.major() == -1) return format_to(ctx.out(), "N/A");
- if (ver.minor() == -1) show_minor = false;
- if (ver.patch() == -1) show_patch = false;
- if (show_major && !show_minor && !show_patch) {
+ if (show_major && (ver.minor() == -1) && (ver.patch() == -1)) {
return format_to(ctx.out(), "{}", ver.major());
}
- if (show_major && show_minor && !show_patch) {
+ if (show_major && (ver.minor() != -1) && (ver.patch() == -1)) {
return format_to(ctx.out(), "{}.{}", ver.major(), ver.minor());
}
- if (show_major && show_minor && show_patch) {
+ if (show_major && (ver.minor() != -1) && (ver.patch() != -1)) {
return format_to(ctx.out(), "{}.{}.{}", ver.major(), ver.minor(),
ver.patch());
}
diff --git a/src/backend/common/debug.hpp b/src/backend/common/debug.hpp
index 54e74a295..07fa589ac 100644
--- a/src/backend/common/debug.hpp
+++ b/src/backend/common/debug.hpp
@@ -12,6 +12,7 @@
#include <boost/stacktrace.hpp>
#include <common/ArrayFireTypesIO.hpp>
#include <common/jit/NodeIO.hpp>
+#include <fmt/ranges.h>
#include <spdlog/fmt/bundled/format.h>
#include <iostream>
diff --git a/src/backend/common/jit/NodeIO.hpp b/src/backend/common/jit/NodeIO.hpp
index ac149d98d..edffdfae4 100644
--- a/src/backend/common/jit/NodeIO.hpp
+++ b/src/backend/common/jit/NodeIO.hpp
@@ -16,7 +16,7 @@
template<>
struct fmt::formatter<af::dtype> : fmt::formatter<char> {
template<typename FormatContext>
- auto format(const af::dtype& p, FormatContext& ctx) -> decltype(ctx.out()) {
+ auto format(const af::dtype& p, FormatContext& ctx) const -> decltype(ctx.out()) {
format_to(ctx.out(), "{}", arrayfire::common::getName(p));
return ctx.out();
}
@@ -58,7 +58,7 @@ struct fmt::formatter<arrayfire::common::Node> {
// Formats the point p using the parsed format specification (presentation)
// stored in this formatter.
template<typename FormatContext>
- auto format(const arrayfire::common::Node& node, FormatContext& ctx)
+ auto format(const arrayfire::common::Node& node, FormatContext& ctx) const
-> decltype(ctx.out()) {
// ctx.out() is an output iterator to write to.
diff --git a/src/backend/cuda/debug_cuda.hpp b/src/backend/cuda/debug_cuda.hpp
index 555944a5e..93ebcf027 100644
--- a/src/backend/cuda/debug_cuda.hpp
+++ b/src/backend/cuda/debug_cuda.hpp
@@ -29,7 +29,7 @@ template<>
struct fmt::formatter<dim3> : fmt::formatter<std::string> {
// parse is inherited from formatter<string_view>.
template<typename FormatContext>
- auto format(dim3 c, FormatContext& ctx) {
+ auto format(const dim3 &c, FormatContext &ctx) const {
std::string name = fmt::format("{} {} {}", c.x, c.y, c.z);
return formatter<std::string>::format(name, ctx);
}
diff --git a/src/backend/opencl/compile_module.cpp b/src/backend/opencl/compile_module.cpp
index 89d382c9c..2c979fd5e 100644
--- a/src/backend/opencl/compile_module.cpp
+++ b/src/backend/opencl/compile_module.cpp
@@ -22,6 +22,8 @@
#include <platform.hpp>
#include <traits.hpp>
+#include <fmt/ranges.h>
+
#include <algorithm>
#include <cctype>
#include <cstdio>
|