Skip to content

[HOT FIX] Ensure consistent RGB image loading across tasks and re-enable previously disabled test. #668

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
merged 12 commits into from
Nov 3, 2025
Merged

[HOT FIX] Ensure consistent RGB image loading across tasks and re-enable previously disabled test. #668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d51431a
refactor CMake scripts: centralize target linking functionality
allnes Jul 2, 2025
b0c18d4
Merge branch 'master' of https://github.com/learning-process/parallel…
allnes Jul 2, 2025
ab3303f
Merge branch 'master' of https://github.com/learning-process/parallel…
allnes Jul 3, 2025
1f9bb76
Merge branch 'master' of https://github.com/learning-process/parallel…
allnes Jul 30, 2025
7bbec06
Merge branch 'master' of https://github.com/learning-process/parallel…
allnes Sep 9, 2025
68516b1
Merge branch 'master' of https://github.com/learning-process/parallel…
allnes Oct 8, 2025
30fb805
Merge branch 'master' of https://github.com/allnes/parallel_programmi…
allnes Oct 24, 2025
a791f0a
Merge branch 'master' of https://github.com/learning-process/parallel…
allnes Oct 24, 2025
271277d
Merge branch 'master' of https://github.com/learning-process/parallel…
allnes Oct 30, 2025
2dba556
Merge branch 'master' of https://github.com/learning-process/parallel…
allnes Oct 30, 2025
00a840d
Merge branch 'master' of https://github.com/learning-process/parallel…
allnes Oct 31, 2025
c4cb109
Ensure consistent RGB image loading across tasks and re-enable previo…
allnes Nov 3, 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
Binary file modified tasks/example_processes/data/pic.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions tasks/example_processes/tests/functional/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,14 @@ class NesterovARunFuncTestsProcesses : public ppc::util::BaseRunFuncTests<InType
int height = -1;
int channels = -1;
std::vector<uint8_t> img;
// Read image
// Read image in RGB to ensure consistent channel count
{
std::string abs_path = ppc::util::GetAbsoluteTaskPath(PPC_ID_example_processes, "pic.jpg");
auto *data = stbi_load(abs_path.c_str(), &width, &height, &channels, 0);
auto *data = stbi_load(abs_path.c_str(), &width, &height, &channels, STBI_rgb);
if (data == nullptr) {
throw std::runtime_error("Failed to load image: " + std::string(stbi_failure_reason()));
}
channels = STBI_rgb;
img = std::vector<uint8_t>(data, data + (static_cast<ptrdiff_t>(width * height * channels)));
stbi_image_free(data);
if (std::cmp_not_equal(width, height)) {
Expand Down
Binary file modified tasks/example_processes_2/data/pic.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions tasks/example_processes_2/tests/functional/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,14 @@ class NesterovARunFuncTestsProcesses2 : public ppc::util::BaseRunFuncTests<InTyp
int height = -1;
int channels = -1;
std::vector<uint8_t> img;
// Read image
// Read image in RGB to ensure consistent channel count
{
std::string abs_path = ppc::util::GetAbsoluteTaskPath(PPC_ID_example_processes_2, "pic.jpg");
auto *data = stbi_load(abs_path.c_str(), &width, &height, &channels, 0);
auto *data = stbi_load(abs_path.c_str(), &width, &height, &channels, STBI_rgb);
if (data == nullptr) {
throw std::runtime_error("Failed to load image: " + std::string(stbi_failure_reason()));
}
channels = STBI_rgb;
img = std::vector<uint8_t>(data, data + (static_cast<ptrdiff_t>(width * height * channels)));
stbi_image_free(data);
if (std::cmp_not_equal(width, height)) {
Expand Down
Binary file modified tasks/example_processes_3/data/pic.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions tasks/example_processes_3/tests/functional/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,14 @@ class NesterovARunFuncTestsProcesses3 : public ppc::util::BaseRunFuncTests<InTyp
int height = -1;
int channels = -1;
std::vector<uint8_t> img;
// Read image
// Read image in RGB to ensure consistent channel count
{
std::string abs_path = ppc::util::GetAbsoluteTaskPath(PPC_ID_example_processes_3, "pic.jpg");
auto *data = stbi_load(abs_path.c_str(), &width, &height, &channels, 0);
auto *data = stbi_load(abs_path.c_str(), &width, &height, &channels, STBI_rgb);
if (data == nullptr) {
throw std::runtime_error("Failed to load image: " + std::string(stbi_failure_reason()));
}
channels = STBI_rgb;
img = std::vector<uint8_t>(data, data + (static_cast<ptrdiff_t>(width * height * channels)));
stbi_image_free(data);
if (std::cmp_not_equal(width, height)) {
Expand Down
Binary file modified tasks/example_threads/data/pic.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions tasks/example_threads/tests/functional/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,14 @@ class NesterovARunFuncTestsThreads : public ppc::util::BaseRunFuncTests<InType,
int height = -1;
int channels = -1;
std::vector<uint8_t> img;
// Read image
// Read image in RGB to ensure consistent channel count
{
std::string abs_path = ppc::util::GetAbsoluteTaskPath(std::string(PPC_ID_example_threads), "pic.jpg");
auto *data = stbi_load(abs_path.c_str(), &width, &height, &channels, 0);
auto *data = stbi_load(abs_path.c_str(), &width, &height, &channels, STBI_rgb);
if (data == nullptr) {
throw std::runtime_error("Failed to load image: " + std::string(stbi_failure_reason()));
}
channels = STBI_rgb;
img = std::vector<uint8_t>(data, data + (static_cast<ptrdiff_t>(width * height * channels)));
stbi_image_free(data);
if (std::cmp_not_equal(width, height)) {
Expand All @@ -67,8 +68,7 @@ class NesterovARunFuncTestsThreads : public ppc::util::BaseRunFuncTests<InType,

namespace {

// TODO(allnes): Fix & enable back this test
TEST_P(NesterovARunFuncTestsThreads, DISABLED_MatmulFromPic) {
TEST_P(NesterovARunFuncTestsThreads, MatmulFromPic) {
ExecuteTest(GetParam());
}

Expand Down
Loading