Merge pull request #260 from crtrott/fix_include_guard_for_single_header

Fix single header and backward breaking change

include/experimental/mdarray

@@ -24,4 +24,5 @@
   #define MDSPAN_IMPL_PROPOSED_NAMESPACE experimental
 #endif
 
+#include "mdspan"
 #include "../mdspan/mdarray.hpp"

include/experimental/mdspan

@@ -24,4 +24,16 @@
   #define MDSPAN_IMPL_PROPOSED_NAMESPACE experimental
 #endif
 
-#include "../mdspan/mdspan.hpp"
+#include "../mdspan/mdspan.hpp"
+
+// backward compatibility import into experimental
+namespace MDSPAN_IMPL_STANDARD_NAMESPACE {
+  namespace MDSPAN_IMPL_PROPOSED_NAMESPACE {
+    using ::MDSPAN_IMPL_STANDARD_NAMESPACE::mdspan;
+    using ::MDSPAN_IMPL_STANDARD_NAMESPACE::extents;
+    using ::MDSPAN_IMPL_STANDARD_NAMESPACE::layout_left;
+    using ::MDSPAN_IMPL_STANDARD_NAMESPACE::layout_right;
+    using ::MDSPAN_IMPL_STANDARD_NAMESPACE::layout_stride;
+    using ::MDSPAN_IMPL_STANDARD_NAMESPACE::default_accessor;
+  }
+}

include/mdspan/mdarray.hpp

@@ -14,7 +14,8 @@
 //
 //@HEADER
 
-#pragma once
+#ifndef MDARRAY_HPP_
+#define MDARRAY_HPP_
 
 #ifndef MDSPAN_IMPL_STANDARD_NAMESPACE
   #define MDSPAN_IMPL_STANDARD_NAMESPACE Kokkos
@@ -27,3 +28,4 @@
 #include "mdspan.hpp"
 #include "../experimental/__p1684_bits/mdarray.hpp"
 
+#endif // MDARRAY_HPP_

include/mdspan/mdspan.hpp

@@ -14,7 +14,8 @@
 //
 //@HEADER
 
-#pragma once
+#ifndef MDSPAN_HPP_
+#define MDSPAN_HPP_
 
 #ifndef MDSPAN_IMPL_STANDARD_NAMESPACE
   #define MDSPAN_IMPL_STANDARD_NAMESPACE Kokkos
@@ -36,3 +37,5 @@
 #if MDSPAN_HAS_CXX_17
 #include "../experimental/__p2630_bits/submdspan.hpp"
 #endif
+
+#endif // MDSPAN_HPP_

make_single_header.py

@@ -5,6 +5,8 @@
 import os
 from os.path import dirname, join as path_join, abspath, exists
 
+from pathlib import Path
+
 extra_paths = [path_join(dirname(abspath(__file__)), "include")]
 
 
@@ -31,19 +33,20 @@ def process_file(
             if m_inc:
                 inc_name = m_inc.group(1)
                 inc_path = find_file(inc_name, file_path)
-                if inc_path not in processed_files:
-                    if inc_path is not None:
-                        processed_files += [inc_path]
+                if inc_path is not None:
+                  inc_path_res = str(Path(inc_path).resolve())
+                  if inc_path_res not in processed_files:
+                        processed_files += [inc_path_res]
                         process_file(
-                            inc_path,
+                            inc_path_res,
                             out_lines,
                             front_matter_lines,
                             back_matter_lines,
                             processed_files,
                         )
-                    else:
-                        # assume it's a system header
-                        out_lines += [line]
+                else:
+                  # assume it's a system header
+                  out_lines += [line]
                 continue
             m_once = re.match(r"#pragma once\s*", line)
             # ignore pragma once; we're handling it here
@@ -65,7 +68,7 @@ def process_file(
 if __name__ == "__main__":
     print(
         process_file(
-            abspath(sys.argv[1]),
+            str(Path(sys.argv[1]).resolve()),
             [],
             # We use an include guard instead of `#pragma once` because Godbolt will
             # cause complaints about `#pragma once` when they are used in URL includes.
@@ -74,6 +77,6 @@ def process_file(
                 "#define _MDSPAN_SINGLE_HEADER_INCLUDE_GUARD_\n",
             ],
             ["#endif // _MDSPAN_SINGLE_HEADER_INCLUDE_GUARD_\n"],
-            [abspath(sys.argv[1])],
+            [str(Path(sys.argv[1]).resolve())],
         )
     )