From b7e6bd00e014172c55c44676153b4bcaf9d96846 Mon Sep 17 00:00:00 2001
From: Cyrus Harrison <cyrush@llnl.gov>
Date: Tue, 7 Nov 2023 16:16:26 -0800
Subject: [PATCH] port to new interfaces

---
 .../ascent_blueprint_device_dispatch.hpp      | 32 +++++++++----------
 .../ascent_blueprint_device_reductions.cpp    |  4 +--
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/libs/ascent/runtimes/expressions/ascent_blueprint_device_dispatch.hpp b/src/libs/ascent/runtimes/expressions/ascent_blueprint_device_dispatch.hpp
index 50378d24f..7142fe551 100644
--- a/src/libs/ascent/runtimes/expressions/ascent_blueprint_device_dispatch.hpp
+++ b/src/libs/ascent/runtimes/expressions/ascent_blueprint_device_dispatch.hpp
@@ -513,10 +513,10 @@ dispatch_memory_binary_df(const conduit::Node &l_field,
                        r_field.schema().to_string());
         }
 
-        MemoryInterface<conduit::float32> l_farray(l_field);
-        MemoryInterface<conduit::float32> r_farray(r_field);
-        MemoryAccessor<conduit::float32>  l_accessor = l_farray.accessor(mem_space, component);
-        MemoryAccessor<conduit::float32>  r_accessor = r_farray.accessor(mem_space, component);
+        MCArray<conduit::float32> l_farray(l_field);
+        MCArray<conduit::float32> r_farray(r_field);
+        DeviceAccessor<conduit::float32> l_accessor = l_farray.accessor(mem_space, component);
+        DeviceAccessor<conduit::float32> r_accessor = r_farray.accessor(mem_space, component);
         res = func(l_accessor, r_accessor, exec);
 
     }
@@ -530,10 +530,10 @@ dispatch_memory_binary_df(const conduit::Node &l_field,
                               r_field.schema().to_string());
         }
 
-        MemoryInterface<conduit::float64> l_farray(l_field);
-        MemoryInterface<conduit::float64> r_farray(r_field);
-        MemoryAccessor<conduit::float64>  l_accessor = l_farray.accessor(mem_space, component);
-        MemoryAccessor<conduit::float64>  r_accessor = r_farray.accessor(mem_space, component);
+        MCArray<conduit::float64> l_farray(l_field);
+        MCArray<conduit::float64> r_farray(r_field);
+        DeviceAccessor<conduit::float64>  l_accessor = l_farray.accessor(mem_space, component);
+        DeviceAccessor<conduit::float64>  r_accessor = r_farray.accessor(mem_space, component);
         res = func(l_accessor, r_accessor, exec);
     }
     else if(field_is_int32(l_field))
@@ -546,10 +546,10 @@ dispatch_memory_binary_df(const conduit::Node &l_field,
                              r_field.schema().to_string());
         }
 
-        MemoryInterface<conduit::int32> l_farray(l_field);
-        MemoryInterface<conduit::int32> r_farray(r_field);
-        MemoryAccessor<conduit::int32>  l_accessor = l_farray.accessor(mem_space, component);
-        MemoryAccessor<conduit::int32>  r_accessor = r_farray.accessor(mem_space, component);
+        MCArray<conduit::int32> l_farray(l_field);
+        MCArray<conduit::int32> r_farray(r_field);
+        DeviceAccessor<conduit::int32>  l_accessor = l_farray.accessor(mem_space, component);
+        DeviceAccessor<conduit::int32>  r_accessor = r_farray.accessor(mem_space, component);
         res = func(l_accessor, r_accessor, exec);
     }
     else if(field_is_int64(l_field))
@@ -563,10 +563,10 @@ dispatch_memory_binary_df(const conduit::Node &l_field,
                        r_field.schema().to_string());
         }
 
-        MemoryInterface<conduit::int64> l_farray(l_field);
-        MemoryInterface<conduit::int64> r_farray(r_field);
-        MemoryAccessor<conduit::int64>  l_accessor = l_farray.accessor(mem_space, component);
-        MemoryAccessor<conduit::int64>  r_accessor = r_farray.accessor(mem_space, component);
+        MCArray<conduit::int64> l_farray(l_field);
+        MCArray<conduit::int64> r_farray(r_field);
+        DeviceAccessor<conduit::int64>  l_accessor = l_farray.accessor(mem_space, component);
+        DeviceAccessor<conduit::int64>  r_accessor = r_farray.accessor(mem_space, component);
         res = func(l_accessor, r_accessor, exec);
     }
     else
diff --git a/src/libs/ascent/runtimes/expressions/ascent_blueprint_device_reductions.cpp b/src/libs/ascent/runtimes/expressions/ascent_blueprint_device_reductions.cpp
index 34cb35264..697d864f6 100644
--- a/src/libs/ascent/runtimes/expressions/ascent_blueprint_device_reductions.cpp
+++ b/src/libs/ascent/runtimes/expressions/ascent_blueprint_device_reductions.cpp
@@ -144,8 +144,8 @@ struct SumFunctor
 struct DFAddFunctor
 {
     template<typename T, typename Exec>
-    conduit::Node operator()(const MemoryAccessor<T> l_accessor,
-                             const MemoryAccessor<T> r_accessor,
+    conduit::Node operator()(const DeviceAccessor<T> l_accessor,
+                             const DeviceAccessor<T> r_accessor,
                              const Exec &) const
     {