Skip to content

Clean unused constructors in pushpull C++/CUDA implementation #8706

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

Open
ytl0623 wants to merge 3 commits into
base: dev
Choose a base branch
from
+80 −74
Open

Clean unused constructors in pushpull C++/CUDA implementation #8706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7bd9e9a
Clean unused constructors in pushpull C++/CUDA implementation
ytl0623 Jan 16, 2026
69da7bf
resolve template signature mismatch in pushpull header
ytl0623 Jan 16, 2026
cbd9305
fix missing bool in 3-arg explicit instantiation
ytl0623 Jan 16, 2026
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
12 changes: 6 additions & 6 deletions monai/csrc/resample/pushpull.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,25 +22,25 @@ limitations under the License.

#define MONAI_PUSHPULL_DECLARE(space) \
namespace space { \
template <typename BoundType, typename InterpolationType, typename SourceType> \
template <typename SourceType> \
std::deque<at::Tensor> pushpull( \
const SourceType& source, \
const at::Tensor& grid, \
BoundType bound, \
InterpolationType interpolation, \
monai::BoundVectorRef bound, \
monai::InterpolationVectorRef interpolation, \
bool extrapolate, \
bool do_pull, \
bool do_push, \
bool do_count, \
bool do_grad, \
bool do_sgrad); \
template <typename BoundType, typename InterpolationType, typename SourceType> \
template <typename SourceType> \
std::deque<at::Tensor> pushpull( \
const SourceType& source, \
const at::Tensor& grid, \
const at::Tensor& target, \
BoundType bound, \
InterpolationType interpolation, \
monai::BoundVectorRef bound, \
monai::InterpolationVectorRef interpolation, \
bool extrapolate, \
bool do_pull, \
bool do_push, \
Expand Down
71 changes: 37 additions & 34 deletions monai/csrc/resample/pushpull_cpu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ limitations under the License.
// . [DONE] spatial gradient mode (without multiplication with output gradient)
// . [DONE] second order gradients (backward pass for spatial gradients)
// . performance tests
// . input bound/inter are always vectors -> clean unused constructors
// . [DONE] input bound/inter are always vectors -> clean unused constructors

#include <ATen/ATen.h>
#include <limits>
Expand Down Expand Up @@ -2187,39 +2187,43 @@ MONAI_NAMESPACE_DEVICE { // cpu
// FUNCTIONAL FORM WITH DISPATCH
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

#define PUSHPULL_INSTANTIATE3(BoundType0, InterpolationType0, SourceType0) \
template std::deque<Tensor> pushpull( \
const SourceType0&, \
const Tensor&, \
const Tensor&, \
BoundType0, \
InterpolationType0, \
bool, \
bool, \
bool, \
bool, \
bool, \
bool); \
template std::deque<Tensor> pushpull( \
const SourceType0&, const Tensor&, BoundType0, InterpolationType0, bool, bool, bool, bool, bool, bool)
#define PUSHPULL_INSTANTIATE2(BoundType0, InterpolationType0) \
PUSHPULL_INSTANTIATE3(BoundType0, InterpolationType0, IntArrayRef); \
PUSHPULL_INSTANTIATE3(BoundType0, InterpolationType0, Tensor)
#define PUSHPULL_INSTANTIATE1(BoundType0) \
PUSHPULL_INSTANTIATE2(BoundType0, InterpolationType); \
PUSHPULL_INSTANTIATE2(BoundType0, InterpolationVectorRef)
#define PUSHPULL_INSTANTIATE \
PUSHPULL_INSTANTIATE1(BoundType); \
PUSHPULL_INSTANTIATE1(BoundVectorRef)
#define PUSHPULL_INSTANTIATE_SOURCE(SourceType) \
template std::deque<Tensor> pushpull( \
const SourceType&, \
const Tensor&, \
const Tensor&, \
BoundVectorRef, \
InterpolationVectorRef, \
bool, \
bool, \
bool, \
bool, \
bool, \
bool); \
template std::deque<Tensor> pushpull( \
const SourceType&, \
const Tensor&, \
BoundVectorRef, \
InterpolationVectorRef, \
bool, \
bool, \
bool, \
bool, \
bool, \
bool)

#define PUSHPULL_INSTANTIATE \
PUSHPULL_INSTANTIATE_SOURCE(IntArrayRef); \
PUSHPULL_INSTANTIATE_SOURCE(Tensor)

// Two arguments (source, grid)
// > `bound` and `interpolation` can be single arguments or vectors.
template <typename BoundType, typename InterpolationType, typename SourceType>
// > bound and interpolation are strictly VectorRef.
template <typename SourceType>
MONAI_HOST std::deque<Tensor> pushpull(
const SourceType& source,
const Tensor& grid,
BoundType bound,
InterpolationType interpolation,
BoundVectorRef bound,
InterpolationVectorRef interpolation,
bool extrapolate,
bool do_pull,
bool do_push,
Expand All @@ -2238,15 +2242,14 @@ MONAI_NAMESPACE_DEVICE { // cpu
}

// Three arguments (source, grid, target)
// > `bound` and `interpolation` can be single arguments or vectors.
// > `source` can be a tensor or a vector of dimensions.
template <typename BoundType, typename InterpolationType, typename SourceType>
// > bound and interpolation are strictly VectorRef.
template <typename SourceType>
MONAI_HOST std::deque<Tensor> pushpull(
const SourceType& source,
const Tensor& grid,
const Tensor& target,
BoundType bound,
InterpolationType interpolation,
BoundVectorRef bound,
InterpolationVectorRef interpolation,
bool extrapolate,
bool do_pull,
bool do_push,
Expand Down
71 changes: 37 additions & 34 deletions monai/csrc/resample/pushpull_cuda.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ limitations under the License.
// . [DONE] spatial gradient mode (without multiplication with output gradient)
// . [DONE] second order gradients (backward pass for spatial gradients)
// . performance tests
// . input bound/inter are always vectors -> clean unused constructors
// . [DONE] input bound/inter are always vectors -> clean unused constructors

#include <ATen/ATen.h>
#include <limits>
Expand Down Expand Up @@ -2149,39 +2149,43 @@ MONAI_NAMESPACE_DEVICE { // cuda
// FUNCTIONAL FORM WITH DISPATCH
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

#define PUSHPULL_INSTANTIATE3(BoundType0, InterpolationType0, SourceType0) \
template std::deque<Tensor> pushpull( \
const SourceType0&, \
const Tensor&, \
const Tensor&, \
BoundType0, \
InterpolationType0, \
bool, \
bool, \
bool, \
bool, \
bool, \
bool); \
template std::deque<Tensor> pushpull( \
const SourceType0&, const Tensor&, BoundType0, InterpolationType0, bool, bool, bool, bool, bool, bool)
#define PUSHPULL_INSTANTIATE2(BoundType0, InterpolationType0) \
PUSHPULL_INSTANTIATE3(BoundType0, InterpolationType0, IntArrayRef); \
PUSHPULL_INSTANTIATE3(BoundType0, InterpolationType0, Tensor)
#define PUSHPULL_INSTANTIATE1(BoundType0) \
PUSHPULL_INSTANTIATE2(BoundType0, InterpolationType); \
PUSHPULL_INSTANTIATE2(BoundType0, InterpolationVectorRef)
#define PUSHPULL_INSTANTIATE \
PUSHPULL_INSTANTIATE1(BoundType); \
PUSHPULL_INSTANTIATE1(BoundVectorRef)
#define PUSHPULL_INSTANTIATE_SOURCE(SourceType) \
template std::deque<Tensor> pushpull( \
const SourceType&, \
const Tensor&, \
const Tensor&, \
BoundVectorRef, \
InterpolationVectorRef, \
bool, \
bool, \
bool, \
bool, \
bool, \
bool); \
template std::deque<Tensor> pushpull( \
const SourceType&, \
const Tensor&, \
BoundVectorRef, \
InterpolationVectorRef, \
bool, \
bool, \
bool, \
bool, \
bool, \
bool)

#define PUSHPULL_INSTANTIATE \
PUSHPULL_INSTANTIATE_SOURCE(IntArrayRef); \
PUSHPULL_INSTANTIATE_SOURCE(Tensor)

// Two arguments (source, grid)
// > `bound` and `interpolation` can be single arguments or vectors.
template <typename BoundType, typename InterpolationType, typename SourceType>
// > bound and interpolation are strictly VectorRef.
template <typename SourceType>
MONAI_HOST std::deque<Tensor> pushpull(
const SourceType& source,
const Tensor& grid,
BoundType bound,
InterpolationType interpolation,
BoundVectorRef bound,
InterpolationVectorRef interpolation,
bool extrapolate,
bool do_pull,
bool do_push,
Expand All @@ -2206,15 +2210,14 @@ MONAI_NAMESPACE_DEVICE { // cuda
}

// Three arguments (source, grid, target)
// > `bound` and `interpolation` can be single arguments or vectors.
// > `source` can be a tensor or a vector of dimensions.
template <typename BoundType, typename InterpolationType, typename SourceType>
// > bound and interpolation are strictly VectorRef.
template <typename SourceType>
MONAI_HOST std::deque<Tensor> pushpull(
const SourceType& source,
const Tensor& grid,
const Tensor& target,
BoundType bound,
InterpolationType interpolation,
BoundVectorRef bound,
InterpolationVectorRef interpolation,
bool extrapolate,
bool do_pull,
bool do_push,
Expand Down
Loading