Skip to content

[hipDNN] [FIX] suboptimal tensor filling #3471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SamuelReeder merged 6 commits into from
Dec 23, 2025
Merged

[hipDNN] [FIX] suboptimal tensor filling #3471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4e44f5d
optimize fillWithValue for packed tensors
umarinkovic Dec 18, 2025
7d040b8
optimize fillWithRandomValues for packed tensors
umarinkovic Dec 18, 2025
f8128df
fix typo in element count
umarinkovic Dec 18, 2025
26bc697
Merge branch 'develop' into fix/hipdnn_fill_tensor
CMiservaAMD Dec 18, 2025
8aece2c
Merge branch 'develop' into fix/hipdnn_fill_tensor
CMiservaAMD Dec 19, 2025
0d2f629
Added tests for non-packed codepaths
umarinkovic Dec 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 26 additions & 6 deletions projects/hipdnn/sdk/include/hipdnn_sdk/utilities/Tensor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,9 +465,17 @@ class Tensor : public TensorBase<T>
void fillWithValue(T value) override
{
_memory.markHostModified();
iterateAlongDimensions(_dims, [&](const std::vector<int64_t>& indices) {
this->setHostValue(value, indices);
});
if(isPacked())
{
auto data{_memory.hostData()};
std::fill(data, data + _elementCount, value);
}
else
{
iterateAlongDimensions(_dims, [&](const std::vector<int64_t>& indices) {
this->setHostValue(value, indices);
});
}
}

void fillWithRandomValues(T min, T max, unsigned int seed = std::random_device{}()) override
Expand All @@ -478,9 +486,21 @@ class Tensor : public TensorBase<T>
static_cast<float>(max));

_memory.markHostModified();
iterateAlongDimensions(_dims, [&](const std::vector<int64_t>& indices) {
this->setHostValue(static_cast<T>(distribution(generator)), indices);
});

if(isPacked())
{
auto data{_memory.hostData()};
for(size_t i{0}; i < _elementCount; i++)
{
data[i] = static_cast<T>(distribution(generator));
}
}
else
{
iterateAlongDimensions(_dims, [&](const std::vector<int64_t>& indices) {
this->setHostValue(static_cast<T>(distribution(generator)), indices);
});
}
}

bool isPacked() const override
Expand Down
30 changes: 28 additions & 2 deletions projects/hipdnn/sdk/tests/utilities/TestTensor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ TEST(TestTensor, BasicRowMajorUsage)
EXPECT_EQ(tensor.strides()[3], 1);
}

TEST(TestTensor, FillWithValues)
TEST(TestTensor, FillWithValuesPacked)
{
Tensor<float> tensor({1, 2, 3, 4});

Expand All @@ -52,7 +52,19 @@ TEST(TestTensor, FillWithValues)
}
}

TEST(TestTensor, FillWithRandomValues)
TEST(TestTensor, FillWithValuesNonPacked)
{
Tensor<float> tensor({1, 2, 3, 4}, {30, 15, 5, 1});

tensor.fillWithValue(1.0f);

for(auto it{tensor.cbegin()}; it != tensor.cend(); ++it)
{
EXPECT_FLOAT_EQ(1.0f, (*reinterpret_cast<const float*>((*it))));
}
}

TEST(TestTensor, FillWithRandomValuesPacked)
{
Tensor<float> tensor({1, 2, 3, 4});

Expand All @@ -66,6 +78,20 @@ TEST(TestTensor, FillWithRandomValues)
}
}

TEST(TestTensor, FillWithRandomValuesNonPacked)
{
Tensor<float> tensor({1, 2, 3, 4}, {30, 15, 5, 1});

tensor.fillWithRandomValues(1.0f, 3.0f);

for(auto it{tensor.cbegin()}; it != tensor.cend(); ++it)
{
auto val{(*reinterpret_cast<const float*>((*it)))};
EXPECT_GE(val, 1.0f);
EXPECT_LE(val, 3.0f);
}
}

TEST(TestTensor, BasicNhwcUsage)
{
Tensor<float> tensor({1, 2, 3, 4}, TensorLayout::NHWC);
Expand Down
Loading