Modify API to return 2D ROI coords

fiona-gladwin · Aug 24, 2023 · f106edd · f106edd
1 parent 0beaecc
commit f106edd
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 9 deletions.
diff --git a/rocAL/rocAL/include/pipeline/node.h b/rocAL/rocAL/include/pipeline/node.h
@@ -43,8 +43,8 @@ class Node
     std::shared_ptr<Graph> graph() { return _graph; }
     void set_meta_data(pMetaDataBatch meta_data_info) { _meta_data_info = meta_data_info; }
     bool _is_ssd = false;
-    ROI2DCords *get_src_roi() { return (ROI2DCords *)_inputs[0]->info().roi().get_ptr(); }
-    ROI2DCords *get_dst_roi() { return (ROI2DCords *)_outputs[0]->info().roi().get_ptr(); }
+    ROI2DCords *get_src_roi() { return _inputs[0]->info().roi().get_2D_roi(); }
+    ROI2DCords *get_dst_roi() { return _outputs[0]->info().roi().get_2D_roi(); }
 protected:
     virtual void create_node() = 0;
     virtual void update_node() = 0;

diff --git a/rocAL/rocAL/include/pipeline/tensor.h b/rocAL/rocAL/include/pipeline/tensor.h
@@ -64,7 +64,11 @@ void allocate_host_or_pinned_mem(void **ptr, size_t size, RocalMemType mem_type)
 
 struct ROI {
     unsigned *get_ptr() { return _roi_ptr.get(); }
-    ROI2DCords* get_2D_roi() { return reinterpret_cast<ROI2DCords*>(_roi_ptr.get()); }
+    ROI2DCords* get_2D_roi() {
+        if (_dims != 2)
+            THROW("ROI has more than 2 dimensions. Cannot return ROI2DCords")
+        return reinterpret_cast<ROI2DCords*>(_roi_ptr.get());
+    }
     void set_ptr(unsigned *ptr, RocalMemType mem_type, unsigned dims = 0) {
         if(!_dims) _dims = dims;
         _stride = _dims * 2;

diff --git a/rocAL/rocAL/source/augmentations/geometry_augmentations/node_crop.cpp b/rocAL/rocAL/source/augmentations/geometry_augmentations/node_crop.cpp
@@ -52,7 +52,7 @@ void CropNode::create_node() {
 }
 
 void CropNode::update_node() {
-    _crop_param->set_image_dimensions(reinterpret_cast<ROI2DCords *>(_inputs[0]->info().roi().get_ptr()));
+    _crop_param->set_image_dimensions(_inputs[0]->info().roi().get_2D_roi());
     _crop_param->update_array();
     std::vector<uint32_t> crop_h_dims, crop_w_dims;
     _crop_param->get_crop_dimensions(crop_w_dims, crop_h_dims);

diff --git a/rocAL/rocAL/source/augmentations/geometry_augmentations/node_crop_mirror_normalize.cpp b/rocAL/rocAL/source/augmentations/geometry_augmentations/node_crop_mirror_normalize.cpp
@@ -93,7 +93,7 @@ void CropMirrorNormalizeNode::create_node() {
 }
 
 void CropMirrorNormalizeNode::update_node() {
-    _crop_param->set_image_dimensions(reinterpret_cast<ROI2DCords *>(_inputs[0]->info().roi().get_ptr()));
+    _crop_param->set_image_dimensions(_inputs[0]->info().roi().get_2D_roi());
     _crop_param->update_array();
     std::vector<uint32_t> crop_h_dims, crop_w_dims;
     _crop_param->get_crop_dimensions(crop_w_dims, crop_h_dims);

diff --git a/rocAL/rocAL/source/augmentations/geometry_augmentations/node_crop_resize.cpp b/rocAL/rocAL/source/augmentations/geometry_augmentations/node_crop_resize.cpp
@@ -62,7 +62,7 @@ void CropResizeNode::create_node()
 }
 
 void CropResizeNode::update_node() {
-    _crop_param->set_image_dimensions(reinterpret_cast<ROI2DCords *>(_inputs[0]->info().roi().get_ptr()));
+    _crop_param->set_image_dimensions(_inputs[0]->info().roi().get_2D_roi());
     _crop_param->update_array();
     std::vector<uint32_t> crop_h_dims, crop_w_dims;
     _crop_param->get_crop_dimensions(crop_w_dims, crop_h_dims);

diff --git a/rocAL/rocAL/source/augmentations/geometry_augmentations/node_random_crop.cpp b/rocAL/rocAL/source/augmentations/geometry_augmentations/node_random_crop.cpp
@@ -53,7 +53,7 @@ void RandomCropNode::create_node()
 
 void RandomCropNode::update_node()
 {
-    _crop_param->set_image_dimensions(reinterpret_cast<ROI2DCords *>(_inputs[0]->info().roi().get_ptr()));
+    _crop_param->set_image_dimensions(_inputs[0]->info().roi().get_2D_roi());
     _crop_param->update_array();
     std::vector<uint32_t> crop_h_dims, crop_w_dims;
     _crop_param->get_crop_dimensions(crop_w_dims, crop_h_dims);

diff --git a/rocAL/rocAL/source/augmentations/geometry_augmentations/node_resize_crop_mirror.cpp b/rocAL/rocAL/source/augmentations/geometry_augmentations/node_resize_crop_mirror.cpp
@@ -65,7 +65,7 @@ void ResizeCropMirrorNode::create_node() {
 }
 
 void ResizeCropMirrorNode::update_node() {
-    _crop_param->set_image_dimensions(reinterpret_cast<ROI2DCords *>(_inputs[0]->info().roi().get_ptr()));
+    _crop_param->set_image_dimensions(_inputs[0]->info().roi().get_2D_roi());
     _crop_param->update_array();
     std::vector<uint32_t> crop_h_dims, crop_w_dims;
     _crop_param->get_crop_dimensions(crop_w_dims, crop_h_dims);

diff --git a/rocAL/rocAL/source/augmentations/node_ssd_random_crop.cpp b/rocAL/rocAL/source/augmentations/node_ssd_random_crop.cpp
@@ -86,7 +86,7 @@ inline double ssd_BBoxIntersectionOverUnion(const BoundingBoxCord &box1, const B
 
 void SSDRandomCropNode::update_node()
 {
-    _crop_param->set_image_dimensions(reinterpret_cast<ROI2DCords *>(_inputs[0]->info().roi().get_ptr()));
+    _crop_param->set_image_dimensions(_inputs[0]->info().roi().get_2D_roi());
     _crop_param->update_array();
     ROI2DCords *crop_dims = static_cast<ROI2DCords *>(_crop_coordinates);  // ROI to be cropped from source
     std::random_device rd;