Skip to content

Hackathon project08: Preserve moved array storage in VoxelsOnCartesianGrid for CUDA-managed images #1693

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
KrisThielemans merged 7 commits into from
Mar 12, 2026
+37 −2
Merged

Hackathon project08: Preserve moved array storage in VoxelsOnCartesianGrid for CUDA-managed images #1693

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5a931b6
Disable OpenMP in build configuration for macOS
Dimitra-Kyriakopoulou Mar 11, 2026
1fd3755
Enable OpenMP in build flags for macOS [ci skip]
Dimitra-Kyriakopoulou Mar 11, 2026
1ce90c1
Preserve moved array storage in VoxelsOnCartesianGrid
Mar 12, 2026
0e4273d
Disable OpenMP in macOS clang CI job
Mar 12, 2026
36d8823
Merge remote-tracking branch 'origin/master' into Hackathon_Project08
KrisThielemans Mar 12, 2026
34b30d2
Disable Parallelproj projector in AppVeyor Windows build
Mar 12, 2026
674857c
reenable parallelproj appveyor
KrisThielemans Mar 12, 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
2 changes: 1 addition & 1 deletion .github/workflows/build-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ jobs:
compiler: clang
compiler_version: 21
cuda_version: "0"
BUILD_FLAGS: "-DSTIR_OPENMP=ON"
BUILD_FLAGS: "-DSTIR_OPENMP=OFF"
parallelproj: "OFF"
BUILD_TYPE: "Release"
ROOT: "OFF"
Expand Down
28 changes: 27 additions & 1 deletion src/buildblock/VoxelsOnCartesianGrid.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,17 @@ VoxelsOnCartesianGrid<elemT>::VoxelsOnCartesianGrid(const Array<3, elemT>& v,
Array<3, elemT>::operator=(v);
}

template <class elemT>
VoxelsOnCartesianGrid<elemT>::VoxelsOnCartesianGrid(Array<3, elemT>&& v,
const CartesianCoordinate3D<float>& origin,
const BasicCoordinate<3, float>& grid_spacing)
: DiscretisedDensityOnCartesianGrid<3, elemT>()
{
Array<3, elemT>::operator=(std::move(v));
this->set_origin(origin);
this->set_grid_spacing(grid_spacing);
}

template <class elemT>
VoxelsOnCartesianGrid<elemT>::VoxelsOnCartesianGrid(const IndexRange<3>& range,
const CartesianCoordinate3D<float>& origin,
Expand All @@ -159,6 +170,19 @@ VoxelsOnCartesianGrid<elemT>::VoxelsOnCartesianGrid(const shared_ptr<const ExamI
Array<3, elemT>::operator=(v);
}

template <class elemT>
VoxelsOnCartesianGrid<elemT>::VoxelsOnCartesianGrid(const shared_ptr<const ExamInfo>& exam_info_sptr,
Array<3, elemT>&& v,
const CartesianCoordinate3D<float>& origin,
const BasicCoordinate<3, float>& grid_spacing)
: DiscretisedDensityOnCartesianGrid<3, elemT>()
{
Array<3, elemT>::operator=(std::move(v));
this->set_exam_info_sptr(exam_info_sptr);
this->set_origin(origin);
this->set_grid_spacing(grid_spacing);
}

template <class elemT>
VoxelsOnCartesianGrid<elemT>::VoxelsOnCartesianGrid(const shared_ptr<const ExamInfo>& exam_info_sptr,
const IndexRange<3>& range,
Expand Down Expand Up @@ -258,7 +282,9 @@ VoxelsOnCartesianGrid<elemT>::construct_from_projdata_info(const shared_ptr<cons
-(x_size_used / 2),
-(x_size_used / 2) + x_size_used - 1);

this->grow(range);
// Keep storage contiguous for array views: grow()/resize() usually breaks the
// single-block allocation that Array(range) provides.
Array<3, elemT>::operator=(Array<3, elemT>(range));
}

/*!
Expand Down
11 changes: 11 additions & 0 deletions src/include/stir/VoxelsOnCartesianGrid.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ static VoxelsOnCartesianGrid ask_parameters();
const CartesianCoordinate3D<float>& origin,
const BasicCoordinate<3, float>& grid_spacing);

//! Construct a VoxelsOnCartesianGrid, moving data from the Array<3,elemT> object.
VoxelsOnCartesianGrid(Array<3, elemT>&& v,
const CartesianCoordinate3D<float>& origin,
const BasicCoordinate<3, float>& grid_spacing);

//! Construct a VoxelsOnCartesianGrid from an index range
/*! All elements are set 0. */
VoxelsOnCartesianGrid(const IndexRange<3>& range,
Expand All @@ -78,6 +83,12 @@ static VoxelsOnCartesianGrid ask_parameters();
const CartesianCoordinate3D<float>& origin,
const BasicCoordinate<3, float>& grid_spacing);

//! Construct a VoxelsOnCartesianGrid, moving data from the Array<3,elemT> object.
VoxelsOnCartesianGrid(const shared_ptr<const ExamInfo>& exam_info_sptr,
Array<3, elemT>&& v,
const CartesianCoordinate3D<float>& origin,
const BasicCoordinate<3, float>& grid_spacing);

//! Construct a VoxelsOnCartesianGrid from an index range
/*! All elements are set 0. */
VoxelsOnCartesianGrid(const shared_ptr<const ExamInfo>& exam_info_sptr,
Expand Down
Loading