From 2d1011251596edee16d3bd6afb0e3c3b9df1157b Mon Sep 17 00:00:00 2001
From: tylov <tylo@norceresearch.no>
Date: Sat, 8 Jul 2023 14:00:23 +0200
Subject: Added support for column-major md cspan. API change: the create
 function cspan_md(order, array, d1, d2, ...) has the new first argument
 order, which must be either 'C' or 'F' (C: row-major or Fortran:
 column-major). The representation of strides was changed.

---
 misc/benchmarks/various/cspan_bench.c        | 12 ++++++------
 misc/benchmarks/various/string_bench_STC.cpp |  5 +++--
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'misc/benchmarks')

diff --git a/misc/benchmarks/various/cspan_bench.c b/misc/benchmarks/various/cspan_bench.c
index 02ae3237..6ca7425d 100644
--- a/misc/benchmarks/various/cspan_bench.c
+++ b/misc/benchmarks/various/cspan_bench.c
@@ -28,8 +28,8 @@ static void MDRanges_setup(intptr_t state)
 
     for (intptr_t s = 0; s < state; ++s)
     {
-        MD3 r_in = cspan_md(Vin, nx, ny, nz);
-        MD3 r_out = cspan_md(Vout, nx, ny, nz);
+        MD3 r_in = cspan_md('C', Vin, nx, ny, nz);
+        MD3 r_out = cspan_md('C', Vout, nx, ny, nz);
 
         r_in = cspan_slice(MD3, &r_in, {lx, hx}, {ly, hy}, {lz, hz});
         r_out = cspan_slice(MD3, &r_out, {lx, hx}, {ly, hy}, {lz, hz});
@@ -64,8 +64,8 @@ static void TraditionalForLoop(intptr_t state)
 
 static void MDRanges_nested_loop(intptr_t state)
 {
-    MD3 r_in = cspan_md(Vin, nx, ny, nz);
-    MD3 r_out = cspan_md(Vout, nx, ny, nz);
+    MD3 r_in = cspan_md('C', Vin, nx, ny, nz);
+    MD3 r_out = cspan_md('C', Vout, nx, ny, nz);
     r_in = cspan_slice(MD3, &r_in, {lx, hx}, {ly, hy}, {lz, hz});
     r_out = cspan_slice(MD3, &r_out, {lx, hx}, {ly, hy}, {lz, hz});
 
@@ -91,8 +91,8 @@ static void MDRanges_nested_loop(intptr_t state)
 
 static void MDRanges_loop_over_joined(intptr_t state)
 {
-    MD3 r_in = cspan_md(Vin, nx, ny, nz);
-    MD3 r_out = cspan_md(Vout, nx, ny, nz);
+    MD3 r_in = cspan_md('C', Vin, nx, ny, nz);
+    MD3 r_out = cspan_md('C', Vout, nx, ny, nz);
     r_in = cspan_slice(MD3, &r_in, {lx, hx}, {ly, hy}, {lz, hz});
     r_out = cspan_slice(MD3, &r_out, {lx, hx}, {ly, hy}, {lz, hz});
 
diff --git a/misc/benchmarks/various/string_bench_STC.cpp b/misc/benchmarks/various/string_bench_STC.cpp
index ae8e4c38..319b0b19 100644
--- a/misc/benchmarks/various/string_bench_STC.cpp
+++ b/misc/benchmarks/various/string_bench_STC.cpp
@@ -4,10 +4,11 @@
 #include <iostream>
 #include <iomanip>
 #include <chrono>
-#define i_static
+#define i_implement
 #include <stc/cstr.h>   // string
-#define i_static
+#define i_implement
 #include <stc/csview.h> // string_view
+#include <stc/algo/raii.h>
 
 #define i_key_str
 #include <stc/cvec.h>   // vec of cstr with const char* lookup
-- 
cgit v1.2.3