-
-
Notifications
You must be signed in to change notification settings - Fork 0
15 update tests for fkl 020 and c20 #16
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.
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
Open
albertandaluz
wants to merge
5
commits into
main
Choose a base branch
from
15-update-tests-for-fkl-020-and-c20
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule fkl
updated
from 1f3322 to 5d5b1f
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| /* Copyright 2025 Oscar Amoros Huguet | ||
| /* Copyright 2025 Oscar Amoros Huguet | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
|
|
@@ -19,10 +19,10 @@ | |
| #include <nppi_geometry_transforms.h> | ||
|
|
||
| #include <fused_kernel/core/utils/utils.h> | ||
| #include <fused_kernel/fused_kernel.cuh> | ||
| #include <fused_kernel/algorithms/image_processing/resize.cuh> | ||
| #include <fused_kernel/algorithms/basic_ops/cuda_vector.cuh> | ||
| #include <fused_kernel/algorithms/basic_ops/arithmetic.cuh> | ||
| #include <fused_kernel/fused_kernel.h> | ||
| #include <fused_kernel/algorithms/image_processing/resize.h> | ||
| #include <fused_kernel/algorithms/basic_ops/vector_ops.h> | ||
| #include <fused_kernel/algorithms/basic_ops/arithmetic.h> | ||
|
|
||
| namespace fastNPP { | ||
|
|
||
|
|
@@ -34,17 +34,17 @@ namespace fastNPP { | |
| // currently expecting the destination ROI's to be equal to nMaxWidth and nMaxHeight | ||
| int currentDevice{ 0 }; | ||
| gpuErrchk(cudaGetDevice(¤tDevice)); | ||
| std::array<fk::Ptr2D<uchar3>, BATCH> srcBatch; | ||
| std::array<fk::Ptr2D<uchar3>, BATCH> srcBatch; | ||
| for (int i = 0; i < BATCH; ++i) { | ||
| srcBatch[i] = fk::Ptr2D<uchar3>(reinterpret_cast<uchar3*>(h_pBatchSrc[i].pData), | ||
| h_pBatchSrc[i].oSize.width, | ||
| h_pBatchSrc[i].oSize.height, | ||
| h_pBatchSrc[i].nStep, | ||
| fk::Device, currentDevice); | ||
| h_pBatchSrc[i].nStep, fk::MemType::Device, | ||
| currentDevice); | ||
|
Comment on lines
+42
to
+43
|
||
| } | ||
| const fk::Size dstSize(nMaxWidth, nMaxHeight); | ||
| return fk::PerThreadRead<fk::_2D, uchar3>::build(srcBatch) | ||
| .then(fk::Resize<fk::INTER_LINEAR>::build(dstSize)); | ||
| return fk::PerThreadRead<fk::ND::_2D, uchar3>::build(srcBatch) | ||
| .then(fk::Resize<fk::InterpolationType::INTER_LINEAR>::build(dstSize)); | ||
| } | ||
|
|
||
| constexpr inline auto SwapChannels_32f_C3R_Ctx(const int(&dstOrder)[3]) { | ||
|
|
@@ -76,20 +76,20 @@ namespace fastNPP { | |
| template <size_t BATCH> | ||
| constexpr inline auto CopyBatch_32f_C3P3R_Ctx(const std::array<Npp32f*, BATCH> (&aDst)[3], | ||
| const int& nDstStep, const NppiSize& oSizeROI) { | ||
| std::array<fk::SplitWriteParams<fk::_2D, float3>, BATCH> params; | ||
| std::array<fk::SplitWriteParams<fk::ND::_2D, float3>, BATCH> params; | ||
| for (int i = 0; i < BATCH; ++i) { | ||
| const uint width = static_cast<uint>(oSizeROI.width); | ||
| const uint height = static_cast<uint>(oSizeROI.height); | ||
| const uint step = static_cast<uint>(nDstStep); | ||
| const fk::PtrDims<fk::_2D> dims{ width, height, step }; | ||
| const fk::SplitWriteParams<fk::_2D, float3> param{ | ||
| const fk::PtrDims<fk::ND::_2D> dims{ width, height, step }; | ||
| const fk::SplitWriteParams<fk::ND::_2D, float3> param{ | ||
| {reinterpret_cast<float*>(aDst[0][i]), dims}, | ||
| {reinterpret_cast<float*>(aDst[1][i]), dims}, | ||
| {reinterpret_cast<float*>(aDst[2][i]), dims} | ||
| }; | ||
| params[i] = param; | ||
| } | ||
| return fk::SplitWrite<fk::_2D, float3>::build(params); | ||
| return fk::SplitWrite<fk::ND::_2D, float3>::build(params); | ||
| } | ||
|
|
||
| template <typename... IOps> | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Trailing whitespace should be removed from this line.