Sharing mData between device and staging tensors

src/OpTensorCreate.cpp

@@ -44,7 +44,7 @@ OpTensorCreate::init()
  tensor->init(this->mPhysicalDevice, this->mDevice);
 
  std::shared_ptr<Tensor> stagingTensor = std::make_shared<Tensor>(
- tensor->data(), Tensor::TensorTypes::eStaging);
+ tensor->data_sp(), Tensor::TensorTypes::eStaging);
 
  stagingTensor->init(this->mPhysicalDevice, this->mDevice);
 

src/OpTensorSyncDevice.cpp

@@ -49,7 +49,7 @@ OpTensorSyncDevice::init()
  if (tensor->tensorType() == Tensor::TensorTypes::eDevice) {
 
  std::shared_ptr<Tensor> stagingTensor = std::make_shared<Tensor>(
- tensor->data(), Tensor::TensorTypes::eStaging);
+ tensor->data_sp(), Tensor::TensorTypes::eStaging);
 
  stagingTensor->init(this->mPhysicalDevice, this->mDevice);
 

src/OpTensorSyncLocal.cpp

@@ -49,7 +49,7 @@ OpTensorSyncLocal::init()
  if (tensor->tensorType() == Tensor::TensorTypes::eDevice) {
 
  std::shared_ptr<Tensor> stagingTensor = std::make_shared<Tensor>(
- tensor->data(), Tensor::TensorTypes::eStaging);
+ tensor->data_sp(), Tensor::TensorTypes::eStaging);
 
  stagingTensor->init(this->mPhysicalDevice, this->mDevice);
 

src/Tensor.cpp

@@ -9,19 +9,29 @@ Tensor::Tensor()
  this->mTensorType = TensorTypes::eDevice;
 }
 
-Tensor::Tensor(const std::vector<float>& data, TensorTypes tensorType)
+Tensor::Tensor(const std::shared_ptr<std::vector<float>>& data, TensorTypes tensorType)
 {
 #if DEBUG
- SPDLOG_DEBUG("Kompute Tensor constructor data length: {}, and type: {}",
- data.size(),
+ SPDLOG_DEBUG("Kompute Tensor shared_ptr constructor data length: {}, and type: {}",
+ data->size(),
  tensorType);
 #endif
 
  this->mData = data;
- this->mShape = { static_cast<uint32_t>(data.size()) };
+ this->mShape = { static_cast<uint32_t>(data->size()) };
  this->mTensorType = tensorType;
 }
 
+
+Tensor::Tensor(const std::vector<float>& data, TensorTypes tensorType):
+ Tensor(std::make_shared<std::vector<float>>(data), tensorType)
+{}
+
+Tensor::Tensor(std::initializer_list<float> data, TensorTypes tensorType):
+ Tensor(std::make_shared<std::vector<float>>(data), tensorType)
+{}
+
+
 Tensor::~Tensor()
 {
  SPDLOG_DEBUG("Kompute Tensor destructor started. Type: {}",
@@ -39,8 +49,8 @@ Tensor::init(std::shared_ptr<vk::PhysicalDevice> physicalDevice,
  std::shared_ptr<vk::Device> device)
 {
  SPDLOG_DEBUG("Kompute Tensor running init with Vulkan params and num data "
- "elementS: {}",
- this->mData.size());
+ "elements: {}",
+ this->mData->size());
 
  this->mPhysicalDevice = physicalDevice;
  this->mDevice = device;
@@ -52,14 +62,21 @@ Tensor::init(std::shared_ptr<vk::PhysicalDevice> physicalDevice,
 
 std::vector<float>&
 Tensor::data()
+{
+ return *this->mData;
+}
+
+std::shared_ptr<std::vector<float>>
+Tensor::data_sp()
 {
  return this->mData;
 }
 
+
 float&
 Tensor::operator[](int index)
 {
- return this->mData[index];
+ return this->mData->at(index);
 }
 
 uint64_t
@@ -95,11 +112,11 @@ Tensor::isInit()
 void
 Tensor::setData(const std::vector<float>& data)
 {
- if (data.size() != this->mData.size()) {
+ if (data.size() != this->mData->size()) {
  throw std::runtime_error(
  "Kompute Tensor Cannot set data of different sizes");
  }
- this->mData = data;
+ this->mData = std::make_shared<std::vector<float>>(data);
 }
 
 void
@@ -186,7 +203,7 @@ Tensor::mapDataFromHostMemory()
  *this->mMemory, 0, bufferSize, vk::MemoryMapFlags());
  vk::MappedMemoryRange mappedMemoryRange(*this->mMemory, 0, bufferSize);
  this->mDevice->invalidateMappedMemoryRanges(mappedMemoryRange);
- memcpy(this->mData.data(), mapped, bufferSize);
+ memcpy(this->mData->data(), mapped, bufferSize);
  this->mDevice->unmapMemory(*this->mMemory);
 }
 
@@ -206,7 +223,7 @@ Tensor::mapDataIntoHostMemory()
 
  void* mapped = this->mDevice->mapMemory(
  *this->mMemory, 0, bufferSize, vk::MemoryMapFlags());
- memcpy(mapped, this->mData.data(), bufferSize);
+ memcpy(mapped, this->mData->data(), bufferSize);
  vk::MappedMemoryRange mappedRange(*this->mMemory, 0, bufferSize);
  this->mDevice->flushMappedMemoryRanges(1, &mappedRange);
  this->mDevice->unmapMemory(*this->mMemory);

src/include/kompute/Tensor.hpp

@@ -44,6 +44,28 @@ class Tensor
  */
  Tensor(const std::vector<float>& data,
  TensorTypes tensorType = TensorTypes::eDevice);
+
+ /**
+ * Constructor with a shared pointer to data provided which would be used to create the
+ * respective vulkan buffer and memory.
+ *
+ * @param data Shared pointer to a non-zero-sized vector of data that will be used by the tensor
+ * @param tensorType Type for the tensor which is of type TensorTypes
+ */
+ Tensor(const std::shared_ptr<std::vector<float>>& data,
+ TensorTypes tensorType = TensorTypes::eDevice);
+
+
+ /**
+ * Constructor with an initializer list which would be used to create the
+ * respective vulkan buffer and memory.
+ *
+ * @param data Shared pointer to a non-zero-sized vector of data that will be used by the tensor
+ * @param tensorType Type for the tensor which is of type TensorTypes
+ */
+ Tensor(std::initializer_list<float> data,
+ TensorTypes tensorType = TensorTypes::eDevice);
+
 
  /**
  * Destructor which is in charge of freeing vulkan resources unless they
@@ -74,6 +96,17 @@ class Tensor
  * tensor.
  */
  std::vector<float>& data();
+
+ /**
+ * Returns a shared pointer to the vector of data currently contained 
+ * by the Tensor. It is important to ensure that there is no out-of-sync
+ * data with the GPU memory.
+ *
+ * @return Reference to vector of elements representing the data in the
+ * tensor.
+ */
+ std::shared_ptr<std::vector<float>> data_sp();
+
  /**
  * Overrides the subscript operator to expose the underlying data's
  * subscript operator which in this case would be its underlying
@@ -178,8 +211,9 @@ class Tensor
  std::shared_ptr<vk::DeviceMemory> mMemory;
  bool mFreeMemory;
 
+ std::shared_ptr<std::vector<float>> mData;
+
  // -------------- ALWAYS OWNED RESOURCES
- std::vector<float> mData;
 
  TensorTypes mTensorType = TensorTypes::eDevice;