From d2f47110dc4d7d9c3137a1f3a4ce292cc22c90e6 Mon Sep 17 00:00:00 2001
From: Aaron Siddhartha Mondal <aaron@eomii.org>
Date: Thu, 24 Nov 2022 10:22:31 +0100
Subject: [PATCH 1/3] Fix filesystem detection for clang

Clang defines __GNUC__ but does not use experimental/filesystem.
---
 nvbench/json_printer.cu | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/nvbench/json_printer.cu b/nvbench/json_printer.cu
index b78e5be..5be89d5 100644
--- a/nvbench/json_printer.cu
+++ b/nvbench/json_printer.cu
@@ -16,24 +16,18 @@
  *  limitations under the License.
  */
 
-#include <nvbench/json_printer.cuh>
-
 #include <nvbench/axes_metadata.cuh>
 #include <nvbench/benchmark_base.cuh>
 #include <nvbench/config.cuh>
+#include <nvbench/detail/throw.cuh>
 #include <nvbench/device_info.cuh>
 #include <nvbench/device_manager.cuh>
 #include <nvbench/git_revision.cuh>
+#include <nvbench/json_printer.cuh>
 #include <nvbench/state.cuh>
 #include <nvbench/summary.cuh>
 #include <nvbench/version.cuh>
 
-#include <nvbench/detail/throw.cuh>
-
-#include <fmt/format.h>
-
-#include <nlohmann/json.hpp>
-
 #include <cstdint>
 #include <fstream>
 #include <iterator>
@@ -43,7 +37,10 @@
 #include <utility>
 #include <vector>
 
-#ifdef __GNUC__
+#include <fmt/format.h>
+#include <nlohmann/json.hpp>
+
+#if defined __GNUC__ && !defined __clang__
 #include <experimental/filesystem>
 #else
 #include <filesystem>
@@ -140,7 +137,7 @@ void json_printer::do_process_bulk_data_float64(state &state,
 
   if (hint == "sample_times")
   {
-#ifdef __GNUC__
+#if defined __GNUC__ && !defined __clang__
     namespace fs = std::experimental::filesystem;
 #else
     namespace fs = std::filesystem;

From 05743e5e613e0b0d3fe3a2e653e67caaa21d3c60 Mon Sep 17 00:00:00 2001
From: Aaron Siddhartha Mondal <aaron@eomii.org>
Date: Wed, 1 Feb 2023 14:18:12 +0100
Subject: [PATCH 2/3] Restore previous include order

---
 nvbench/json_printer.cu | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/nvbench/json_printer.cu b/nvbench/json_printer.cu
index 5be89d5..9b2b33c 100644
--- a/nvbench/json_printer.cu
+++ b/nvbench/json_printer.cu
@@ -16,18 +16,24 @@
  *  limitations under the License.
  */
 
+#include <nvbench/json_printer.cuh>
+
 #include <nvbench/axes_metadata.cuh>
 #include <nvbench/benchmark_base.cuh>
 #include <nvbench/config.cuh>
-#include <nvbench/detail/throw.cuh>
 #include <nvbench/device_info.cuh>
 #include <nvbench/device_manager.cuh>
 #include <nvbench/git_revision.cuh>
-#include <nvbench/json_printer.cuh>
 #include <nvbench/state.cuh>
 #include <nvbench/summary.cuh>
 #include <nvbench/version.cuh>
 
+#include <nvbench/detail/throw.cuh>
+
+#include <fmt/format.h>
+
+#include <nlohmann/json.hpp>
+
 #include <cstdint>
 #include <fstream>
 #include <iterator>
@@ -37,8 +43,6 @@
 #include <utility>
 #include <vector>
 
-#include <fmt/format.h>
-#include <nlohmann/json.hpp>
 
 #if defined __GNUC__ && !defined __clang__
 #include <experimental/filesystem>

From 4d25de1377ac1a3385188bdb10cb5d6accbe5078 Mon Sep 17 00:00:00 2001
From: Aaron Siddhartha Mondal <aaron@eomii.org>
Date: Wed, 1 Feb 2023 14:20:48 +0100
Subject: [PATCH 3/3] Remove empty line

---
 nvbench/json_printer.cu | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nvbench/json_printer.cu b/nvbench/json_printer.cu
index 9b2b33c..ed358ba 100644
--- a/nvbench/json_printer.cu
+++ b/nvbench/json_printer.cu
@@ -43,7 +43,6 @@
 #include <utility>
 #include <vector>
 
-
 #if defined __GNUC__ && !defined __clang__
 #include <experimental/filesystem>
 #else