add subregion read and write method

clEsperanto · Sep 27, 2023 · 8dfa75e · 8dfa75e
1 parent 9441119
commit 8dfa75e
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 4 deletions.
diff --git a/clic/include/array.hpp b/clic/include/array.hpp
@@ -15,6 +15,7 @@ class Array : public std::enable_shared_from_this<Array>
 {
 public:
   using Pointer = std::shared_ptr<Array>;
+
   static auto
   New() -> Array::Pointer
   {
@@ -41,14 +42,25 @@ class Array : public std::enable_shared_from_this<Array>
   friend auto
   operator<<(std::ostream & out, const Array::Pointer & array) -> std::ostream &;
 
+
   auto
   allocate() -> void;
+
   auto
   write(const void * host_data) -> void;
+  auto
+  write(const void * host_data, const std::array<size_t, 3> & region, const std::array<size_t, 3> & buffer_origin)
+    -> void;
+
   auto
   read(void * host_data) const -> void;
+  auto
+  read(void * host_data, const std::array<size_t, 3> & region, const std::array<size_t, 3> & buffer_origin) const
+    -> void;
+
   auto
   copy(const Array::Pointer & dst) const -> void;
+
   auto
   fill(const float & value) const -> void;
 

diff --git a/clic/src/array.cpp b/clic/src/array.cpp
@@ -98,8 +98,28 @@ Array::write(const void * host_data) -> void
   {
     allocate();
   }
-  backend_.writeMemory(
-    device(), get(), { this->width(), this->height(), this->depth() }, { 0, 0, 0 }, dtype(), mtype(), host_data);
+  std::array<size_t, 3> _origin = { 0, 0, 0 };
+  std::array<size_t, 3> _shape = { this->width(), this->height(), this->depth() };
+  std::array<size_t, 3> _region = { this->width(), this->height(), this->depth() };
+  backend_.writeMemory(device(), get(), _shape, _origin, _region, dtype(), mtype(), host_data);
+}
+
+auto
+Array::write(const void * host_data, const std::array<size_t, 3> & region, const std::array<size_t, 3> & buffer_origin)
+  -> void
+{
+  if (host_data == nullptr)
+  {
+    throw std::runtime_error("Error: host_data is null");
+  }
+  if (!initialized())
+  {
+    allocate();
+  }
+  std::array<size_t, 3> _origin = buffer_origin;
+  std::array<size_t, 3> _region = region;
+  std::array<size_t, 3> _shape = { this->width(), this->height(), this->depth() };
+  backend_.writeMemory(device(), get(), _shape, _origin, _region, dtype(), mtype(), host_data);
 }
 
 auto
@@ -113,7 +133,28 @@ Array::read(void * host_data) const -> void
   {
     throw std::runtime_error("Error: Array is not initialized, it cannot be read");
   }
-  backend_.readMemory(device(), c_get(), { width(), height(), depth() }, { 0, 0, 0 }, dtype(), mtype(), host_data);
+  std::array<size_t, 3> _origin = { 0, 0, 0 };
+  std::array<size_t, 3> _shape = { this->width(), this->height(), this->depth() };
+  std::array<size_t, 3> _region = { this->width(), this->height(), this->depth() };
+  backend_.readMemory(device(), c_get(), _shape, _origin, _region, dtype(), mtype(), host_data);
+}
+
+auto
+Array::read(void * host_data, const std::array<size_t, 3> & region, const std::array<size_t, 3> & buffer_origin) const
+  -> void
+{
+  if (host_data == nullptr)
+  {
+    throw std::runtime_error("Error: host_data is null");
+  }
+  if (!initialized())
+  {
+    throw std::runtime_error("Error: Array is not initialized, it cannot be read");
+  }
+  std::array<size_t, 3> _origin = buffer_origin;
+  std::array<size_t, 3> _region = region;
+  std::array<size_t, 3> _shape = { this->width(), this->height(), this->depth() };
+  backend_.readMemory(device(), c_get(), _shape, _origin, _region, dtype(), mtype(), host_data);
 }
 
 auto
@@ -164,7 +205,10 @@ Array::fill(const float & value) const -> void
   {
     std::cerr << "Error: Arrays are not initialized_" << std::endl;
   }
-  backend_.setMemory(device(), get(), { width(), height(), depth() }, { 0, 0, 0 }, dtype(), mtype(), value);
+  std::array<size_t, 3> _origin = { 0, 0, 0 };
+  std::array<size_t, 3> _region = { this->width(), this->height(), this->depth() };
+  std::array<size_t, 3> _shape = { this->width(), this->height(), this->depth() };
+  backend_.setMemory(device(), get(), _shape, _origin, _region, dtype(), mtype(), value);
 }
 
 auto