Fix build.

This commit is contained in:
Adam Treat 2023-07-21 12:30:25 -04:00
parent d3ad3aa657
commit 746ff8a848
3 changed files with 18 additions and 18 deletions

View file

@ -41,8 +41,8 @@ Tensor::toString(Tensor::TensorTypes dt)
Tensor::Tensor(std::shared_ptr<vk::PhysicalDevice> physicalDevice,
std::shared_ptr<vk::Device> device,
void* data,
uint64_t elementTotalCount,
uint64_t elementMemorySize,
uint32_t elementTotalCount,
uint32_t elementMemorySize,
const TensorDataTypes& dataType,
vk::DeviceMemory *deviceMemory,
vk::Buffer *buffer,
@ -74,8 +74,8 @@ Tensor::~Tensor()
void
Tensor::rebuild(void* data,
uint64_t elementTotalCount,
uint64_t elementMemorySize,
uint32_t elementTotalCount,
uint32_t elementMemorySize,
vk::DeviceMemory *deviceMemory,
vk::Buffer *buffer)
{
@ -110,19 +110,19 @@ Tensor::isInit()
this->mRawData;
}
uint64_t
uint32_t
Tensor::size()
{
return this->mSize;
}
uint64_t
uint32_t
Tensor::dataTypeMemorySize()
{
return this->mDataTypeMemorySize;
}
uint64_t
uint32_t
Tensor::memorySize()
{
return this->mSize * this->mDataTypeMemorySize;

View file

@ -108,8 +108,8 @@ class Manager
std::shared_ptr<Tensor> tensor(
void* data,
uint32_t elementTotalCount,
uint32_t elementMemorySize,
uint64_t elementTotalCount,
uint64_t elementMemorySize,
const Tensor::TensorDataTypes& dataType,
vk::DeviceMemory *deviceMemory,
vk::Buffer *buffer,

View file

@ -56,8 +56,8 @@ class Tensor
Tensor(std::shared_ptr<vk::PhysicalDevice> physicalDevice,
std::shared_ptr<vk::Device> device,
void* data,
uint32_t elementTotalCount,
uint32_t elementMemorySize,
uint64_t elementTotalCount,
uint64_t elementMemorySize,
const TensorDataTypes& dataType,
vk::DeviceMemory *deviceMemory,
vk::Buffer *buffer,
@ -77,8 +77,8 @@ class Tensor
* @param tensorType The type to use for the tensor
*/
void rebuild(void* data,
uint32_t elementTotalCount,
uint32_t elementMemorySize);
uint64_t elementTotalCount,
uint64_t elementMemorySize,
vk::DeviceMemory *deviceMemory,
vk::Buffer *buffer);
@ -180,7 +180,7 @@ class Tensor
*
* @return Unsigned integer representing the total number of elements
*/
uint32_t size();
uint64_t size();
/**
* Returns the total size of a single element of the respective data type
@ -189,7 +189,7 @@ class Tensor
* @return Unsigned integer representing the memory of a single element of
* the respective data type.
*/
uint32_t dataTypeMemorySize();
uint64_t dataTypeMemorySize();
/**
* Returns the total memory size of the data contained by the Tensor object
@ -198,7 +198,7 @@ class Tensor
* @return Unsigned integer representing the memory of a single element of
* the respective data type.
*/
uint32_t memorySize();
uint64_t memorySize();
/**
* Retrieve the data type of the tensor (host, device, storage)
@ -252,8 +252,8 @@ class Tensor
// -------------- ALWAYS OWNED RESOURCES
TensorTypes mTensorType;
TensorDataTypes mDataType;
uint32_t mSize;
uint32_t mDataTypeMemorySize;
uint64_t mSize;
uint64_t mDataTypeMemorySize;
void* mRawData;
private: