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

.appveyor.yml

@@ -51,7 +51,7 @@ build_script:
   - "set PATH=%MINICONDA%;%MINICONDA%\\Scripts;%MINICONDA%\\Library\\bin;%PATH%"
   # install parallelproj and Python stuff
   # don't do numpy here due to https://github.com/conda-forge/numpy-feedstock/issues/350
-  - conda create --name stirbuild -c conda-forge  -yq libparallelproj swig pytest ccache ninja cmake
+  - conda create --name stirbuild -c conda-forge  -yq libparallelproj=1 swig pytest ccache ninja cmake
   - CALL conda.bat activate stirbuild
   - python --version
   - pip install numpy matplotlib
@@ -89,4 +89,4 @@ test_script:
 
 on_finish:
   # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
-
+

src/buildblock/VoxelsOnCartesianGrid.cxx

@@ -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,
@@ -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,

src/include/stir/VoxelsOnCartesianGrid.h

@@ -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,
@@ -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,