From 5b9f9d72056239bcc7df9daa1626a9fe34af7e43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Zientkiewicz?= Date: Thu, 16 Jan 2020 18:37:40 +0100 Subject: [PATCH] Moving operators around. (#1667) Improve operator grouping in directory structure. Signed-off-by: Michal Zientkiewicz --- cmake/lint.cmake | 36 +++++++++---------- dali/benchmark/displacement_cpu_bench.cc | 6 ++-- dali/operators/CMakeLists.txt | 24 ++++--------- dali/operators/{color => bbox}/CMakeLists.txt | 0 dali/operators/{geometric => bbox}/bb_flip.cc | 2 +- dali/operators/{geometric => bbox}/bb_flip.cu | 2 +- .../operators/{geometric => bbox}/bb_flip.cuh | 8 ++--- dali/operators/{geometric => bbox}/bb_flip.h | 6 ++-- .../{geometric => bbox}/bb_flip_test.cc | 0 dali/operators/{paste => bbox}/bbox_paste.cc | 2 +- dali/operators/{paste => bbox}/bbox_paste.h | 6 ++-- .../{paste => bbox}/bbox_paste_test.cc | 0 dali/operators/{crop => debug}/CMakeLists.txt | 0 dali/operators/{util => debug}/dump_image.cc | 2 +- dali/operators/{util => debug}/dump_image.cu | 2 +- dali/operators/{util => debug}/dump_image.h | 6 ++-- .../decoder/host/fused/host_decoder_crop.h | 2 +- .../host/fused/host_decoder_random_crop.h | 2 +- .../fused/host_decoder_random_crop_test.cc | 2 +- .../decoder/host/fused/host_decoder_slice.h | 2 +- .../fused/nvjpeg_decoder_cpu_crop.h | 2 +- .../fused/nvjpeg_decoder_cpu_random_crop.h | 2 +- .../fused/nvjpeg_decoder_cpu_slice.h | 2 +- .../decoupled_api/fused/nvjpeg_decoder_crop.h | 2 +- .../fused/nvjpeg_decoder_random_crop.h | 2 +- .../fused/nvjpeg_decoder_random_crop_test.cc | 2 +- .../fused/nvjpeg_decoder_slice.h | 2 +- .../nvjpeg_decoder_split_random_crop_test.cc | 2 +- dali/operators/generic/CMakeLists.txt | 23 ++++++++++++ dali/operators/{util => generic}/cast.cc | 2 +- dali/operators/{util => generic}/cast.cu | 2 +- dali/operators/{util => generic}/cast.h | 6 ++-- .../{ => generic}/erase/CMakeLists.txt | 0 dali/operators/{ => generic}/erase/erase.cc | 4 +-- dali/operators/{ => generic}/erase/erase.h | 6 ++-- .../{ => generic}/erase/erase_utils.h | 6 ++-- .../{util => generic}/external_source_test.cc | 0 dali/operators/{geometric => generic}/flip.cc | 4 +-- dali/operators/{geometric => generic}/flip.cu | 4 +-- dali/operators/{geometric => generic}/flip.h | 6 ++-- .../{geometric => generic}/flip_test.cc | 0 .../{geometric => generic}/flip_util.h | 6 ++-- .../{util => generic}/lookup_table.cc | 2 +- .../{util => generic}/lookup_table.cu | 2 +- .../{util => generic}/lookup_table.h | 6 ++-- dali/operators/{util => generic}/pad.cc | 2 +- dali/operators/{util => generic}/pad.cu | 2 +- dali/operators/{util => generic}/pad.h | 6 ++-- dali/operators/{util => generic}/pad_test.cc | 0 dali/operators/{util => generic}/reshape.cc | 2 +- dali/operators/{util => generic}/reshape.h | 6 ++-- .../{geometric => generic}/shapes.cc | 2 +- .../operators/{geometric => generic}/shapes.h | 6 ++-- .../{geometric => generic}/shapes_test.cc | 2 +- .../slice}/CMakeLists.txt | 0 .../{crop => generic/slice}/slice.cc | 2 +- .../{crop => generic/slice}/slice.cu | 2 +- .../operators/{crop => generic/slice}/slice.h | 10 +++--- .../{crop => generic/slice}/slice_attr.cc | 2 +- .../{crop => generic/slice}/slice_attr.h | 6 ++-- .../{crop => generic/slice}/slice_base.cc | 2 +- .../{crop => generic/slice}/slice_base.cu | 2 +- .../{crop => generic/slice}/slice_base.h | 8 ++--- .../{crop => generic/slice}/slice_test.cc | 0 .../{ => generic}/transpose/CMakeLists.txt | 0 .../transpose/cutt}/CMakeLists.txt | 0 .../transpose/cutt/CudaMemcpy.cu | 4 +-- .../{ => generic}/transpose/cutt/CudaMemcpy.h | 6 ++-- .../{ => generic}/transpose/cutt/CudaUtils.cu | 2 +- .../{ => generic}/transpose/cutt/CudaUtils.h | 6 ++-- .../{ => generic}/transpose/cutt/LRUCache.h | 6 ++-- .../{ => generic}/transpose/cutt/calls.h | 0 .../{ => generic}/transpose/cutt/cutt.cc | 8 ++--- .../{ => generic}/transpose/cutt/cutt.h | 6 ++-- .../transpose/cutt/cuttGpuModel.cc | 6 ++-- .../transpose/cutt/cuttGpuModel.h | 12 +++---- .../transpose/cutt/cuttGpuModelKernel.cu | 4 +-- .../transpose/cutt/cuttGpuModelKernel.h | 8 ++--- .../{ => generic}/transpose/cutt/cuttTypes.h | 6 ++-- .../transpose/cutt/cuttkernel.cu | 6 ++-- .../{ => generic}/transpose/cutt/cuttkernel.h | 8 ++--- .../{ => generic}/transpose/cutt/cuttplan.cc | 10 +++--- .../{ => generic}/transpose/cutt/cuttplan.h | 8 ++--- .../{ => generic}/transpose/cutt/int_vector.h | 6 ++-- .../{ => generic}/transpose/transpose.cc | 2 +- .../{ => generic}/transpose/transpose.cu | 2 +- .../{ => generic}/transpose/transpose.h | 8 ++--- .../{ => generic}/transpose/transpose_test.cc | 2 +- dali/operators/image/CMakeLists.txt | 25 +++++++++++++ .../color}/CMakeLists.txt | 0 .../{ => image}/color/brightness_contrast.cc | 2 +- .../{ => image}/color/brightness_contrast.cu | 2 +- .../{ => image}/color/brightness_contrast.h | 6 ++-- .../color/brightness_contrast_test.cu | 2 +- .../color}/color_space_conversion.cc | 2 +- .../color}/color_space_conversion.cu | 2 +- .../color}/color_space_conversion.h | 6 ++-- .../color}/color_space_conversion_test.cc | 0 .../operators/{ => image}/color/color_test.cc | 0 .../{ => image}/color/color_twist.cc | 2 +- .../{ => image}/color/color_twist.cu | 2 +- .../operators/{ => image}/color/color_twist.h | 6 ++-- dali/operators/{ => image}/color/hsv.cc | 2 +- dali/operators/{ => image}/color/hsv.cu | 2 +- dali/operators/{ => image}/color/hsv.h | 6 ++-- .../{fused => image/crop}/CMakeLists.txt | 0 dali/operators/{ => image}/crop/bbox_crop.cc | 2 +- dali/operators/{ => image}/crop/bbox_crop.h | 6 ++-- .../{ => image}/crop/bbox_crop_test.cc | 0 dali/operators/{ => image}/crop/crop.cc | 2 +- dali/operators/{ => image}/crop/crop.cu | 2 +- dali/operators/{ => image}/crop/crop.h | 10 +++--- dali/operators/{ => image}/crop/crop_attr.cc | 2 +- dali/operators/{ => image}/crop/crop_attr.h | 6 ++-- .../crop}/crop_mirror_normalize.cc | 2 +- .../crop}/crop_mirror_normalize.cu | 2 +- .../crop}/crop_mirror_normalize.h | 8 ++--- .../crop}/crop_mirror_normalize_test.cc | 0 .../{ => image}/crop/crop_sequence_test.cc | 0 dali/operators/{ => image}/crop/crop_test.cc | 0 .../{ => image}/crop/random_crop_attr.cc | 2 +- .../{ => image}/crop/random_crop_attr.h | 6 ++-- .../{geometric => image/paste}/CMakeLists.txt | 0 dali/operators/{ => image}/paste/paste.cc | 2 +- dali/operators/{ => image}/paste/paste.cu | 2 +- dali/operators/{ => image}/paste/paste.h | 6 ++-- .../{paste => image/remap}/CMakeLists.txt | 0 .../remap}/displacement_filter.cc | 2 +- .../remap}/displacement_filter.h | 6 ++-- .../remap}/displacement_filter_impl_cpu.h | 8 ++--- .../remap}/displacement_filter_impl_gpu.cuh | 8 ++--- .../remap}/displacement_test.cc | 0 .../{displacement => image/remap}/jitter.cc | 4 +-- .../{displacement => image/remap}/jitter.cu | 4 +-- .../{displacement => image/remap}/jitter.h | 8 ++--- .../{displacement => image/remap}/rotate.cc | 2 +- .../{displacement => image/remap}/rotate.cu | 2 +- .../{displacement => image/remap}/rotate.h | 10 +++--- .../remap}/rotate_params.h | 8 ++--- .../{displacement => image/remap}/sphere.cc | 4 +-- .../{displacement => image/remap}/sphere.cu | 4 +-- .../{displacement => image/remap}/sphere.h | 8 ++--- .../{displacement => image/remap}/warp.h | 8 ++--- .../remap}/warp_affine.cc | 2 +- .../remap}/warp_affine.cu | 2 +- .../remap}/warp_affine.h | 10 +++--- .../remap}/warp_affine_params.h | 8 ++--- .../remap}/warp_attr.cc | 0 .../remap}/warp_param_provider.h | 6 ++-- .../{displacement => image/remap}/water.cc | 4 +-- .../{displacement => image/remap}/water.cu | 4 +-- .../{displacement => image/remap}/water.h | 8 ++--- .../{ => image}/resize/CMakeLists.txt | 0 .../{ => image}/resize/random_resized_crop.cc | 2 +- .../{ => image}/resize/random_resized_crop.cu | 2 +- .../{ => image}/resize/random_resized_crop.h | 10 +++--- dali/operators/{ => image}/resize/resize.cc | 2 +- dali/operators/{ => image}/resize/resize.cu | 2 +- dali/operators/{ => image}/resize/resize.h | 10 +++--- .../{ => image}/resize/resize_base.cc | 2 +- .../{ => image}/resize/resize_base.h | 6 ++-- .../resize}/resize_crop_mirror.cc | 2 +- .../resize}/resize_crop_mirror.h | 8 ++--- .../resize}/resize_crop_mirror_test.cc | 0 .../{ => image}/resize/resize_test.cc | 0 .../{support => math}/CMakeLists.txt | 6 ++-- .../{ => math}/expressions/CMakeLists.txt | 0 .../{ => math}/expressions/arithmetic.cc | 2 +- .../{ => math}/expressions/arithmetic.cu | 2 +- .../{ => math}/expressions/arithmetic.h | 10 +++--- .../{ => math}/expressions/arithmetic_meta.h | 6 ++-- .../{ => math}/expressions/arithmetic_test.cc | 4 +-- .../{ => math}/expressions/constant_storage.h | 10 +++--- .../expressions/constant_storage_test.cc | 6 ++-- .../CMakeLists.txt | 2 +- .../expression_factory_add.cc | 6 ++-- .../expression_factory_add.cu | 6 ++-- .../expression_factory_bit_and.cc | 6 ++-- .../expression_factory_bit_and.cu | 6 ++-- .../expression_factory_bit_or.cc | 6 ++-- .../expression_factory_bit_or.cu | 6 ++-- .../expression_factory_bit_xor.cc | 6 ++-- .../expression_factory_bit_xor.cu | 6 ++-- .../expression_factory_div.cc | 6 ++-- .../expression_factory_div.cu | 6 ++-- .../expression_factory_eq.cc | 6 ++-- .../expression_factory_eq.cu | 6 ++-- .../expression_factory_fdiv.cc | 6 ++-- .../expression_factory_fdiv.cu | 6 ++-- .../expression_factory_geq.cc | 6 ++-- .../expression_factory_geq.cu | 6 ++-- .../expression_factory_gt.cc | 6 ++-- .../expression_factory_gt.cu | 6 ++-- .../expression_factory_leq.cc | 6 ++-- .../expression_factory_leq.cu | 6 ++-- .../expression_factory_lt.cc | 6 ++-- .../expression_factory_lt.cu | 6 ++-- .../expression_factory_minus.cc | 6 ++-- .../expression_factory_minus.cu | 6 ++-- .../expression_factory_mod.cc | 6 ++-- .../expression_factory_mod.cu | 6 ++-- .../expression_factory_mul.cc | 6 ++-- .../expression_factory_mul.cu | 6 ++-- .../expression_factory_neq.cc | 6 ++-- .../expression_factory_neq.cu | 6 ++-- .../expression_factory_plus.cc | 6 ++-- .../expression_factory_plus.cu | 6 ++-- .../expression_factory_sub.cc | 6 ++-- .../expression_factory_sub.cu | 6 ++-- .../expression_impl_factory.h | 10 +++--- .../expressions/expression_impl_cpu.h | 12 +++---- .../expressions/expression_impl_factory.h | 14 ++++---- .../expression_impl_factory_cpu.cc | 10 +++--- .../expression_impl_factory_gpu.cu | 10 +++--- .../expressions/expression_impl_gpu.cuh | 12 +++---- .../{ => math}/expressions/expression_tile.h | 8 ++--- .../{ => math}/expressions/expression_tree.cc | 6 ++-- .../{ => math}/expressions/expression_tree.h | 10 +++--- .../expressions/expression_tree_test.cc | 4 +-- .../{support => }/random/CMakeLists.txt | 0 .../{support => }/random/coin_flip.cc | 2 +- .../{support => }/random/coin_flip.h | 6 ++-- .../normal_distribution_op.cc | 2 +- .../{util => random}/normal_distribution_op.h | 6 ++-- .../operators/{support => }/random/uniform.cc | 4 +-- dali/operators/{support => }/random/uniform.h | 6 ++-- dali/operators/sequence/CMakeLists.txt | 4 +++ .../optical_flow/CMakeLists.txt | 0 .../optical_flow/optical_flow.cc | 2 +- .../optical_flow/optical_flow.h | 10 +++--- .../optical_flow_adapter/CMakeLists.txt | 0 .../optical_flow_adapter.h | 6 ++-- .../optical_flow_adapter_test.cc | 2 +- .../optical_flow_adapter/optical_flow_stub.h | 8 ++--- .../optical_flow/optical_flow_test.cc | 2 +- .../optical_flow/turing_of/CMakeLists.txt | 0 .../turing_of/optical_flow_buffer.h | 8 ++--- .../turing_of/optical_flow_turing.cc | 2 +- .../turing_of/optical_flow_turing.cu | 2 +- .../turing_of/optical_flow_turing.h | 10 +++--- .../turing_of/optical_flow_turing_test.cc | 2 +- .../optical_flow/turing_of/utils.h | 6 ++-- .../{transpose/cutt => ssd}/CMakeLists.txt | 0 .../{detection => ssd}/box_encoder.cc | 2 +- .../{detection => ssd}/box_encoder.cu | 2 +- .../{detection => ssd}/box_encoder.cuh | 6 ++-- .../{detection => ssd}/box_encoder.h | 6 ++-- .../{detection => ssd}/box_encoder_test.cc | 0 .../{detection => ssd}/random_crop.cc | 2 +- .../{detection => ssd}/random_crop.h | 6 ++-- dali/operators/util/CMakeLists.txt | 2 +- 251 files changed, 600 insertions(+), 560 deletions(-) rename dali/operators/{color => bbox}/CMakeLists.txt (100%) rename dali/operators/{geometric => bbox}/bb_flip.cc (98%) rename dali/operators/{geometric => bbox}/bb_flip.cu (99%) rename dali/operators/{geometric => bbox}/bb_flip.cuh (84%) rename dali/operators/{geometric => bbox}/bb_flip.h (95%) rename dali/operators/{geometric => bbox}/bb_flip_test.cc (100%) rename dali/operators/{paste => bbox}/bbox_paste.cc (98%) rename dali/operators/{paste => bbox}/bbox_paste.h (91%) rename dali/operators/{paste => bbox}/bbox_paste_test.cc (100%) rename dali/operators/{crop => debug}/CMakeLists.txt (100%) rename dali/operators/{util => debug}/dump_image.cc (97%) rename dali/operators/{util => debug}/dump_image.cu (95%) rename dali/operators/{util => debug}/dump_image.h (91%) create mode 100644 dali/operators/generic/CMakeLists.txt rename dali/operators/{util => generic}/cast.cc (97%) rename dali/operators/{util => generic}/cast.cu (98%) rename dali/operators/{util => generic}/cast.h (93%) rename dali/operators/{ => generic}/erase/CMakeLists.txt (100%) rename dali/operators/{ => generic}/erase/erase.cc (98%) rename dali/operators/{ => generic}/erase/erase.h (92%) rename dali/operators/{ => generic}/erase/erase_utils.h (97%) rename dali/operators/{util => generic}/external_source_test.cc (100%) rename dali/operators/{geometric => generic}/flip.cc (97%) rename dali/operators/{geometric => generic}/flip.cu (96%) rename dali/operators/{geometric => generic}/flip.h (94%) rename dali/operators/{geometric => generic}/flip_test.cc (100%) rename dali/operators/{geometric => generic}/flip_util.h (95%) rename dali/operators/{util => generic}/lookup_table.cc (98%) rename dali/operators/{util => generic}/lookup_table.cu (98%) rename dali/operators/{util => generic}/lookup_table.h (96%) rename dali/operators/{util => generic}/pad.cc (99%) rename dali/operators/{util => generic}/pad.cu (98%) rename dali/operators/{util => generic}/pad.h (97%) rename dali/operators/{util => generic}/pad_test.cc (100%) rename dali/operators/{util => generic}/reshape.cc (99%) rename dali/operators/{util => generic}/reshape.h (93%) rename dali/operators/{geometric => generic}/shapes.cc (95%) rename dali/operators/{geometric => generic}/shapes.h (96%) rename dali/operators/{geometric => generic}/shapes_test.cc (99%) rename dali/operators/{expressions/expression_factory_instances => generic/slice}/CMakeLists.txt (100%) rename dali/operators/{crop => generic/slice}/slice.cc (98%) rename dali/operators/{crop => generic/slice}/slice.cu (96%) rename dali/operators/{crop => generic/slice}/slice.h (88%) rename dali/operators/{crop => generic/slice}/slice_attr.cc (96%) rename dali/operators/{crop => generic/slice}/slice_attr.h (97%) rename dali/operators/{crop => generic/slice}/slice_base.cc (98%) rename dali/operators/{crop => generic/slice}/slice_base.cu (98%) rename dali/operators/{crop => generic/slice}/slice_base.h (92%) rename dali/operators/{crop => generic/slice}/slice_test.cc (100%) rename dali/operators/{ => generic}/transpose/CMakeLists.txt (100%) rename dali/operators/{detection => generic/transpose/cutt}/CMakeLists.txt (100%) rename dali/operators/{ => generic}/transpose/cutt/CudaMemcpy.cu (98%) rename dali/operators/{ => generic}/transpose/cutt/CudaMemcpy.h (92%) rename dali/operators/{ => generic}/transpose/cutt/CudaUtils.cu (98%) rename dali/operators/{ => generic}/transpose/cutt/CudaUtils.h (96%) rename dali/operators/{ => generic}/transpose/cutt/LRUCache.h (95%) rename dali/operators/{ => generic}/transpose/cutt/calls.h (100%) rename dali/operators/{ => generic}/transpose/cutt/cutt.cc (97%) rename dali/operators/{ => generic}/transpose/cutt/cutt.h (96%) rename dali/operators/{ => generic}/transpose/cutt/cuttGpuModel.cc (99%) rename dali/operators/{ => generic}/transpose/cutt/cuttGpuModel.h (92%) rename dali/operators/{ => generic}/transpose/cutt/cuttGpuModelKernel.cu (99%) rename dali/operators/{ => generic}/transpose/cutt/cuttGpuModelKernel.h (89%) rename dali/operators/{ => generic}/transpose/cutt/cuttTypes.h (92%) rename dali/operators/{ => generic}/transpose/cutt/cuttkernel.cu (99%) rename dali/operators/{ => generic}/transpose/cutt/cuttkernel.h (90%) rename dali/operators/{ => generic}/transpose/cutt/cuttplan.cc (99%) rename dali/operators/{ => generic}/transpose/cutt/cuttplan.h (96%) rename dali/operators/{ => generic}/transpose/cutt/int_vector.h (98%) rename dali/operators/{ => generic}/transpose/transpose.cc (95%) rename dali/operators/{ => generic}/transpose/transpose.cu (99%) rename dali/operators/{ => generic}/transpose/transpose.h (93%) rename dali/operators/{ => generic}/transpose/transpose_test.cc (99%) create mode 100644 dali/operators/image/CMakeLists.txt rename dali/operators/{displacement => image/color}/CMakeLists.txt (100%) rename dali/operators/{ => image}/color/brightness_contrast.cc (98%) rename dali/operators/{ => image}/color/brightness_contrast.cu (98%) rename dali/operators/{ => image}/color/brightness_contrast.h (97%) rename dali/operators/{ => image}/color/brightness_contrast_test.cu (98%) rename dali/operators/{color_space => image/color}/color_space_conversion.cc (97%) rename dali/operators/{color_space => image/color}/color_space_conversion.cu (99%) rename dali/operators/{color_space => image/color}/color_space_conversion.h (88%) rename dali/operators/{color_space => image/color}/color_space_conversion_test.cc (100%) rename dali/operators/{ => image}/color/color_test.cc (100%) rename dali/operators/{ => image}/color/color_twist.cc (98%) rename dali/operators/{ => image}/color/color_twist.cu (98%) rename dali/operators/{ => image}/color/color_twist.h (98%) rename dali/operators/{ => image}/color/hsv.cc (98%) rename dali/operators/{ => image}/color/hsv.cu (98%) rename dali/operators/{ => image}/color/hsv.h (98%) rename dali/operators/{fused => image/crop}/CMakeLists.txt (100%) rename dali/operators/{ => image}/crop/bbox_crop.cc (99%) rename dali/operators/{ => image}/crop/bbox_crop.h (98%) rename dali/operators/{ => image}/crop/bbox_crop_test.cc (100%) rename dali/operators/{ => image}/crop/crop.cc (97%) rename dali/operators/{ => image}/crop/crop.cu (97%) rename dali/operators/{ => image}/crop/crop.h (94%) rename dali/operators/{ => image}/crop/crop_attr.cc (98%) rename dali/operators/{ => image}/crop/crop_attr.h (98%) rename dali/operators/{fused => image/crop}/crop_mirror_normalize.cc (98%) rename dali/operators/{fused => image/crop}/crop_mirror_normalize.cu (98%) rename dali/operators/{fused => image/crop}/crop_mirror_normalize.h (97%) rename dali/operators/{fused => image/crop}/crop_mirror_normalize_test.cc (100%) rename dali/operators/{ => image}/crop/crop_sequence_test.cc (100%) rename dali/operators/{ => image}/crop/crop_test.cc (100%) rename dali/operators/{ => image}/crop/random_crop_attr.cc (95%) rename dali/operators/{ => image}/crop/random_crop_attr.h (93%) rename dali/operators/{geometric => image/paste}/CMakeLists.txt (100%) rename dali/operators/{ => image}/paste/paste.cc (97%) rename dali/operators/{ => image}/paste/paste.cu (99%) rename dali/operators/{ => image}/paste/paste.h (94%) rename dali/operators/{paste => image/remap}/CMakeLists.txt (100%) rename dali/operators/{displacement => image/remap}/displacement_filter.cc (94%) rename dali/operators/{displacement => image/remap}/displacement_filter.h (89%) rename dali/operators/{displacement => image/remap}/displacement_filter_impl_cpu.h (95%) rename dali/operators/{displacement => image/remap}/displacement_filter_impl_gpu.cuh (98%) rename dali/operators/{displacement => image/remap}/displacement_test.cc (100%) rename dali/operators/{displacement => image/remap}/jitter.cc (91%) rename dali/operators/{displacement => image/remap}/jitter.cu (86%) rename dali/operators/{displacement => image/remap}/jitter.h (90%) rename dali/operators/{displacement => image/remap}/rotate.cc (97%) rename dali/operators/{displacement => image/remap}/rotate.cu (93%) rename dali/operators/{displacement => image/remap}/rotate.h (84%) rename dali/operators/{displacement => image/remap}/rotate_params.h (97%) rename dali/operators/{displacement => image/remap}/sphere.cc (88%) rename dali/operators/{displacement => image/remap}/sphere.cu (85%) rename dali/operators/{displacement => image/remap}/sphere.h (88%) rename dali/operators/{displacement => image/remap}/warp.h (98%) rename dali/operators/{displacement => image/remap}/warp_affine.cc (96%) rename dali/operators/{displacement => image/remap}/warp_affine.cu (93%) rename dali/operators/{displacement => image/remap}/warp_affine.h (83%) rename dali/operators/{displacement => image/remap}/warp_affine_params.h (95%) rename dali/operators/{displacement => image/remap}/warp_attr.cc (100%) rename dali/operators/{displacement => image/remap}/warp_param_provider.h (98%) rename dali/operators/{displacement => image/remap}/water.cc (93%) rename dali/operators/{displacement => image/remap}/water.cu (85%) rename dali/operators/{displacement => image/remap}/water.h (90%) rename dali/operators/{ => image}/resize/CMakeLists.txt (100%) rename dali/operators/{ => image}/resize/random_resized_crop.cc (97%) rename dali/operators/{ => image}/resize/random_resized_crop.cu (96%) rename dali/operators/{ => image}/resize/random_resized_crop.h (90%) rename dali/operators/{ => image}/resize/resize.cc (98%) rename dali/operators/{ => image}/resize/resize.cu (98%) rename dali/operators/{ => image}/resize/resize.h (90%) rename dali/operators/{ => image}/resize/resize_base.cc (99%) rename dali/operators/{ => image}/resize/resize_base.h (94%) rename dali/operators/{fused => image/resize}/resize_crop_mirror.cc (96%) rename dali/operators/{fused => image/resize}/resize_crop_mirror.h (97%) rename dali/operators/{fused => image/resize}/resize_crop_mirror_test.cc (100%) rename dali/operators/{ => image}/resize/resize_test.cc (100%) rename dali/operators/{support => math}/CMakeLists.txt (88%) rename dali/operators/{ => math}/expressions/CMakeLists.txt (100%) rename dali/operators/{ => math}/expressions/arithmetic.cc (98%) rename dali/operators/{ => math}/expressions/arithmetic.cu (95%) rename dali/operators/{ => math}/expressions/arithmetic.h (97%) rename dali/operators/{ => math}/expressions/arithmetic_meta.h (99%) rename dali/operators/{ => math}/expressions/arithmetic_test.cc (99%) rename dali/operators/{ => math}/expressions/constant_storage.h (93%) rename dali/operators/{ => math}/expressions/constant_storage_test.cc (95%) rename dali/operators/{color_space => math/expressions/expression_factory_instances}/CMakeLists.txt (92%) rename dali/operators/{ => math}/expressions/expression_factory_instances/expression_factory_add.cc (75%) rename dali/operators/{ => math}/expressions/expression_factory_instances/expression_factory_add.cu (76%) rename dali/operators/{ => math}/expressions/expression_factory_instances/expression_factory_bit_and.cc (75%) rename dali/operators/{ => math}/expressions/expression_factory_instances/expression_factory_bit_and.cu (76%) rename dali/operators/{ => math}/expressions/expression_factory_instances/expression_factory_bit_or.cc (75%) rename dali/operators/{ => math}/expressions/expression_factory_instances/expression_factory_bit_or.cu (76%) rename dali/operators/{ => math}/expressions/expression_factory_instances/expression_factory_bit_xor.cc (75%) rename dali/operators/{ => math}/expressions/expression_factory_instances/expression_factory_bit_xor.cu (76%) rename dali/operators/{ => math}/expressions/expression_factory_instances/expression_factory_div.cc (75%) rename dali/operators/{ => math}/expressions/expression_factory_instances/expression_factory_div.cu (76%) rename dali/operators/{ => math}/expressions/expression_factory_instances/expression_factory_eq.cc (75%) rename dali/operators/{ => math}/expressions/expression_factory_instances/expression_factory_eq.cu (76%) rename dali/operators/{ => math}/expressions/expression_factory_instances/expression_factory_fdiv.cc (75%) rename dali/operators/{ => math}/expressions/expression_factory_instances/expression_factory_fdiv.cu (76%) rename dali/operators/{ => math}/expressions/expression_factory_instances/expression_factory_geq.cc (75%) rename dali/operators/{ => math}/expressions/expression_factory_instances/expression_factory_geq.cu (76%) rename dali/operators/{ => math}/expressions/expression_factory_instances/expression_factory_gt.cc (75%) rename dali/operators/{ => math}/expressions/expression_factory_instances/expression_factory_gt.cu (76%) rename dali/operators/{ => math}/expressions/expression_factory_instances/expression_factory_leq.cc (75%) rename dali/operators/{ => math}/expressions/expression_factory_instances/expression_factory_leq.cu (76%) rename dali/operators/{ => math}/expressions/expression_factory_instances/expression_factory_lt.cc (75%) rename dali/operators/{ => math}/expressions/expression_factory_instances/expression_factory_lt.cu (76%) rename dali/operators/{ => math}/expressions/expression_factory_instances/expression_factory_minus.cc (75%) rename dali/operators/{ => math}/expressions/expression_factory_instances/expression_factory_minus.cu (76%) rename dali/operators/{ => math}/expressions/expression_factory_instances/expression_factory_mod.cc (75%) rename dali/operators/{ => math}/expressions/expression_factory_instances/expression_factory_mod.cu (76%) rename dali/operators/{ => math}/expressions/expression_factory_instances/expression_factory_mul.cc (75%) rename dali/operators/{ => math}/expressions/expression_factory_instances/expression_factory_mul.cu (76%) rename dali/operators/{ => math}/expressions/expression_factory_instances/expression_factory_neq.cc (75%) rename dali/operators/{ => math}/expressions/expression_factory_instances/expression_factory_neq.cu (76%) rename dali/operators/{ => math}/expressions/expression_factory_instances/expression_factory_plus.cc (75%) rename dali/operators/{ => math}/expressions/expression_factory_instances/expression_factory_plus.cu (76%) rename dali/operators/{ => math}/expressions/expression_factory_instances/expression_factory_sub.cc (75%) rename dali/operators/{ => math}/expressions/expression_factory_instances/expression_factory_sub.cu (76%) rename dali/operators/{ => math}/expressions/expression_factory_instances/expression_impl_factory.h (97%) rename dali/operators/{ => math}/expressions/expression_impl_cpu.h (91%) rename dali/operators/{ => math}/expressions/expression_impl_factory.h (94%) rename dali/operators/{ => math}/expressions/expression_impl_factory_cpu.cc (87%) rename dali/operators/{ => math}/expressions/expression_impl_factory_gpu.cu (87%) rename dali/operators/{ => math}/expressions/expression_impl_gpu.cuh (94%) rename dali/operators/{ => math}/expressions/expression_tile.h (91%) rename dali/operators/{ => math}/expressions/expression_tree.cc (97%) rename dali/operators/{ => math}/expressions/expression_tree.h (94%) rename dali/operators/{ => math}/expressions/expression_tree_test.cc (96%) rename dali/operators/{support => }/random/CMakeLists.txt (100%) rename dali/operators/{support => }/random/coin_flip.cc (95%) rename dali/operators/{support => }/random/coin_flip.h (91%) rename dali/operators/{util => random}/normal_distribution_op.cc (98%) rename dali/operators/{util => random}/normal_distribution_op.h (96%) rename dali/operators/{support => }/random/uniform.cc (96%) rename dali/operators/{support => }/random/uniform.h (92%) rename dali/operators/{ => sequence}/optical_flow/CMakeLists.txt (100%) rename dali/operators/{ => sequence}/optical_flow/optical_flow.cc (98%) rename dali/operators/{ => sequence}/optical_flow/optical_flow.h (95%) rename dali/operators/{ => sequence}/optical_flow/optical_flow_adapter/CMakeLists.txt (100%) rename dali/operators/{ => sequence}/optical_flow/optical_flow_adapter/optical_flow_adapter.h (88%) rename dali/operators/{ => sequence}/optical_flow/optical_flow_adapter/optical_flow_adapter_test.cc (96%) rename dali/operators/{ => sequence}/optical_flow/optical_flow_adapter/optical_flow_stub.h (88%) rename dali/operators/{ => sequence}/optical_flow/optical_flow_test.cc (97%) rename dali/operators/{ => sequence}/optical_flow/turing_of/CMakeLists.txt (100%) rename dali/operators/{ => sequence}/optical_flow/turing_of/optical_flow_buffer.h (91%) rename dali/operators/{ => sequence}/optical_flow/turing_of/optical_flow_turing.cc (99%) rename dali/operators/{ => sequence}/optical_flow/turing_of/optical_flow_turing.cu (98%) rename dali/operators/{ => sequence}/optical_flow/turing_of/optical_flow_turing.h (93%) rename dali/operators/{ => sequence}/optical_flow/turing_of/optical_flow_turing_test.cc (99%) rename dali/operators/{ => sequence}/optical_flow/turing_of/utils.h (87%) rename dali/operators/{transpose/cutt => ssd}/CMakeLists.txt (100%) rename dali/operators/{detection => ssd}/box_encoder.cc (99%) rename dali/operators/{detection => ssd}/box_encoder.cu (99%) rename dali/operators/{detection => ssd}/box_encoder.cuh (96%) rename dali/operators/{detection => ssd}/box_encoder.h (96%) rename dali/operators/{detection => ssd}/box_encoder_test.cc (100%) rename dali/operators/{detection => ssd}/random_crop.cc (99%) rename dali/operators/{detection => ssd}/random_crop.h (94%) diff --git a/cmake/lint.cmake b/cmake/lint.cmake index aaae0a06..9e05dc83 100644 --- a/cmake/lint.cmake +++ b/cmake/lint.cmake @@ -24,24 +24,24 @@ list(REMOVE_ITEM LINT_INC # cuTT list(REMOVE_ITEM LINT_SRC - ${DALI_SRC_DIR}/operators/transpose/cutt/cutt.h - ${DALI_SRC_DIR}/operators/transpose/cutt/cutt.cc - ${DALI_SRC_DIR}/operators/transpose/cutt/cuttplan.h - ${DALI_SRC_DIR}/operators/transpose/cutt/cuttplan.cc - ${DALI_SRC_DIR}/operators/transpose/cutt/cuttkernel.cu - ${DALI_SRC_DIR}/operators/transpose/cutt/cuttkernel.h - ${DALI_SRC_DIR}/operators/transpose/cutt/calls.h - ${DALI_SRC_DIR}/operators/transpose/cutt/cuttGpuModel.h - ${DALI_SRC_DIR}/operators/transpose/cutt/cuttGpuModel.cc - ${DALI_SRC_DIR}/operators/transpose/cutt/cuttGpuModelKernel.h - ${DALI_SRC_DIR}/operators/transpose/cutt/cuttGpuModelKernel.cu - ${DALI_SRC_DIR}/operators/transpose/cutt/CudaMemcpy.h - ${DALI_SRC_DIR}/operators/transpose/cutt/CudaMemcpy.cu - ${DALI_SRC_DIR}/operators/transpose/cutt/CudaUtils.h - ${DALI_SRC_DIR}/operators/transpose/cutt/CudaUtils.cu - ${DALI_SRC_DIR}/operators/transpose/cutt/cuttTypes.h - ${DALI_SRC_DIR}/operators/transpose/cutt/int_vector.h - ${DALI_SRC_DIR}/operators/transpose/cutt/LRUCache.h + ${DALI_SRC_DIR}/operators/generic/transpose/cutt/cutt.h + ${DALI_SRC_DIR}/operators/generic/transpose/cutt/cutt.cc + ${DALI_SRC_DIR}/operators/generic/transpose/cutt/cuttplan.h + ${DALI_SRC_DIR}/operators/generic/transpose/cutt/cuttplan.cc + ${DALI_SRC_DIR}/operators/generic/transpose/cutt/cuttkernel.cu + ${DALI_SRC_DIR}/operators/generic/transpose/cutt/cuttkernel.h + ${DALI_SRC_DIR}/operators/generic/transpose/cutt/calls.h + ${DALI_SRC_DIR}/operators/generic/transpose/cutt/cuttGpuModel.h + ${DALI_SRC_DIR}/operators/generic/transpose/cutt/cuttGpuModel.cc + ${DALI_SRC_DIR}/operators/generic/transpose/cutt/cuttGpuModelKernel.h + ${DALI_SRC_DIR}/operators/generic/transpose/cutt/cuttGpuModelKernel.cu + ${DALI_SRC_DIR}/operators/generic/transpose/cutt/CudaMemcpy.h + ${DALI_SRC_DIR}/operators/generic/transpose/cutt/CudaMemcpy.cu + ${DALI_SRC_DIR}/operators/generic/transpose/cutt/CudaUtils.h + ${DALI_SRC_DIR}/operators/generic/transpose/cutt/CudaUtils.cu + ${DALI_SRC_DIR}/operators/generic/transpose/cutt/cuttTypes.h + ${DALI_SRC_DIR}/operators/generic/transpose/cutt/int_vector.h + ${DALI_SRC_DIR}/operators/generic/transpose/cutt/LRUCache.h ) set(LINT_TARGET lint) diff --git a/dali/benchmark/displacement_cpu_bench.cc b/dali/benchmark/displacement_cpu_bench.cc index dc6780cc..54bd099e 100644 --- a/dali/benchmark/displacement_cpu_bench.cc +++ b/dali/benchmark/displacement_cpu_bench.cc @@ -15,9 +15,9 @@ #include #include "dali/benchmark/dali_bench.h" -#include "dali/operators/displacement/displacement_filter_impl_cpu.h" -#include "dali/operators/displacement/sphere.h" -#include "dali/operators/displacement/water.h" +#include "dali/operators/image/remap/displacement_filter_impl_cpu.h" +#include "dali/operators/image/remap/sphere.h" +#include "dali/operators/image/remap/water.h" #include "dali/pipeline/data/tensor.h" #include "dali/pipeline/pipeline.h" #include "dali/util/image.h" diff --git a/dali/operators/CMakeLists.txt b/dali/operators/CMakeLists.txt index f30a7916..9d62e9da 100644 --- a/dali/operators/CMakeLists.txt +++ b/dali/operators/CMakeLists.txt @@ -15,27 +15,17 @@ project(dali_operator) add_subdirectory(audio) -add_subdirectory(color) -add_subdirectory(color_space) -add_subdirectory(crop) +add_subdirectory(bbox) +add_subdirectory(debug) add_subdirectory(decoder) -add_subdirectory(detection) -add_subdirectory(displacement) -add_subdirectory(erase) -add_subdirectory(expressions) -add_subdirectory(fused) -add_subdirectory(geometric) -if (BUILD_NVOF) - add_subdirectory(optical_flow) -endif() -add_subdirectory(paste) +add_subdirectory(generic) +add_subdirectory(image) +add_subdirectory(math) +add_subdirectory(random) add_subdirectory(reader) -add_subdirectory(resize) add_subdirectory(sequence) add_subdirectory(signal) -add_subdirectory(support) -add_subdirectory(transpose) -add_subdirectory(util) +add_subdirectory(ssd) if (BUILD_PYTHON) add_subdirectory(python_function) endif() diff --git a/dali/operators/color/CMakeLists.txt b/dali/operators/bbox/CMakeLists.txt similarity index 100% rename from dali/operators/color/CMakeLists.txt rename to dali/operators/bbox/CMakeLists.txt diff --git a/dali/operators/geometric/bb_flip.cc b/dali/operators/bbox/bb_flip.cc similarity index 98% rename from dali/operators/geometric/bb_flip.cc rename to dali/operators/bbox/bb_flip.cc index a9ef5455..8ec4c9a9 100644 --- a/dali/operators/geometric/bb_flip.cc +++ b/dali/operators/bbox/bb_flip.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/geometric/bb_flip.h" +#include "dali/operators/bbox/bb_flip.h" #include #include diff --git a/dali/operators/geometric/bb_flip.cu b/dali/operators/bbox/bb_flip.cu similarity index 99% rename from dali/operators/geometric/bb_flip.cu rename to dali/operators/bbox/bb_flip.cu index 95794624..92504b3e 100644 --- a/dali/operators/geometric/bb_flip.cu +++ b/dali/operators/bbox/bb_flip.cu @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include +#include #include #include diff --git a/dali/operators/geometric/bb_flip.cuh b/dali/operators/bbox/bb_flip.cuh similarity index 84% rename from dali/operators/geometric/bb_flip.cuh rename to dali/operators/bbox/bb_flip.cuh index ba89afe3..f25b4937 100644 --- a/dali/operators/geometric/bb_flip.cuh +++ b/dali/operators/bbox/bb_flip.cuh @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_GEOMETRIC_BB_FLIP_CUH_ -#define DALI_OPERATORS_GEOMETRIC_BB_FLIP_CUH_ +#ifndef DALI_OPERATORS_BBOX_BB_FLIP_CUH_ +#define DALI_OPERATORS_BBOX_BB_FLIP_CUH_ #include -#include "dali/operators/geometric/bb_flip.h" +#include "dali/operators/bbox/bb_flip.h" namespace dali { @@ -36,4 +36,4 @@ class BbFlip : public Operator { } // namespace dali -#endif // DALI_OPERATORS_GEOMETRIC_BB_FLIP_CUH_ +#endif // DALI_OPERATORS_BBOX_BB_FLIP_CUH_ diff --git a/dali/operators/geometric/bb_flip.h b/dali/operators/bbox/bb_flip.h similarity index 95% rename from dali/operators/geometric/bb_flip.h rename to dali/operators/bbox/bb_flip.h index 702e9784..8f5072c0 100644 --- a/dali/operators/geometric/bb_flip.h +++ b/dali/operators/bbox/bb_flip.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_GEOMETRIC_BB_FLIP_H_ -#define DALI_OPERATORS_GEOMETRIC_BB_FLIP_H_ +#ifndef DALI_OPERATORS_BBOX_BB_FLIP_H_ +#define DALI_OPERATORS_BBOX_BB_FLIP_H_ #include #include @@ -92,4 +92,4 @@ class BbFlip : public Operator { } // namespace dali -#endif // DALI_OPERATORS_GEOMETRIC_BB_FLIP_H_ +#endif // DALI_OPERATORS_BBOX_BB_FLIP_H_ diff --git a/dali/operators/geometric/bb_flip_test.cc b/dali/operators/bbox/bb_flip_test.cc similarity index 100% rename from dali/operators/geometric/bb_flip_test.cc rename to dali/operators/bbox/bb_flip_test.cc diff --git a/dali/operators/paste/bbox_paste.cc b/dali/operators/bbox/bbox_paste.cc similarity index 98% rename from dali/operators/paste/bbox_paste.cc rename to dali/operators/bbox/bbox_paste.cc index 77a535aa..58b19f1f 100644 --- a/dali/operators/paste/bbox_paste.cc +++ b/dali/operators/bbox/bbox_paste.cc @@ -14,7 +14,7 @@ #include -#include "dali/operators/paste/bbox_paste.h" +#include "dali/operators/bbox/bbox_paste.h" namespace dali { diff --git a/dali/operators/paste/bbox_paste.h b/dali/operators/bbox/bbox_paste.h similarity index 91% rename from dali/operators/paste/bbox_paste.h rename to dali/operators/bbox/bbox_paste.h index 37ceda59..c61ec370 100644 --- a/dali/operators/paste/bbox_paste.h +++ b/dali/operators/bbox/bbox_paste.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_PASTE_BBOX_PASTE_H_ -#define DALI_OPERATORS_PASTE_BBOX_PASTE_H_ +#ifndef DALI_OPERATORS_BBOX_BBOX_PASTE_H_ +#define DALI_OPERATORS_BBOX_BBOX_PASTE_H_ #include @@ -47,4 +47,4 @@ class BBoxPaste : public Operator { } // namespace dali -#endif // DALI_OPERATORS_PASTE_BBOX_PASTE_H_ +#endif // DALI_OPERATORS_BBOX_BBOX_PASTE_H_ diff --git a/dali/operators/paste/bbox_paste_test.cc b/dali/operators/bbox/bbox_paste_test.cc similarity index 100% rename from dali/operators/paste/bbox_paste_test.cc rename to dali/operators/bbox/bbox_paste_test.cc diff --git a/dali/operators/crop/CMakeLists.txt b/dali/operators/debug/CMakeLists.txt similarity index 100% rename from dali/operators/crop/CMakeLists.txt rename to dali/operators/debug/CMakeLists.txt diff --git a/dali/operators/util/dump_image.cc b/dali/operators/debug/dump_image.cc similarity index 97% rename from dali/operators/util/dump_image.cc rename to dali/operators/debug/dump_image.cc index 39dafbbd..0a88d0fd 100644 --- a/dali/operators/util/dump_image.cc +++ b/dali/operators/debug/dump_image.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/util/dump_image.h" +#include "dali/operators/debug/dump_image.h" #include "dali/util/image.h" namespace dali { diff --git a/dali/operators/util/dump_image.cu b/dali/operators/debug/dump_image.cu similarity index 95% rename from dali/operators/util/dump_image.cu rename to dali/operators/debug/dump_image.cu index 678e1e2a..4d6249c8 100644 --- a/dali/operators/util/dump_image.cu +++ b/dali/operators/debug/dump_image.cu @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/util/dump_image.h" +#include "dali/operators/debug/dump_image.h" #include "dali/util/image.h" namespace dali { diff --git a/dali/operators/util/dump_image.h b/dali/operators/debug/dump_image.h similarity index 91% rename from dali/operators/util/dump_image.h rename to dali/operators/debug/dump_image.h index 2674cbe1..bcf0b34c 100644 --- a/dali/operators/util/dump_image.h +++ b/dali/operators/debug/dump_image.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_UTIL_DUMP_IMAGE_H_ -#define DALI_OPERATORS_UTIL_DUMP_IMAGE_H_ +#ifndef DALI_OPERATORS_DEBUG_DUMP_IMAGE_H_ +#define DALI_OPERATORS_DEBUG_DUMP_IMAGE_H_ #include #include @@ -47,4 +47,4 @@ class DumpImage : public Operator { }; } // namespace dali -#endif // DALI_OPERATORS_UTIL_DUMP_IMAGE_H_ +#endif // DALI_OPERATORS_DEBUG_DUMP_IMAGE_H_ diff --git a/dali/operators/decoder/host/fused/host_decoder_crop.h b/dali/operators/decoder/host/fused/host_decoder_crop.h index 6b0d046b..8e75bc5f 100644 --- a/dali/operators/decoder/host/fused/host_decoder_crop.h +++ b/dali/operators/decoder/host/fused/host_decoder_crop.h @@ -17,7 +17,7 @@ #include #include "dali/core/common.h" -#include "dali/operators/crop/crop_attr.h" +#include "dali/operators/image/crop/crop_attr.h" #include "dali/operators/decoder/host/host_decoder.h" namespace dali { diff --git a/dali/operators/decoder/host/fused/host_decoder_random_crop.h b/dali/operators/decoder/host/fused/host_decoder_random_crop.h index b8a8f779..3f94e412 100644 --- a/dali/operators/decoder/host/fused/host_decoder_random_crop.h +++ b/dali/operators/decoder/host/fused/host_decoder_random_crop.h @@ -16,7 +16,7 @@ #define DALI_OPERATORS_DECODER_HOST_FUSED_HOST_DECODER_RANDOM_CROP_H_ #include "dali/core/common.h" -#include "dali/operators/crop/random_crop_attr.h" +#include "dali/operators/image/crop/random_crop_attr.h" #include "dali/operators/decoder/host/host_decoder.h" namespace dali { diff --git a/dali/operators/decoder/host/fused/host_decoder_random_crop_test.cc b/dali/operators/decoder/host/fused/host_decoder_random_crop_test.cc index 82ef81fe..9fe2f6df 100644 --- a/dali/operators/decoder/host/fused/host_decoder_random_crop_test.cc +++ b/dali/operators/decoder/host/fused/host_decoder_random_crop_test.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "dali/operators/decoder/decoder_test.h" -#include "dali/operators/crop/random_crop_attr.h" +#include "dali/operators/image/crop/random_crop_attr.h" namespace dali { diff --git a/dali/operators/decoder/host/fused/host_decoder_slice.h b/dali/operators/decoder/host/fused/host_decoder_slice.h index 3deb671a..9db1098a 100644 --- a/dali/operators/decoder/host/fused/host_decoder_slice.h +++ b/dali/operators/decoder/host/fused/host_decoder_slice.h @@ -17,7 +17,7 @@ #include #include "dali/core/common.h" -#include "dali/operators/crop/slice_attr.h" +#include "dali/operators/generic/slice/slice_attr.h" #include "dali/operators/decoder/host/host_decoder.h" namespace dali { diff --git a/dali/operators/decoder/nvjpeg/decoupled_api/fused/nvjpeg_decoder_cpu_crop.h b/dali/operators/decoder/nvjpeg/decoupled_api/fused/nvjpeg_decoder_cpu_crop.h index 4366c73e..e724eac1 100644 --- a/dali/operators/decoder/nvjpeg/decoupled_api/fused/nvjpeg_decoder_cpu_crop.h +++ b/dali/operators/decoder/nvjpeg/decoupled_api/fused/nvjpeg_decoder_cpu_crop.h @@ -17,7 +17,7 @@ #include #include "dali/operators/decoder/nvjpeg/decoupled_api/nvjpeg_decoder_cpu.h" -#include "dali/operators/crop/crop_attr.h" +#include "dali/operators/image/crop/crop_attr.h" namespace dali { diff --git a/dali/operators/decoder/nvjpeg/decoupled_api/fused/nvjpeg_decoder_cpu_random_crop.h b/dali/operators/decoder/nvjpeg/decoupled_api/fused/nvjpeg_decoder_cpu_random_crop.h index a1e0ba34..03839672 100644 --- a/dali/operators/decoder/nvjpeg/decoupled_api/fused/nvjpeg_decoder_cpu_random_crop.h +++ b/dali/operators/decoder/nvjpeg/decoupled_api/fused/nvjpeg_decoder_cpu_random_crop.h @@ -16,7 +16,7 @@ #define DALI_OPERATORS_DECODER_NVJPEG_DECOUPLED_API_FUSED_NVJPEG_DECODER_CPU_RANDOM_CROP_H_ #include "dali/operators/decoder/nvjpeg/decoupled_api/nvjpeg_decoder_cpu.h" -#include "dali/operators/crop/random_crop_attr.h" +#include "dali/operators/image/crop/random_crop_attr.h" namespace dali { diff --git a/dali/operators/decoder/nvjpeg/decoupled_api/fused/nvjpeg_decoder_cpu_slice.h b/dali/operators/decoder/nvjpeg/decoupled_api/fused/nvjpeg_decoder_cpu_slice.h index f9263b4e..29229077 100644 --- a/dali/operators/decoder/nvjpeg/decoupled_api/fused/nvjpeg_decoder_cpu_slice.h +++ b/dali/operators/decoder/nvjpeg/decoupled_api/fused/nvjpeg_decoder_cpu_slice.h @@ -17,7 +17,7 @@ #include #include "dali/operators/decoder/nvjpeg/decoupled_api/nvjpeg_decoder_cpu.h" -#include "dali/operators/crop/slice_attr.h" +#include "dali/operators/generic/slice/slice_attr.h" namespace dali { diff --git a/dali/operators/decoder/nvjpeg/decoupled_api/fused/nvjpeg_decoder_crop.h b/dali/operators/decoder/nvjpeg/decoupled_api/fused/nvjpeg_decoder_crop.h index 63ae8b6e..5ff2fb1f 100644 --- a/dali/operators/decoder/nvjpeg/decoupled_api/fused/nvjpeg_decoder_crop.h +++ b/dali/operators/decoder/nvjpeg/decoupled_api/fused/nvjpeg_decoder_crop.h @@ -17,7 +17,7 @@ #include #include "dali/operators/decoder/nvjpeg/decoupled_api/nvjpeg_decoder_decoupled_api.h" -#include "dali/operators/crop/crop_attr.h" +#include "dali/operators/image/crop/crop_attr.h" namespace dali { diff --git a/dali/operators/decoder/nvjpeg/decoupled_api/fused/nvjpeg_decoder_random_crop.h b/dali/operators/decoder/nvjpeg/decoupled_api/fused/nvjpeg_decoder_random_crop.h index aa933f57..5214e940 100644 --- a/dali/operators/decoder/nvjpeg/decoupled_api/fused/nvjpeg_decoder_random_crop.h +++ b/dali/operators/decoder/nvjpeg/decoupled_api/fused/nvjpeg_decoder_random_crop.h @@ -16,7 +16,7 @@ #define DALI_OPERATORS_DECODER_NVJPEG_DECOUPLED_API_FUSED_NVJPEG_DECODER_RANDOM_CROP_H_ #include "dali/operators/decoder/nvjpeg/decoupled_api/nvjpeg_decoder_decoupled_api.h" -#include "dali/operators/crop/random_crop_attr.h" +#include "dali/operators/image/crop/random_crop_attr.h" namespace dali { diff --git a/dali/operators/decoder/nvjpeg/decoupled_api/fused/nvjpeg_decoder_random_crop_test.cc b/dali/operators/decoder/nvjpeg/decoupled_api/fused/nvjpeg_decoder_random_crop_test.cc index cf0535ee..eb513916 100644 --- a/dali/operators/decoder/nvjpeg/decoupled_api/fused/nvjpeg_decoder_random_crop_test.cc +++ b/dali/operators/decoder/nvjpeg/decoupled_api/fused/nvjpeg_decoder_random_crop_test.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "dali/operators/decoder/decoder_test.h" -#include "dali/operators/crop/random_crop_attr.h" +#include "dali/operators/image/crop/random_crop_attr.h" namespace dali { diff --git a/dali/operators/decoder/nvjpeg/decoupled_api/fused/nvjpeg_decoder_slice.h b/dali/operators/decoder/nvjpeg/decoupled_api/fused/nvjpeg_decoder_slice.h index 443afe53..a9ef7ef4 100644 --- a/dali/operators/decoder/nvjpeg/decoupled_api/fused/nvjpeg_decoder_slice.h +++ b/dali/operators/decoder/nvjpeg/decoupled_api/fused/nvjpeg_decoder_slice.h @@ -17,7 +17,7 @@ #include #include "dali/operators/decoder/nvjpeg/decoupled_api/nvjpeg_decoder_decoupled_api.h" -#include "dali/operators/crop/slice_attr.h" +#include "dali/operators/generic/slice/slice_attr.h" namespace dali { diff --git a/dali/operators/decoder/nvjpeg/decoupled_api/fused/nvjpeg_decoder_split_random_crop_test.cc b/dali/operators/decoder/nvjpeg/decoupled_api/fused/nvjpeg_decoder_split_random_crop_test.cc index 2bb95389..24b9933a 100644 --- a/dali/operators/decoder/nvjpeg/decoupled_api/fused/nvjpeg_decoder_split_random_crop_test.cc +++ b/dali/operators/decoder/nvjpeg/decoupled_api/fused/nvjpeg_decoder_split_random_crop_test.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "dali/operators/decoder/decoder_test.h" -#include "dali/operators/crop/random_crop_attr.h" +#include "dali/operators/image/crop/random_crop_attr.h" namespace dali { diff --git a/dali/operators/generic/CMakeLists.txt b/dali/operators/generic/CMakeLists.txt new file mode 100644 index 00000000..fdf71ef9 --- /dev/null +++ b/dali/operators/generic/CMakeLists.txt @@ -0,0 +1,23 @@ +# Copyright (c) 2017-2020, NVIDIA CORPORATION. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Get all the source files and dump test files + +add_subdirectory(erase) +add_subdirectory(slice) +add_subdirectory(transpose) + +collect_headers(DALI_INST_HDRS PARENT_SCOPE) +collect_sources(DALI_OPERATOR_SRCS PARENT_SCOPE) +collect_test_sources(DALI_OPERATOR_TEST_SRCS PARENT_SCOPE) diff --git a/dali/operators/util/cast.cc b/dali/operators/generic/cast.cc similarity index 97% rename from dali/operators/util/cast.cc rename to dali/operators/generic/cast.cc index 247ba832..608468df 100644 --- a/dali/operators/util/cast.cc +++ b/dali/operators/generic/cast.cc @@ -14,7 +14,7 @@ #include "dali/core/static_switch.h" -#include "dali/operators/util/cast.h" +#include "dali/operators/generic/cast.h" namespace dali { diff --git a/dali/operators/util/cast.cu b/dali/operators/generic/cast.cu similarity index 98% rename from dali/operators/util/cast.cu rename to dali/operators/generic/cast.cu index 2f28454a..05fe2a19 100644 --- a/dali/operators/util/cast.cu +++ b/dali/operators/generic/cast.cu @@ -16,7 +16,7 @@ #include "dali/core/cuda_utils.h" #include "dali/core/error_handling.h" #include "dali/core/static_switch.h" -#include "dali/operators/util/cast.h" +#include "dali/operators/generic/cast.h" namespace dali { diff --git a/dali/operators/util/cast.h b/dali/operators/generic/cast.h similarity index 93% rename from dali/operators/util/cast.h rename to dali/operators/generic/cast.h index 5a5591e4..35fc90b2 100644 --- a/dali/operators/util/cast.h +++ b/dali/operators/generic/cast.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_UTIL_CAST_H_ -#define DALI_OPERATORS_UTIL_CAST_H_ +#ifndef DALI_OPERATORS_GENERIC_CAST_H_ +#define DALI_OPERATORS_GENERIC_CAST_H_ #include @@ -62,4 +62,4 @@ class Cast : public Operator { } // namespace dali -#endif // DALI_OPERATORS_UTIL_CAST_H_ +#endif // DALI_OPERATORS_GENERIC_CAST_H_ diff --git a/dali/operators/erase/CMakeLists.txt b/dali/operators/generic/erase/CMakeLists.txt similarity index 100% rename from dali/operators/erase/CMakeLists.txt rename to dali/operators/generic/erase/CMakeLists.txt diff --git a/dali/operators/erase/erase.cc b/dali/operators/generic/erase/erase.cc similarity index 98% rename from dali/operators/erase/erase.cc rename to dali/operators/generic/erase/erase.cc index 580d71ae..8755b4bb 100644 --- a/dali/operators/erase/erase.cc +++ b/dali/operators/generic/erase/erase.cc @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/erase/erase.h" +#include "dali/operators/generic/erase/erase.h" #include -#include "dali/operators/erase/erase_utils.h" +#include "dali/operators/generic/erase/erase_utils.h" #include "dali/core/static_switch.h" #include "dali/pipeline/data/views.h" #include "dali/kernels/erase/erase_cpu.h" diff --git a/dali/operators/erase/erase.h b/dali/operators/generic/erase/erase.h similarity index 92% rename from dali/operators/erase/erase.h rename to dali/operators/generic/erase/erase.h index 1ee60117..f92efaf3 100644 --- a/dali/operators/erase/erase.h +++ b/dali/operators/generic/erase/erase.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_ERASE_ERASE_H_ -#define DALI_OPERATORS_ERASE_ERASE_H_ +#ifndef DALI_OPERATORS_GENERIC_ERASE_ERASE_H_ +#define DALI_OPERATORS_GENERIC_ERASE_ERASE_H_ #include #include @@ -63,4 +63,4 @@ class Erase : public Operator { } // namespace dali -#endif // DALI_OPERATORS_ERASE_ERASE_H_ +#endif // DALI_OPERATORS_GENERIC_ERASE_ERASE_H_ diff --git a/dali/operators/erase/erase_utils.h b/dali/operators/generic/erase/erase_utils.h similarity index 97% rename from dali/operators/erase/erase_utils.h rename to dali/operators/generic/erase/erase_utils.h index c4b2c949..ddf6aa26 100644 --- a/dali/operators/erase/erase_utils.h +++ b/dali/operators/generic/erase/erase_utils.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_ERASE_ERASE_UTILS_H_ -#define DALI_OPERATORS_ERASE_ERASE_UTILS_H_ +#ifndef DALI_OPERATORS_GENERIC_ERASE_ERASE_UTILS_H_ +#define DALI_OPERATORS_GENERIC_ERASE_ERASE_UTILS_H_ #include #include @@ -147,4 +147,4 @@ std::vector> GetEraseArgs(const OpSpec &spec, } // namespace detail } // namespace dali -#endif // DALI_OPERATORS_ERASE_ERASE_UTILS_H_ +#endif // DALI_OPERATORS_GENERIC_ERASE_ERASE_UTILS_H_ diff --git a/dali/operators/util/external_source_test.cc b/dali/operators/generic/external_source_test.cc similarity index 100% rename from dali/operators/util/external_source_test.cc rename to dali/operators/generic/external_source_test.cc diff --git a/dali/operators/geometric/flip.cc b/dali/operators/generic/flip.cc similarity index 97% rename from dali/operators/geometric/flip.cc rename to dali/operators/generic/flip.cc index de43b494..245e7f4d 100644 --- a/dali/operators/geometric/flip.cc +++ b/dali/operators/generic/flip.cc @@ -13,12 +13,12 @@ // limitations under the License. #include -#include "dali/operators/geometric/flip.h" +#include "dali/operators/generic/flip.h" #include "dali/kernels/imgproc/flip_cpu.h" #include "dali/kernels/kernel_params.h" #include "dali/pipeline/data/views.h" #include "dali/util/ocv.h" -#include "dali/operators/geometric/flip_util.h" +#include "dali/operators/generic/flip_util.h" namespace dali { diff --git a/dali/operators/geometric/flip.cu b/dali/operators/generic/flip.cu similarity index 96% rename from dali/operators/geometric/flip.cu rename to dali/operators/generic/flip.cu index 9508701d..570c0404 100644 --- a/dali/operators/geometric/flip.cu +++ b/dali/operators/generic/flip.cu @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/geometric/flip.h" +#include "dali/operators/generic/flip.h" #include #include #include "dali/kernels/imgproc/flip_gpu.cuh" -#include "dali/operators/geometric/flip_util.h" +#include "dali/operators/generic/flip_util.h" namespace dali { diff --git a/dali/operators/geometric/flip.h b/dali/operators/generic/flip.h similarity index 94% rename from dali/operators/geometric/flip.h rename to dali/operators/generic/flip.h index c28399f1..6441fe4c 100644 --- a/dali/operators/geometric/flip.h +++ b/dali/operators/generic/flip.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_GEOMETRIC_FLIP_H_ -#define DALI_OPERATORS_GEOMETRIC_FLIP_H_ +#ifndef DALI_OPERATORS_GENERIC_FLIP_H_ +#define DALI_OPERATORS_GENERIC_FLIP_H_ #include #include @@ -79,4 +79,4 @@ class Flip: public Operator { } // namespace dali -#endif // DALI_OPERATORS_GEOMETRIC_FLIP_H_ +#endif // DALI_OPERATORS_GENERIC_FLIP_H_ diff --git a/dali/operators/geometric/flip_test.cc b/dali/operators/generic/flip_test.cc similarity index 100% rename from dali/operators/geometric/flip_test.cc rename to dali/operators/generic/flip_test.cc diff --git a/dali/operators/geometric/flip_util.h b/dali/operators/generic/flip_util.h similarity index 95% rename from dali/operators/geometric/flip_util.h rename to dali/operators/generic/flip_util.h index c09256c6..81e8ac39 100644 --- a/dali/operators/geometric/flip_util.h +++ b/dali/operators/generic/flip_util.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_GEOMETRIC_FLIP_UTIL_H_ -#define DALI_OPERATORS_GEOMETRIC_FLIP_UTIL_H_ +#ifndef DALI_OPERATORS_GENERIC_FLIP_UTIL_H_ +#define DALI_OPERATORS_GENERIC_FLIP_UTIL_H_ #include #include "dali/core/tensor_shape.h" @@ -96,4 +96,4 @@ inline TensorListShape TransformShapes(const TensorListShape<> &shape } // namespace dali -#endif // DALI_OPERATORS_GEOMETRIC_FLIP_UTIL_H_ +#endif // DALI_OPERATORS_GENERIC_FLIP_UTIL_H_ diff --git a/dali/operators/util/lookup_table.cc b/dali/operators/generic/lookup_table.cc similarity index 98% rename from dali/operators/util/lookup_table.cc rename to dali/operators/generic/lookup_table.cc index 37b1f36d..80e277ad 100644 --- a/dali/operators/util/lookup_table.cc +++ b/dali/operators/generic/lookup_table.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/util/lookup_table.h" +#include "dali/operators/generic/lookup_table.h" namespace dali { diff --git a/dali/operators/util/lookup_table.cu b/dali/operators/generic/lookup_table.cu similarity index 98% rename from dali/operators/util/lookup_table.cu rename to dali/operators/generic/lookup_table.cu index 5cac951a..6073fb87 100644 --- a/dali/operators/util/lookup_table.cu +++ b/dali/operators/generic/lookup_table.cu @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/util/lookup_table.h" +#include "dali/operators/generic/lookup_table.h" #include #include "dali/core/span.h" #include "dali/core/convert.h" diff --git a/dali/operators/util/lookup_table.h b/dali/operators/generic/lookup_table.h similarity index 96% rename from dali/operators/util/lookup_table.h rename to dali/operators/generic/lookup_table.h index 96a3bcb0..77fe30df 100644 --- a/dali/operators/util/lookup_table.h +++ b/dali/operators/generic/lookup_table.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_UTIL_LOOKUP_TABLE_H_ -#define DALI_OPERATORS_UTIL_LOOKUP_TABLE_H_ +#ifndef DALI_OPERATORS_GENERIC_LOOKUP_TABLE_H_ +#define DALI_OPERATORS_GENERIC_LOOKUP_TABLE_H_ #include #include @@ -101,4 +101,4 @@ class LookupTable : public Operator { } // namespace dali -#endif // DALI_OPERATORS_UTIL_LOOKUP_TABLE_H_ +#endif // DALI_OPERATORS_GENERIC_LOOKUP_TABLE_H_ diff --git a/dali/operators/util/pad.cc b/dali/operators/generic/pad.cc similarity index 99% rename from dali/operators/util/pad.cc rename to dali/operators/generic/pad.cc index 408b8b45..0c7800ea 100644 --- a/dali/operators/util/pad.cc +++ b/dali/operators/generic/pad.cc @@ -14,7 +14,7 @@ #include #include -#include "dali/operators/util/pad.h" +#include "dali/operators/generic/pad.h" #include "dali/core/static_switch.h" #include "dali/pipeline/data/views.h" #include "dali/kernels/slice/slice_flip_normalize_permute_pad_cpu.h" diff --git a/dali/operators/util/pad.cu b/dali/operators/generic/pad.cu similarity index 98% rename from dali/operators/util/pad.cu rename to dali/operators/generic/pad.cu index 78b87ef8..88ed6f45 100644 --- a/dali/operators/util/pad.cu +++ b/dali/operators/generic/pad.cu @@ -14,7 +14,7 @@ #include #include -#include "dali/operators/util/pad.h" +#include "dali/operators/generic/pad.h" #include "dali/core/static_switch.h" #include "dali/pipeline/data/views.h" #include "dali/kernels/slice/slice_flip_normalize_permute_pad_gpu.h" diff --git a/dali/operators/util/pad.h b/dali/operators/generic/pad.h similarity index 97% rename from dali/operators/util/pad.h rename to dali/operators/generic/pad.h index abfdde03..2b321c6f 100644 --- a/dali/operators/util/pad.h +++ b/dali/operators/generic/pad.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_UTIL_PAD_H_ -#define DALI_OPERATORS_UTIL_PAD_H_ +#ifndef DALI_OPERATORS_GENERIC_PAD_H_ +#define DALI_OPERATORS_GENERIC_PAD_H_ #include #include @@ -165,4 +165,4 @@ class Pad : public Operator { } // namespace dali -#endif // DALI_OPERATORS_UTIL_PAD_H_ +#endif // DALI_OPERATORS_GENERIC_PAD_H_ diff --git a/dali/operators/util/pad_test.cc b/dali/operators/generic/pad_test.cc similarity index 100% rename from dali/operators/util/pad_test.cc rename to dali/operators/generic/pad_test.cc diff --git a/dali/operators/util/reshape.cc b/dali/operators/generic/reshape.cc similarity index 99% rename from dali/operators/util/reshape.cc rename to dali/operators/generic/reshape.cc index 6d2301e3..c440c1a6 100644 --- a/dali/operators/util/reshape.cc +++ b/dali/operators/generic/reshape.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/util/reshape.h" +#include "dali/operators/generic/reshape.h" #include #include "dali/core/math_util.h" diff --git a/dali/operators/util/reshape.h b/dali/operators/generic/reshape.h similarity index 93% rename from dali/operators/util/reshape.h rename to dali/operators/generic/reshape.h index b4d27fba..7b8f2fcd 100644 --- a/dali/operators/util/reshape.h +++ b/dali/operators/generic/reshape.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_UTIL_RESHAPE_H_ -#define DALI_OPERATORS_UTIL_RESHAPE_H_ +#ifndef DALI_OPERATORS_GENERIC_RESHAPE_H_ +#define DALI_OPERATORS_GENERIC_RESHAPE_H_ #include @@ -71,4 +71,4 @@ class Reshape : public Operator { } // namespace dali -#endif // DALI_OPERATORS_UTIL_RESHAPE_H_ +#endif // DALI_OPERATORS_GENERIC_RESHAPE_H_ diff --git a/dali/operators/geometric/shapes.cc b/dali/operators/generic/shapes.cc similarity index 95% rename from dali/operators/geometric/shapes.cc rename to dali/operators/generic/shapes.cc index 1f7813c6..5657e537 100644 --- a/dali/operators/geometric/shapes.cc +++ b/dali/operators/generic/shapes.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/geometric/shapes.h" +#include "dali/operators/generic/shapes.h" namespace dali { diff --git a/dali/operators/geometric/shapes.h b/dali/operators/generic/shapes.h similarity index 96% rename from dali/operators/geometric/shapes.h rename to dali/operators/generic/shapes.h index fdb90ffb..8e44ddc2 100644 --- a/dali/operators/geometric/shapes.h +++ b/dali/operators/generic/shapes.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_GEOMETRIC_SHAPES_H_ -#define DALI_OPERATORS_GEOMETRIC_SHAPES_H_ +#ifndef DALI_OPERATORS_GENERIC_SHAPES_H_ +#define DALI_OPERATORS_GENERIC_SHAPES_H_ #include #include @@ -133,4 +133,4 @@ class Shapes : public Operator { } // namespace dali -#endif // DALI_OPERATORS_GEOMETRIC_SHAPES_H_ +#endif // DALI_OPERATORS_GENERIC_SHAPES_H_ diff --git a/dali/operators/geometric/shapes_test.cc b/dali/operators/generic/shapes_test.cc similarity index 99% rename from dali/operators/geometric/shapes_test.cc rename to dali/operators/generic/shapes_test.cc index 7b521c80..e474bf14 100644 --- a/dali/operators/geometric/shapes_test.cc +++ b/dali/operators/generic/shapes_test.cc @@ -14,7 +14,7 @@ #include #include -#include "dali/operators/geometric/shapes.h" +#include "dali/operators/generic/shapes.h" #include "dali/test/dali_operator_test.h" #include "dali/core/tensor_shape_print.h" diff --git a/dali/operators/expressions/expression_factory_instances/CMakeLists.txt b/dali/operators/generic/slice/CMakeLists.txt similarity index 100% rename from dali/operators/expressions/expression_factory_instances/CMakeLists.txt rename to dali/operators/generic/slice/CMakeLists.txt diff --git a/dali/operators/crop/slice.cc b/dali/operators/generic/slice/slice.cc similarity index 98% rename from dali/operators/crop/slice.cc rename to dali/operators/generic/slice/slice.cc index bf670b02..882ab356 100644 --- a/dali/operators/crop/slice.cc +++ b/dali/operators/generic/slice/slice.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/crop/slice.h" +#include "dali/operators/generic/slice/slice.h" namespace dali { diff --git a/dali/operators/crop/slice.cu b/dali/operators/generic/slice/slice.cu similarity index 96% rename from dali/operators/crop/slice.cu rename to dali/operators/generic/slice/slice.cu index 0798abdc..e6a7eba3 100644 --- a/dali/operators/crop/slice.cu +++ b/dali/operators/generic/slice/slice.cu @@ -13,7 +13,7 @@ // limitations under the License. #include -#include "dali/operators/crop/slice.h" +#include "dali/operators/generic/slice/slice.h" namespace dali { diff --git a/dali/operators/crop/slice.h b/dali/operators/generic/slice/slice.h similarity index 88% rename from dali/operators/crop/slice.h rename to dali/operators/generic/slice/slice.h index 0c737891..d0a5c44a 100644 --- a/dali/operators/crop/slice.h +++ b/dali/operators/generic/slice/slice.h @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_CROP_SLICE_H_ -#define DALI_OPERATORS_CROP_SLICE_H_ +#ifndef DALI_OPERATORS_GENERIC_SLICE_SLICE_H_ +#define DALI_OPERATORS_GENERIC_SLICE_SLICE_H_ #include #include #include "dali/core/common.h" #include "dali/core/error_handling.h" -#include "dali/operators/crop/slice_attr.h" -#include "dali/operators/crop/slice_base.h" +#include "dali/operators/generic/slice/slice_attr.h" +#include "dali/operators/generic/slice/slice_base.h" #include "dali/pipeline/operator/common.h" #include "dali/pipeline/operator/operator.h" @@ -74,4 +74,4 @@ class Slice : public SliceBase { } // namespace dali -#endif // DALI_OPERATORS_CROP_SLICE_H_ +#endif // DALI_OPERATORS_GENERIC_SLICE_SLICE_H_ diff --git a/dali/operators/crop/slice_attr.cc b/dali/operators/generic/slice/slice_attr.cc similarity index 96% rename from dali/operators/crop/slice_attr.cc rename to dali/operators/generic/slice/slice_attr.cc index 865b4272..8bd26eb5 100644 --- a/dali/operators/crop/slice_attr.cc +++ b/dali/operators/generic/slice/slice_attr.cc @@ -13,7 +13,7 @@ // limitations under the License. #include -#include "dali/operators/crop/slice_attr.h" +#include "dali/operators/generic/slice/slice_attr.h" namespace dali { diff --git a/dali/operators/crop/slice_attr.h b/dali/operators/generic/slice/slice_attr.h similarity index 97% rename from dali/operators/crop/slice_attr.h rename to dali/operators/generic/slice/slice_attr.h index 5e036452..c0843d89 100644 --- a/dali/operators/crop/slice_attr.h +++ b/dali/operators/generic/slice/slice_attr.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_CROP_SLICE_ATTR_H_ -#define DALI_OPERATORS_CROP_SLICE_ATTR_H_ +#ifndef DALI_OPERATORS_GENERIC_SLICE_SLICE_ATTR_H_ +#define DALI_OPERATORS_GENERIC_SLICE_SLICE_ATTR_H_ #include #include @@ -140,4 +140,4 @@ class SliceAttr { } // namespace dali -#endif // DALI_OPERATORS_CROP_SLICE_ATTR_H_ +#endif // DALI_OPERATORS_GENERIC_SLICE_SLICE_ATTR_H_ diff --git a/dali/operators/crop/slice_base.cc b/dali/operators/generic/slice/slice_base.cc similarity index 98% rename from dali/operators/crop/slice_base.cc rename to dali/operators/generic/slice/slice_base.cc index 5878f60c..460be5ae 100644 --- a/dali/operators/crop/slice_base.cc +++ b/dali/operators/generic/slice/slice_base.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/crop/slice_base.h" +#include "dali/operators/generic/slice/slice_base.h" #include #include #include "dali/core/static_switch.h" diff --git a/dali/operators/crop/slice_base.cu b/dali/operators/generic/slice/slice_base.cu similarity index 98% rename from dali/operators/crop/slice_base.cu rename to dali/operators/generic/slice/slice_base.cu index b05e45c2..2c90578d 100644 --- a/dali/operators/crop/slice_base.cu +++ b/dali/operators/generic/slice/slice_base.cu @@ -16,7 +16,7 @@ #include "dali/image/transform.h" #include "dali/kernels/slice/slice_gpu.cuh" #include "dali/core/static_switch.h" -#include "dali/operators/crop/slice_base.h" +#include "dali/operators/generic/slice/slice_base.h" #include "dali/pipeline/data/views.h" namespace dali { diff --git a/dali/operators/crop/slice_base.h b/dali/operators/generic/slice/slice_base.h similarity index 92% rename from dali/operators/crop/slice_base.h rename to dali/operators/generic/slice/slice_base.h index d761971b..7ed22da5 100644 --- a/dali/operators/crop/slice_base.h +++ b/dali/operators/generic/slice/slice_base.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_CROP_SLICE_BASE_H_ -#define DALI_OPERATORS_CROP_SLICE_BASE_H_ +#ifndef DALI_OPERATORS_GENERIC_SLICE_SLICE_BASE_H_ +#define DALI_OPERATORS_GENERIC_SLICE_SLICE_BASE_H_ #include #include @@ -21,7 +21,7 @@ #include "dali/core/common.h" #include "dali/core/error_handling.h" #include "dali/kernels/scratch.h" -#include "dali/operators/crop/crop_attr.h" +#include "dali/operators/image/crop/crop_attr.h" #include "dali/pipeline/operator/common.h" #include "dali/pipeline/operator/operator.h" @@ -72,4 +72,4 @@ class SliceBase : public Operator { } // namespace dali -#endif // DALI_OPERATORS_CROP_SLICE_BASE_H_ +#endif // DALI_OPERATORS_GENERIC_SLICE_SLICE_BASE_H_ diff --git a/dali/operators/crop/slice_test.cc b/dali/operators/generic/slice/slice_test.cc similarity index 100% rename from dali/operators/crop/slice_test.cc rename to dali/operators/generic/slice/slice_test.cc diff --git a/dali/operators/transpose/CMakeLists.txt b/dali/operators/generic/transpose/CMakeLists.txt similarity index 100% rename from dali/operators/transpose/CMakeLists.txt rename to dali/operators/generic/transpose/CMakeLists.txt diff --git a/dali/operators/detection/CMakeLists.txt b/dali/operators/generic/transpose/cutt/CMakeLists.txt similarity index 100% rename from dali/operators/detection/CMakeLists.txt rename to dali/operators/generic/transpose/cutt/CMakeLists.txt diff --git a/dali/operators/transpose/cutt/CudaMemcpy.cu b/dali/operators/generic/transpose/cutt/CudaMemcpy.cu similarity index 98% rename from dali/operators/transpose/cutt/CudaMemcpy.cu rename to dali/operators/generic/transpose/cutt/CudaMemcpy.cu index 5bf09d5b..5241e465 100644 --- a/dali/operators/transpose/cutt/CudaMemcpy.cu +++ b/dali/operators/generic/transpose/cutt/CudaMemcpy.cu @@ -36,9 +36,9 @@ SOFTWARE. // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/transpose/cutt/CudaMemcpy.h" +#include "dali/operators/generic/transpose/cutt/CudaMemcpy.h" -#include "dali/operators/transpose/cutt/CudaUtils.h" +#include "dali/operators/generic/transpose/cutt/CudaUtils.h" #include "dali/core/cuda_utils.h" #include "dali/core/dynlink_cuda.h" diff --git a/dali/operators/transpose/cutt/CudaMemcpy.h b/dali/operators/generic/transpose/cutt/CudaMemcpy.h similarity index 92% rename from dali/operators/transpose/cutt/CudaMemcpy.h rename to dali/operators/generic/transpose/cutt/CudaMemcpy.h index c3eb5706..02c37f33 100644 --- a/dali/operators/transpose/cutt/CudaMemcpy.h +++ b/dali/operators/generic/transpose/cutt/CudaMemcpy.h @@ -36,8 +36,8 @@ SOFTWARE. // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_TRANSPOSE_CUTT_CUDAMEMCPY_H -#define DALI_OPERATORS_TRANSPOSE_CUTT_CUDAMEMCPY_H +#ifndef DALI_OPERATORS_GENERIC_TRANSPOSE_CUTT_CUDAMEMCPY_H +#define DALI_OPERATORS_GENERIC_TRANSPOSE_CUTT_CUDAMEMCPY_H #include @@ -45,4 +45,4 @@ template void scalarCopy(const int n, const T* data_in, T* data_out template void vectorCopy(const int n, T* data_in, T* data_out, cudaStream_t stream); void memcpyFloat(const int n, float* data_in, float* data_out, cudaStream_t stream); -#endif // DALI_OPERATORS_TRANSPOSE_CUTT_CUDAMEMCPY_H +#endif // DALI_OPERATORS_GENERIC_TRANSPOSE_CUTT_CUDAMEMCPY_H diff --git a/dali/operators/transpose/cutt/CudaUtils.cu b/dali/operators/generic/transpose/cutt/CudaUtils.cu similarity index 98% rename from dali/operators/transpose/cutt/CudaUtils.cu rename to dali/operators/generic/transpose/cutt/CudaUtils.cu index a686f291..638a7172 100755 --- a/dali/operators/transpose/cutt/CudaUtils.cu +++ b/dali/operators/generic/transpose/cutt/CudaUtils.cu @@ -42,7 +42,7 @@ SOFTWARE. #include #endif -#include "dali/operators/transpose/cutt/CudaUtils.h" +#include "dali/operators/generic/transpose/cutt/CudaUtils.h" #include "dali/core/error_handling.h" diff --git a/dali/operators/transpose/cutt/CudaUtils.h b/dali/operators/generic/transpose/cutt/CudaUtils.h similarity index 96% rename from dali/operators/transpose/cutt/CudaUtils.h rename to dali/operators/generic/transpose/cutt/CudaUtils.h index 67a50695..7ad914f8 100755 --- a/dali/operators/transpose/cutt/CudaUtils.h +++ b/dali/operators/generic/transpose/cutt/CudaUtils.h @@ -36,8 +36,8 @@ SOFTWARE. // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_TRANSPOSE_CUTT_CUDAUTILS_H -#define DALI_OPERATORS_TRANSPOSE_CUTT_CUDAUTILS_H +#ifndef DALI_OPERATORS_GENERIC_TRANSPOSE_CUTT_CUDAUTILS_H +#define DALI_OPERATORS_GENERIC_TRANSPOSE_CUTT_CUDAUTILS_H #include #include @@ -133,4 +133,4 @@ void gpuRangeStart(const char *range_name); void gpuRangeStop(); #endif -#endif // DALI_OPERATORS_TRANSPOSE_CUTT_CUDAUTILS_H +#endif // DALI_OPERATORS_GENERIC_TRANSPOSE_CUTT_CUDAUTILS_H diff --git a/dali/operators/transpose/cutt/LRUCache.h b/dali/operators/generic/transpose/cutt/LRUCache.h similarity index 95% rename from dali/operators/transpose/cutt/LRUCache.h rename to dali/operators/generic/transpose/cutt/LRUCache.h index ba163d7e..5b1af9ae 100755 --- a/dali/operators/transpose/cutt/LRUCache.h +++ b/dali/operators/generic/transpose/cutt/LRUCache.h @@ -36,8 +36,8 @@ SOFTWARE. // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_TRANSPOSE_CUTT_INT_LRUCACHE_H -#define DALI_OPERATORS_TRANSPOSE_CUTT_INT_LRUCACHE_H +#ifndef DALI_OPERATORS_GENERIC_TRANSPOSE_CUTT_INT_LRUCACHE_H +#define DALI_OPERATORS_GENERIC_TRANSPOSE_CUTT_INT_LRUCACHE_H #include #include @@ -113,4 +113,4 @@ class LRUCache { } }; -#endif // DALI_OPERATORS_TRANSPOSE_CUTT_INT_LRUCACHE_H +#endif // DALI_OPERATORS_GENERIC_TRANSPOSE_CUTT_INT_LRUCACHE_H diff --git a/dali/operators/transpose/cutt/calls.h b/dali/operators/generic/transpose/cutt/calls.h similarity index 100% rename from dali/operators/transpose/cutt/calls.h rename to dali/operators/generic/transpose/cutt/calls.h diff --git a/dali/operators/transpose/cutt/cutt.cc b/dali/operators/generic/transpose/cutt/cutt.cc similarity index 97% rename from dali/operators/transpose/cutt/cutt.cc rename to dali/operators/generic/transpose/cutt/cutt.cc index ff99c657..a7e57961 100755 --- a/dali/operators/transpose/cutt/cutt.cc +++ b/dali/operators/generic/transpose/cutt/cutt.cc @@ -43,10 +43,10 @@ SOFTWARE. #include "dali/core/dynlink_cuda.h" #include "dali/core/error_handling.h" -#include "dali/operators/transpose/cutt/CudaUtils.h" -#include "dali/operators/transpose/cutt/cuttplan.h" -#include "dali/operators/transpose/cutt/cuttkernel.h" -#include "dali/operators/transpose/cutt/cutt.h" +#include "dali/operators/generic/transpose/cutt/CudaUtils.h" +#include "dali/operators/generic/transpose/cutt/cuttplan.h" +#include "dali/operators/generic/transpose/cutt/cuttkernel.h" +#include "dali/operators/generic/transpose/cutt/cutt.h" // Hash table to store the plans static std::unordered_map planStorage; diff --git a/dali/operators/transpose/cutt/cutt.h b/dali/operators/generic/transpose/cutt/cutt.h similarity index 96% rename from dali/operators/transpose/cutt/cutt.h rename to dali/operators/generic/transpose/cutt/cutt.h index b9df29e9..59f53b26 100644 --- a/dali/operators/transpose/cutt/cutt.h +++ b/dali/operators/generic/transpose/cutt/cutt.h @@ -36,8 +36,8 @@ SOFTWARE. // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_TRANSPOSE_CUTT_CUTT_H -#define DALI_OPERATORS_TRANSPOSE_CUTT_CUTT_H +#ifndef DALI_OPERATORS_GENERIC_TRANSPOSE_CUTT_CUTT_H +#define DALI_OPERATORS_GENERIC_TRANSPOSE_CUTT_CUTT_H #include @@ -114,4 +114,4 @@ cuttResult cuttDestroy(cuttHandle handle); // cuttResult cuttExecute(cuttHandle handle, const void* idata, void* odata); -#endif // DALI_OPERATORS_TRANSPOSE_CUTT_CUTT_H +#endif // DALI_OPERATORS_GENERIC_TRANSPOSE_CUTT_CUTT_H diff --git a/dali/operators/transpose/cutt/cuttGpuModel.cc b/dali/operators/generic/transpose/cutt/cuttGpuModel.cc similarity index 99% rename from dali/operators/transpose/cutt/cuttGpuModel.cc rename to dali/operators/generic/transpose/cutt/cuttGpuModel.cc index aec3eb93..92b5037f 100755 --- a/dali/operators/transpose/cutt/cuttGpuModel.cc +++ b/dali/operators/generic/transpose/cutt/cuttGpuModel.cc @@ -42,11 +42,11 @@ SOFTWARE. #include #include // memcpy -#include "dali/operators/transpose/cutt/cuttGpuModel.h" +#include "dali/operators/generic/transpose/cutt/cuttGpuModel.h" -#include "dali/operators/transpose/cutt/cuttGpuModelKernel.h" +#include "dali/operators/generic/transpose/cutt/cuttGpuModelKernel.h" #ifdef ENABLE_NVTOOLS -#include "dali/operators/transpose/cutt/CudaUtils.h" +#include "dali/operators/generic/transpose/cutt/CudaUtils.h" #endif // #define CALC_L1_CACHELINES diff --git a/dali/operators/transpose/cutt/cuttGpuModel.h b/dali/operators/generic/transpose/cutt/cuttGpuModel.h similarity index 92% rename from dali/operators/transpose/cutt/cuttGpuModel.h rename to dali/operators/generic/transpose/cutt/cuttGpuModel.h index b97f6691..303ee108 100755 --- a/dali/operators/transpose/cutt/cuttGpuModel.h +++ b/dali/operators/generic/transpose/cutt/cuttGpuModel.h @@ -36,13 +36,13 @@ SOFTWARE. // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_TRANSPOSE_CUTT_CUTTGPUMODEL_H -#define DALI_OPERATORS_TRANSPOSE_CUTT_CUTTGPUMODEL_H +#ifndef DALI_OPERATORS_GENERIC_TRANSPOSE_CUTT_CUTTGPUMODEL_H +#define DALI_OPERATORS_GENERIC_TRANSPOSE_CUTT_CUTTGPUMODEL_H #include -#include "dali/operators/transpose/cutt/cuttTypes.h" -#include "dali/operators/transpose/cutt/cuttplan.h" -#include "dali/operators/transpose/cutt/int_vector.h" +#include "dali/operators/generic/transpose/cutt/cuttTypes.h" +#include "dali/operators/generic/transpose/cutt/cuttplan.h" +#include "dali/operators/generic/transpose/cutt/int_vector.h" void computePos(const int vol0, const int vol1, const TensorConvInOut* conv, const int numConv, @@ -99,4 +99,4 @@ double cyclesTiled(const bool isCopy, const size_t sizeofType, cudaDeviceProp& p bool testCounters(const int warpSize, const int accWidth, const int cacheWidth); -#endif // DALI_OPERATORS_TRANSPOSE_CUTT_CUTTGPUMODEL_H +#endif // DALI_OPERATORS_GENERIC_TRANSPOSE_CUTT_CUTTGPUMODEL_H diff --git a/dali/operators/transpose/cutt/cuttGpuModelKernel.cu b/dali/operators/generic/transpose/cutt/cuttGpuModelKernel.cu similarity index 99% rename from dali/operators/transpose/cutt/cuttGpuModelKernel.cu rename to dali/operators/generic/transpose/cutt/cuttGpuModelKernel.cu index 149b4aa3..17ebd95a 100755 --- a/dali/operators/transpose/cutt/cuttGpuModelKernel.cu +++ b/dali/operators/generic/transpose/cutt/cuttGpuModelKernel.cu @@ -36,11 +36,11 @@ SOFTWARE. // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/transpose/cutt/cuttGpuModelKernel.h" +#include "dali/operators/generic/transpose/cutt/cuttGpuModelKernel.h" #include "dali/core/dynlink_cuda.h" #include "dali/core/cuda_utils.h" -#include "dali/operators/transpose/cutt/CudaUtils.h" +#include "dali/operators/generic/transpose/cutt/CudaUtils.h" #define RESTRICT //__restrict__ diff --git a/dali/operators/transpose/cutt/cuttGpuModelKernel.h b/dali/operators/generic/transpose/cutt/cuttGpuModelKernel.h similarity index 89% rename from dali/operators/transpose/cutt/cuttGpuModelKernel.h rename to dali/operators/generic/transpose/cutt/cuttGpuModelKernel.h index b9d540da..913a23fa 100644 --- a/dali/operators/transpose/cutt/cuttGpuModelKernel.h +++ b/dali/operators/generic/transpose/cutt/cuttGpuModelKernel.h @@ -36,9 +36,9 @@ SOFTWARE. // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_TRANSPOSE_CUTT_CUTTGPUMODELKERNEL_H -#define DALI_OPERATORS_TRANSPOSE_CUTT_CUTTGPUMODELKERNEL_H -#include "dali/operators/transpose/cutt/cuttplan.h" +#ifndef DALI_OPERATORS_GENERIC_TRANSPOSE_CUTT_CUTTGPUMODELKERNEL_H +#define DALI_OPERATORS_GENERIC_TRANSPOSE_CUTT_CUTTGPUMODELKERNEL_H +#include "dali/operators/generic/transpose/cutt/cuttplan.h" void runCounters(const int warpSize, const int* hostPosData, const int numPosData, const int accWidth, const int cacheWidth, int* host_tran, int* host_cl_full, int* host_cl_part); @@ -47,4 +47,4 @@ bool cuttGpuModelKernel(cuttPlan_t& plan, const int accWidth, const int cacheWid int& gld_tran, int& gst_tran, int& gld_req, int& gst_req, int& cl_full_l2, int& cl_part_l2, int& cl_full_l1, int& cl_part_l1); -#endif // DALI_OPERATORS_TRANSPOSE_CUTT_CUTTGPUMODELKERNEL_H +#endif // DALI_OPERATORS_GENERIC_TRANSPOSE_CUTT_CUTTGPUMODELKERNEL_H diff --git a/dali/operators/transpose/cutt/cuttTypes.h b/dali/operators/generic/transpose/cutt/cuttTypes.h similarity index 92% rename from dali/operators/transpose/cutt/cuttTypes.h rename to dali/operators/generic/transpose/cutt/cuttTypes.h index 77c877ad..27cc7374 100755 --- a/dali/operators/transpose/cutt/cuttTypes.h +++ b/dali/operators/generic/transpose/cutt/cuttTypes.h @@ -36,8 +36,8 @@ SOFTWARE. // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_TRANSPOSE_CUTT_CUTTTYPES_H -#define DALI_OPERATORS_TRANSPOSE_CUTT_CUTTTYPES_H +#ifndef DALI_OPERATORS_GENERIC_TRANSPOSE_CUTT_CUTTTYPES_H +#define DALI_OPERATORS_GENERIC_TRANSPOSE_CUTT_CUTTTYPES_H #define MAX_REG_STORAGE 8 @@ -56,4 +56,4 @@ struct TensorConvInOut { int ct_out; }; -#endif // DALI_OPERATORS_TRANSPOSE_CUTT_CUTTTYPES_H +#endif // DALI_OPERATORS_GENERIC_TRANSPOSE_CUTT_CUTTTYPES_H diff --git a/dali/operators/transpose/cutt/cuttkernel.cu b/dali/operators/generic/transpose/cutt/cuttkernel.cu similarity index 99% rename from dali/operators/transpose/cutt/cuttkernel.cu rename to dali/operators/generic/transpose/cutt/cuttkernel.cu index 37962dc6..ec6afd36 100755 --- a/dali/operators/transpose/cutt/cuttkernel.cu +++ b/dali/operators/generic/transpose/cutt/cuttkernel.cu @@ -36,15 +36,15 @@ SOFTWARE. // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/transpose/cutt/cuttkernel.h" +#include "dali/operators/generic/transpose/cutt/cuttkernel.h" #include #include "dali/core/dynlink_cuda.h" #include "dali/core/cuda_utils.h" -#include "dali/operators/transpose/cutt/CudaUtils.h" -#include "dali/operators/transpose/cutt/LRUCache.h" +#include "dali/operators/generic/transpose/cutt/CudaUtils.h" +#include "dali/operators/generic/transpose/cutt/LRUCache.h" #define RESTRICT __restrict__ diff --git a/dali/operators/transpose/cutt/cuttkernel.h b/dali/operators/generic/transpose/cutt/cuttkernel.h similarity index 90% rename from dali/operators/transpose/cutt/cuttkernel.h rename to dali/operators/generic/transpose/cutt/cuttkernel.h index 627518b2..66645da8 100755 --- a/dali/operators/transpose/cutt/cuttkernel.h +++ b/dali/operators/generic/transpose/cutt/cuttkernel.h @@ -36,10 +36,10 @@ SOFTWARE. // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_TRANSPOSE_CUTT_CUTTKERNEL_H -#define DALI_OPERATORS_TRANSPOSE_CUTT_CUTTKERNEL_H +#ifndef DALI_OPERATORS_GENERIC_TRANSPOSE_CUTT_CUTTKERNEL_H +#define DALI_OPERATORS_GENERIC_TRANSPOSE_CUTT_CUTTKERNEL_H -#include "dali/operators/transpose/cutt/cuttplan.h" +#include "dali/operators/generic/transpose/cutt/cuttplan.h" void cuttKernelSetSharedMemConfig(); @@ -48,4 +48,4 @@ int cuttKernelLaunchConfiguration(const int sizeofType, const TensorSplit& ts, bool cuttKernel(cuttPlan_t& plan, const void* dataIn, void* dataOut); -#endif // DALI_OPERATORS_TRANSPOSE_CUTT_CUTTKERNEL_H +#endif // DALI_OPERATORS_GENERIC_TRANSPOSE_CUTT_CUTTKERNEL_H diff --git a/dali/operators/transpose/cutt/cuttplan.cc b/dali/operators/generic/transpose/cutt/cuttplan.cc similarity index 99% rename from dali/operators/transpose/cutt/cuttplan.cc rename to dali/operators/generic/transpose/cutt/cuttplan.cc index 0f9b6a64..578c2345 100755 --- a/dali/operators/transpose/cutt/cuttplan.cc +++ b/dali/operators/generic/transpose/cutt/cuttplan.cc @@ -28,13 +28,13 @@ SOFTWARE. #include #include -#include "dali/operators/transpose/cutt/cuttplan.h" +#include "dali/operators/generic/transpose/cutt/cuttplan.h" #include "dali/core/error_handling.h" -#include "dali/operators/transpose/cutt/CudaUtils.h" -#include "dali/operators/transpose/cutt/cuttkernel.h" -#include "dali/operators/transpose/cutt/cuttGpuModel.h" -#include "dali/operators/transpose/cutt/cuttGpuModelKernel.h" +#include "dali/operators/generic/transpose/cutt/CudaUtils.h" +#include "dali/operators/generic/transpose/cutt/cuttkernel.h" +#include "dali/operators/generic/transpose/cutt/cuttGpuModel.h" +#include "dali/operators/generic/transpose/cutt/cuttGpuModelKernel.h" void printMethod(int method) { switch(method) { diff --git a/dali/operators/transpose/cutt/cuttplan.h b/dali/operators/generic/transpose/cutt/cuttplan.h similarity index 96% rename from dali/operators/transpose/cutt/cuttplan.h rename to dali/operators/generic/transpose/cutt/cuttplan.h index c3ddc2f6..dbbd0978 100755 --- a/dali/operators/transpose/cutt/cuttplan.h +++ b/dali/operators/generic/transpose/cutt/cuttplan.h @@ -36,15 +36,15 @@ SOFTWARE. // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_TRANSPOSE_CUTT_CUTTPLAN_H -#define DALI_OPERATORS_TRANSPOSE_CUTT_CUTTPLAN_H +#ifndef DALI_OPERATORS_GENERIC_TRANSPOSE_CUTT_CUTTPLAN_H +#define DALI_OPERATORS_GENERIC_TRANSPOSE_CUTT_CUTTPLAN_H #include #include #include #include "dali/core/dynlink_cuda.h" -#include "dali/operators/transpose/cutt/cuttTypes.h" +#include "dali/operators/generic/transpose/cutt/cuttTypes.h" const int TILEDIM = 32; const int TILEROWS = 8; @@ -234,4 +234,4 @@ void reduceRanks(const int rank, const int* dim, const int* permutation, std::list::iterator choosePlanHeuristic(std::list& plans); -#endif // DALI_OPERATORS_TRANSPOSE_CUTT_CUTTPLAN_H +#endif // DALI_OPERATORS_GENERIC_TRANSPOSE_CUTT_CUTTPLAN_H diff --git a/dali/operators/transpose/cutt/int_vector.h b/dali/operators/generic/transpose/cutt/int_vector.h similarity index 98% rename from dali/operators/transpose/cutt/int_vector.h rename to dali/operators/generic/transpose/cutt/int_vector.h index 0723b81b..6e8eb4a1 100755 --- a/dali/operators/transpose/cutt/int_vector.h +++ b/dali/operators/generic/transpose/cutt/int_vector.h @@ -36,8 +36,8 @@ SOFTWARE. // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_TRANSPOSE_CUTT_INT_VECTOR_H -#define DALI_OPERATORS_TRANSPOSE_CUTT_INT_VECTOR_H +#ifndef DALI_OPERATORS_GENERIC_TRANSPOSE_CUTT_INT_VECTOR_H +#define DALI_OPERATORS_GENERIC_TRANSPOSE_CUTT_INT_VECTOR_H // Intel: Minimum SSE2 required for vectorization. // SSE can't be used because it does not support integer operations. SSE defaults to scalar @@ -370,4 +370,4 @@ class int_vector { #undef pixel #endif -#endif // DALI_OPERATORS_TRANSPOSE_CUTT_INT_VECTOR_H +#endif // DALI_OPERATORS_GENERIC_TRANSPOSE_CUTT_INT_VECTOR_H diff --git a/dali/operators/transpose/transpose.cc b/dali/operators/generic/transpose/transpose.cc similarity index 95% rename from dali/operators/transpose/transpose.cc rename to dali/operators/generic/transpose/transpose.cc index f198d40f..2fc127cf 100644 --- a/dali/operators/transpose/transpose.cc +++ b/dali/operators/generic/transpose/transpose.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/transpose/transpose.h" +#include "dali/operators/generic/transpose/transpose.h" namespace dali { diff --git a/dali/operators/transpose/transpose.cu b/dali/operators/generic/transpose/transpose.cu similarity index 99% rename from dali/operators/transpose/transpose.cu rename to dali/operators/generic/transpose/transpose.cu index 89b3b32a..2120a505 100644 --- a/dali/operators/transpose/transpose.cu +++ b/dali/operators/generic/transpose/transpose.cu @@ -18,7 +18,7 @@ #include #include -#include "dali/operators/transpose/transpose.h" +#include "dali/operators/generic/transpose/transpose.h" #include "dali/core/error_handling.h" #include "dali/core/static_switch.h" diff --git a/dali/operators/transpose/transpose.h b/dali/operators/generic/transpose/transpose.h similarity index 93% rename from dali/operators/transpose/transpose.h rename to dali/operators/generic/transpose/transpose.h index f70fc54f..021dd3a5 100644 --- a/dali/operators/transpose/transpose.h +++ b/dali/operators/generic/transpose/transpose.h @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_TRANSPOSE_TRANSPOSE_H_ -#define DALI_OPERATORS_TRANSPOSE_TRANSPOSE_H_ +#ifndef DALI_OPERATORS_GENERIC_TRANSPOSE_TRANSPOSE_H_ +#define DALI_OPERATORS_GENERIC_TRANSPOSE_TRANSPOSE_H_ #include #include #include #include "dali/pipeline/operator/operator.h" -#include "dali/operators/transpose/cutt/cutt.h" +#include "dali/operators/generic/transpose/cutt/cutt.h" namespace dali { @@ -106,4 +106,4 @@ class Transpose : public Operator { } // namespace dali -#endif // DALI_OPERATORS_TRANSPOSE_TRANSPOSE_H_ +#endif // DALI_OPERATORS_GENERIC_TRANSPOSE_TRANSPOSE_H_ diff --git a/dali/operators/transpose/transpose_test.cc b/dali/operators/generic/transpose/transpose_test.cc similarity index 99% rename from dali/operators/transpose/transpose_test.cc rename to dali/operators/generic/transpose/transpose_test.cc index 5d155158..df433311 100644 --- a/dali/operators/transpose/transpose_test.cc +++ b/dali/operators/generic/transpose/transpose_test.cc @@ -19,7 +19,7 @@ #include "dali/test/dali_operator_test.h" #include "dali/test/dali_operator_test_utils.h" -#include "dali/operators/transpose/transpose.h" +#include "dali/operators/generic/transpose/transpose.h" namespace dali { diff --git a/dali/operators/image/CMakeLists.txt b/dali/operators/image/CMakeLists.txt new file mode 100644 index 00000000..79a6a821 --- /dev/null +++ b/dali/operators/image/CMakeLists.txt @@ -0,0 +1,25 @@ +# Copyright (c) 2017-2020, NVIDIA CORPORATION. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Get all the source files and dump test files + +add_subdirectory(color) +add_subdirectory(crop) +add_subdirectory(resize) +add_subdirectory(paste) +add_subdirectory(remap) + +collect_headers(DALI_INST_HDRS PARENT_SCOPE) +collect_sources(DALI_OPERATOR_SRCS PARENT_SCOPE) +collect_test_sources(DALI_OPERATOR_TEST_SRCS PARENT_SCOPE) diff --git a/dali/operators/displacement/CMakeLists.txt b/dali/operators/image/color/CMakeLists.txt similarity index 100% rename from dali/operators/displacement/CMakeLists.txt rename to dali/operators/image/color/CMakeLists.txt diff --git a/dali/operators/color/brightness_contrast.cc b/dali/operators/image/color/brightness_contrast.cc similarity index 98% rename from dali/operators/color/brightness_contrast.cc rename to dali/operators/image/color/brightness_contrast.cc index 1d0a2e13..1bc612c2 100644 --- a/dali/operators/color/brightness_contrast.cc +++ b/dali/operators/image/color/brightness_contrast.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/color/brightness_contrast.h" +#include "dali/operators/image/color/brightness_contrast.h" #include "dali/kernels/imgproc/pointwise/multiply_add.h" namespace dali { diff --git a/dali/operators/color/brightness_contrast.cu b/dali/operators/image/color/brightness_contrast.cu similarity index 98% rename from dali/operators/color/brightness_contrast.cu rename to dali/operators/image/color/brightness_contrast.cu index 233dc465..82ddf74b 100644 --- a/dali/operators/color/brightness_contrast.cu +++ b/dali/operators/image/color/brightness_contrast.cu @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/color/brightness_contrast.h" +#include "dali/operators/image/color/brightness_contrast.h" #include #include "dali/kernels/imgproc/pointwise/multiply_add_gpu.h" diff --git a/dali/operators/color/brightness_contrast.h b/dali/operators/image/color/brightness_contrast.h similarity index 97% rename from dali/operators/color/brightness_contrast.h rename to dali/operators/image/color/brightness_contrast.h index fc16093f..11407a2c 100644 --- a/dali/operators/color/brightness_contrast.h +++ b/dali/operators/image/color/brightness_contrast.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_COLOR_BRIGHTNESS_CONTRAST_H_ -#define DALI_OPERATORS_COLOR_BRIGHTNESS_CONTRAST_H_ +#ifndef DALI_OPERATORS_IMAGE_COLOR_BRIGHTNESS_CONTRAST_H_ +#define DALI_OPERATORS_IMAGE_COLOR_BRIGHTNESS_CONTRAST_H_ #include #include @@ -179,4 +179,4 @@ class BrightnessContrastGpu : public BrightnessContrastOp { } // namespace dali -#endif // DALI_OPERATORS_COLOR_BRIGHTNESS_CONTRAST_H_ +#endif // DALI_OPERATORS_IMAGE_COLOR_BRIGHTNESS_CONTRAST_H_ diff --git a/dali/operators/color/brightness_contrast_test.cu b/dali/operators/image/color/brightness_contrast_test.cu similarity index 98% rename from dali/operators/color/brightness_contrast_test.cu rename to dali/operators/image/color/brightness_contrast_test.cu index 8d6a324a..a1ed8661 100644 --- a/dali/operators/color/brightness_contrast_test.cu +++ b/dali/operators/image/color/brightness_contrast_test.cu @@ -19,7 +19,7 @@ #include "dali/test/dali_operator_test_utils.h" #include "dali/test/tensor_test_utils.h" #include "dali/core/convert.h" -#include "dali/operators/color/brightness_contrast.h" +#include "dali/operators/image/color/brightness_contrast.h" namespace dali { diff --git a/dali/operators/color_space/color_space_conversion.cc b/dali/operators/image/color/color_space_conversion.cc similarity index 97% rename from dali/operators/color_space/color_space_conversion.cc rename to dali/operators/image/color/color_space_conversion.cc index c7a2afaa..334f3389 100644 --- a/dali/operators/color_space/color_space_conversion.cc +++ b/dali/operators/image/color/color_space_conversion.cc @@ -13,7 +13,7 @@ // limitations under the License. #include -#include "dali/operators/color_space/color_space_conversion.h" +#include "dali/operators/image/color/color_space_conversion.h" #include "dali/util/ocv.h" namespace dali { diff --git a/dali/operators/color_space/color_space_conversion.cu b/dali/operators/image/color/color_space_conversion.cu similarity index 99% rename from dali/operators/color_space/color_space_conversion.cu rename to dali/operators/image/color/color_space_conversion.cu index a2974228..bddaa3f7 100644 --- a/dali/operators/color_space/color_space_conversion.cu +++ b/dali/operators/image/color/color_space_conversion.cu @@ -15,7 +15,7 @@ #include #include #include -#include "dali/operators/color_space/color_space_conversion.h" +#include "dali/operators/image/color/color_space_conversion.h" #include "dali/util/npp.h" namespace dali { diff --git a/dali/operators/color_space/color_space_conversion.h b/dali/operators/image/color/color_space_conversion.h similarity index 88% rename from dali/operators/color_space/color_space_conversion.h rename to dali/operators/image/color/color_space_conversion.h index 64ee0158..828e0451 100644 --- a/dali/operators/color_space/color_space_conversion.h +++ b/dali/operators/image/color/color_space_conversion.h @@ -13,8 +13,8 @@ // limitations under the License. -#ifndef DALI_OPERATORS_COLOR_SPACE_COLOR_SPACE_CONVERSION_H_ -#define DALI_OPERATORS_COLOR_SPACE_COLOR_SPACE_CONVERSION_H_ +#ifndef DALI_OPERATORS_IMAGE_COLOR_COLOR_SPACE_CONVERSION_H_ +#define DALI_OPERATORS_IMAGE_COLOR_COLOR_SPACE_CONVERSION_H_ #include @@ -47,4 +47,4 @@ class ColorSpaceConversion : public Operator { } // namespace dali -#endif // DALI_OPERATORS_COLOR_SPACE_COLOR_SPACE_CONVERSION_H_ +#endif // DALI_OPERATORS_IMAGE_COLOR_COLOR_SPACE_CONVERSION_H_ diff --git a/dali/operators/color_space/color_space_conversion_test.cc b/dali/operators/image/color/color_space_conversion_test.cc similarity index 100% rename from dali/operators/color_space/color_space_conversion_test.cc rename to dali/operators/image/color/color_space_conversion_test.cc diff --git a/dali/operators/color/color_test.cc b/dali/operators/image/color/color_test.cc similarity index 100% rename from dali/operators/color/color_test.cc rename to dali/operators/image/color/color_test.cc diff --git a/dali/operators/color/color_twist.cc b/dali/operators/image/color/color_twist.cc similarity index 98% rename from dali/operators/color/color_twist.cc rename to dali/operators/image/color/color_twist.cc index 872f1a2f..f2f48d3c 100644 --- a/dali/operators/color/color_twist.cc +++ b/dali/operators/image/color/color_twist.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/color/color_twist.h" +#include "dali/operators/image/color/color_twist.h" #include "dali/image/transform.h" namespace dali { diff --git a/dali/operators/color/color_twist.cu b/dali/operators/image/color/color_twist.cu similarity index 98% rename from dali/operators/color/color_twist.cu rename to dali/operators/image/color/color_twist.cu index ce49ea27..16e6fa8e 100644 --- a/dali/operators/color/color_twist.cu +++ b/dali/operators/image/color/color_twist.cu @@ -14,7 +14,7 @@ #include "dali/util/npp.h" -#include "dali/operators/color/color_twist.h" +#include "dali/operators/image/color/color_twist.h" namespace dali { diff --git a/dali/operators/color/color_twist.h b/dali/operators/image/color/color_twist.h similarity index 98% rename from dali/operators/color/color_twist.h rename to dali/operators/image/color/color_twist.h index 500797e2..4ddf6935 100644 --- a/dali/operators/color/color_twist.h +++ b/dali/operators/image/color/color_twist.h @@ -13,8 +13,8 @@ // limitations under the License. -#ifndef DALI_OPERATORS_COLOR_COLOR_TWIST_H_ -#define DALI_OPERATORS_COLOR_COLOR_TWIST_H_ +#ifndef DALI_OPERATORS_IMAGE_COLOR_COLOR_TWIST_H_ +#define DALI_OPERATORS_IMAGE_COLOR_COLOR_TWIST_H_ #include #include @@ -262,4 +262,4 @@ class ColorTwistAdjust : public ColorTwistBase { } // namespace dali -#endif // DALI_OPERATORS_COLOR_COLOR_TWIST_H_ +#endif // DALI_OPERATORS_IMAGE_COLOR_COLOR_TWIST_H_ diff --git a/dali/operators/color/hsv.cc b/dali/operators/image/color/hsv.cc similarity index 98% rename from dali/operators/color/hsv.cc rename to dali/operators/image/color/hsv.cc index 2a22f7b8..d595c95d 100644 --- a/dali/operators/color/hsv.cc +++ b/dali/operators/image/color/hsv.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/color/hsv.h" +#include "dali/operators/image/color/hsv.h" #include "dali/kernels/imgproc/pointwise/linear_transformation_cpu.h" namespace dali { diff --git a/dali/operators/color/hsv.cu b/dali/operators/image/color/hsv.cu similarity index 98% rename from dali/operators/color/hsv.cu rename to dali/operators/image/color/hsv.cu index b7867748..8e46074a 100644 --- a/dali/operators/color/hsv.cu +++ b/dali/operators/image/color/hsv.cu @@ -13,7 +13,7 @@ // limitations under the License. #include -#include "dali/operators/color/hsv.h" +#include "dali/operators/image/color/hsv.h" #include "dali/kernels/imgproc/pointwise/linear_transformation_gpu.h" namespace dali { diff --git a/dali/operators/color/hsv.h b/dali/operators/image/color/hsv.h similarity index 98% rename from dali/operators/color/hsv.h rename to dali/operators/image/color/hsv.h index bba0022e..30663b7a 100644 --- a/dali/operators/color/hsv.h +++ b/dali/operators/image/color/hsv.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_COLOR_HSV_H_ -#define DALI_OPERATORS_COLOR_HSV_H_ +#ifndef DALI_OPERATORS_IMAGE_COLOR_HSV_H_ +#define DALI_OPERATORS_IMAGE_COLOR_HSV_H_ #include #include @@ -224,4 +224,4 @@ class HsvGpu : public HsvOp { } // namespace dali -#endif // DALI_OPERATORS_COLOR_HSV_H_ +#endif // DALI_OPERATORS_IMAGE_COLOR_HSV_H_ diff --git a/dali/operators/fused/CMakeLists.txt b/dali/operators/image/crop/CMakeLists.txt similarity index 100% rename from dali/operators/fused/CMakeLists.txt rename to dali/operators/image/crop/CMakeLists.txt diff --git a/dali/operators/crop/bbox_crop.cc b/dali/operators/image/crop/bbox_crop.cc similarity index 99% rename from dali/operators/crop/bbox_crop.cc rename to dali/operators/image/crop/bbox_crop.cc index 108aab6f..7c64fd57 100644 --- a/dali/operators/crop/bbox_crop.cc +++ b/dali/operators/image/crop/bbox_crop.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/crop/bbox_crop.h" +#include "dali/operators/image/crop/bbox_crop.h" namespace dali { diff --git a/dali/operators/crop/bbox_crop.h b/dali/operators/image/crop/bbox_crop.h similarity index 98% rename from dali/operators/crop/bbox_crop.h rename to dali/operators/image/crop/bbox_crop.h index 96a39c86..557a0e69 100644 --- a/dali/operators/crop/bbox_crop.h +++ b/dali/operators/image/crop/bbox_crop.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_CROP_BBOX_CROP_H_ -#define DALI_OPERATORS_CROP_BBOX_CROP_H_ +#ifndef DALI_OPERATORS_IMAGE_CROP_BBOX_CROP_H_ +#define DALI_OPERATORS_IMAGE_CROP_BBOX_CROP_H_ #include #include @@ -236,4 +236,4 @@ class RandomBBoxCrop : public Operator { } // namespace dali -#endif // DALI_OPERATORS_CROP_BBOX_CROP_H_ +#endif // DALI_OPERATORS_IMAGE_CROP_BBOX_CROP_H_ diff --git a/dali/operators/crop/bbox_crop_test.cc b/dali/operators/image/crop/bbox_crop_test.cc similarity index 100% rename from dali/operators/crop/bbox_crop_test.cc rename to dali/operators/image/crop/bbox_crop_test.cc diff --git a/dali/operators/crop/crop.cc b/dali/operators/image/crop/crop.cc similarity index 97% rename from dali/operators/crop/crop.cc rename to dali/operators/image/crop/crop.cc index c16339d7..a7bdbe45 100644 --- a/dali/operators/crop/crop.cc +++ b/dali/operators/image/crop/crop.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/crop/crop.h" +#include "dali/operators/image/crop/crop.h" #include #include #include "dali/core/static_switch.h" diff --git a/dali/operators/crop/crop.cu b/dali/operators/image/crop/crop.cu similarity index 97% rename from dali/operators/crop/crop.cu rename to dali/operators/image/crop/crop.cu index 380ae95f..67c8b762 100644 --- a/dali/operators/crop/crop.cu +++ b/dali/operators/image/crop/crop.cu @@ -16,7 +16,7 @@ #include "dali/image/transform.h" #include "dali/kernels/slice/slice_gpu.cuh" #include "dali/core/static_switch.h" -#include "dali/operators/crop/crop.h" +#include "dali/operators/image/crop/crop.h" #include "dali/pipeline/data/views.h" namespace dali { diff --git a/dali/operators/crop/crop.h b/dali/operators/image/crop/crop.h similarity index 94% rename from dali/operators/crop/crop.h rename to dali/operators/image/crop/crop.h index 0d8dde56..146cbfff 100644 --- a/dali/operators/crop/crop.h +++ b/dali/operators/image/crop/crop.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_CROP_CROP_H_ -#define DALI_OPERATORS_CROP_CROP_H_ +#ifndef DALI_OPERATORS_IMAGE_CROP_CROP_H_ +#define DALI_OPERATORS_IMAGE_CROP_CROP_H_ #include #include @@ -22,8 +22,8 @@ #include "dali/core/error_handling.h" #include "dali/core/tensor_shape.h" #include "dali/kernels/scratch.h" -#include "dali/operators/crop/crop_attr.h" -#include "dali/operators/crop/slice_base.h" +#include "dali/operators/image/crop/crop_attr.h" +#include "dali/operators/generic/slice/slice_base.h" #include "dali/pipeline/operator/common.h" #include "dali/pipeline/operator/operator.h" @@ -123,4 +123,4 @@ class Crop : public SliceBase, protected CropAttr { } // namespace dali -#endif // DALI_OPERATORS_CROP_CROP_H_ +#endif // DALI_OPERATORS_IMAGE_CROP_CROP_H_ diff --git a/dali/operators/crop/crop_attr.cc b/dali/operators/image/crop/crop_attr.cc similarity index 98% rename from dali/operators/crop/crop_attr.cc rename to dali/operators/image/crop/crop_attr.cc index 583a7496..39753106 100644 --- a/dali/operators/crop/crop_attr.cc +++ b/dali/operators/image/crop/crop_attr.cc @@ -13,7 +13,7 @@ // limitations under the License. #include -#include "dali/operators/crop/crop_attr.h" +#include "dali/operators/image/crop/crop_attr.h" namespace dali { diff --git a/dali/operators/crop/crop_attr.h b/dali/operators/image/crop/crop_attr.h similarity index 98% rename from dali/operators/crop/crop_attr.h rename to dali/operators/image/crop/crop_attr.h index 5486f98d..92d1880a 100644 --- a/dali/operators/crop/crop_attr.h +++ b/dali/operators/image/crop/crop_attr.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_CROP_CROP_ATTR_H_ -#define DALI_OPERATORS_CROP_CROP_ATTR_H_ +#ifndef DALI_OPERATORS_IMAGE_CROP_CROP_ATTR_H_ +#define DALI_OPERATORS_IMAGE_CROP_CROP_ATTR_H_ #include #include @@ -194,4 +194,4 @@ class CropAttr { } // namespace dali -#endif // DALI_OPERATORS_CROP_CROP_ATTR_H_ +#endif // DALI_OPERATORS_IMAGE_CROP_CROP_ATTR_H_ diff --git a/dali/operators/fused/crop_mirror_normalize.cc b/dali/operators/image/crop/crop_mirror_normalize.cc similarity index 98% rename from dali/operators/fused/crop_mirror_normalize.cc rename to dali/operators/image/crop/crop_mirror_normalize.cc index d707d10b..c259b7f0 100644 --- a/dali/operators/fused/crop_mirror_normalize.cc +++ b/dali/operators/image/crop/crop_mirror_normalize.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/fused/crop_mirror_normalize.h" +#include "dali/operators/image/crop/crop_mirror_normalize.h" #include "dali/kernels/slice/slice_flip_normalize_permute_pad_cpu.h" #include "dali/util/half.hpp" #include "dali/core/static_switch.h" diff --git a/dali/operators/fused/crop_mirror_normalize.cu b/dali/operators/image/crop/crop_mirror_normalize.cu similarity index 98% rename from dali/operators/fused/crop_mirror_normalize.cu rename to dali/operators/image/crop/crop_mirror_normalize.cu index 9df6195f..c37f4cff 100644 --- a/dali/operators/fused/crop_mirror_normalize.cu +++ b/dali/operators/image/crop/crop_mirror_normalize.cu @@ -14,7 +14,7 @@ #include #include -#include "dali/operators/fused/crop_mirror_normalize.h" +#include "dali/operators/image/crop/crop_mirror_normalize.h" #include "dali/kernels/slice/slice_flip_normalize_permute_pad_gpu.h" #include "dali/core/static_switch.h" #include "dali/pipeline/data/views.h" diff --git a/dali/operators/fused/crop_mirror_normalize.h b/dali/operators/image/crop/crop_mirror_normalize.h similarity index 97% rename from dali/operators/fused/crop_mirror_normalize.h rename to dali/operators/image/crop/crop_mirror_normalize.h index f856f599..0cfade1a 100755 --- a/dali/operators/fused/crop_mirror_normalize.h +++ b/dali/operators/image/crop/crop_mirror_normalize.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_FUSED_CROP_MIRROR_NORMALIZE_H_ -#define DALI_OPERATORS_FUSED_CROP_MIRROR_NORMALIZE_H_ +#ifndef DALI_OPERATORS_IMAGE_CROP_CROP_MIRROR_NORMALIZE_H_ +#define DALI_OPERATORS_IMAGE_CROP_CROP_MIRROR_NORMALIZE_H_ #include #include @@ -27,7 +27,7 @@ #include "dali/kernels/scratch.h" #include "dali/kernels/slice/slice_flip_normalize_permute_pad_common.h" #include "dali/pipeline/operator/common.h" -#include "dali/operators/crop/crop_attr.h" +#include "dali/operators/image/crop/crop_attr.h" #include "dali/pipeline/operator/operator.h" #define CMN_IN_TYPES (uint8_t, int16_t, uint16_t, int32_t, float, float16) @@ -273,4 +273,4 @@ class CropMirrorNormalize : public Operator, protected CropAttr { } // namespace dali -#endif // DALI_OPERATORS_FUSED_CROP_MIRROR_NORMALIZE_H_ +#endif // DALI_OPERATORS_IMAGE_CROP_CROP_MIRROR_NORMALIZE_H_ diff --git a/dali/operators/fused/crop_mirror_normalize_test.cc b/dali/operators/image/crop/crop_mirror_normalize_test.cc similarity index 100% rename from dali/operators/fused/crop_mirror_normalize_test.cc rename to dali/operators/image/crop/crop_mirror_normalize_test.cc diff --git a/dali/operators/crop/crop_sequence_test.cc b/dali/operators/image/crop/crop_sequence_test.cc similarity index 100% rename from dali/operators/crop/crop_sequence_test.cc rename to dali/operators/image/crop/crop_sequence_test.cc diff --git a/dali/operators/crop/crop_test.cc b/dali/operators/image/crop/crop_test.cc similarity index 100% rename from dali/operators/crop/crop_test.cc rename to dali/operators/image/crop/crop_test.cc diff --git a/dali/operators/crop/random_crop_attr.cc b/dali/operators/image/crop/random_crop_attr.cc similarity index 95% rename from dali/operators/crop/random_crop_attr.cc rename to dali/operators/image/crop/random_crop_attr.cc index ede6c5de..95575ce8 100644 --- a/dali/operators/crop/random_crop_attr.cc +++ b/dali/operators/image/crop/random_crop_attr.cc @@ -13,7 +13,7 @@ // limitations under the License. #include -#include "dali/operators/crop/random_crop_attr.h" +#include "dali/operators/image/crop/random_crop_attr.h" namespace dali { diff --git a/dali/operators/crop/random_crop_attr.h b/dali/operators/image/crop/random_crop_attr.h similarity index 93% rename from dali/operators/crop/random_crop_attr.h rename to dali/operators/image/crop/random_crop_attr.h index d0d36fe6..61d43e92 100644 --- a/dali/operators/crop/random_crop_attr.h +++ b/dali/operators/image/crop/random_crop_attr.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_CROP_RANDOM_CROP_ATTR_H_ -#define DALI_OPERATORS_CROP_RANDOM_CROP_ATTR_H_ +#ifndef DALI_OPERATORS_IMAGE_CROP_RANDOM_CROP_ATTR_H_ +#define DALI_OPERATORS_IMAGE_CROP_RANDOM_CROP_ATTR_H_ #include #include @@ -75,4 +75,4 @@ class RandomCropAttr { } // namespace dali -#endif // DALI_OPERATORS_CROP_RANDOM_CROP_ATTR_H_ +#endif // DALI_OPERATORS_IMAGE_CROP_RANDOM_CROP_ATTR_H_ diff --git a/dali/operators/geometric/CMakeLists.txt b/dali/operators/image/paste/CMakeLists.txt similarity index 100% rename from dali/operators/geometric/CMakeLists.txt rename to dali/operators/image/paste/CMakeLists.txt diff --git a/dali/operators/paste/paste.cc b/dali/operators/image/paste/paste.cc similarity index 97% rename from dali/operators/paste/paste.cc rename to dali/operators/image/paste/paste.cc index 7ba71a86..fd7737d0 100644 --- a/dali/operators/paste/paste.cc +++ b/dali/operators/image/paste/paste.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/paste/paste.h" +#include "dali/operators/image/paste/paste.h" namespace dali { diff --git a/dali/operators/paste/paste.cu b/dali/operators/image/paste/paste.cu similarity index 99% rename from dali/operators/paste/paste.cu rename to dali/operators/image/paste/paste.cu index 0b927c3c..8f8bc7c6 100644 --- a/dali/operators/paste/paste.cu +++ b/dali/operators/image/paste/paste.cu @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/paste/paste.h" +#include "dali/operators/image/paste/paste.h" #include #include diff --git a/dali/operators/paste/paste.h b/dali/operators/image/paste/paste.h similarity index 94% rename from dali/operators/paste/paste.h rename to dali/operators/image/paste/paste.h index 0d5f1159..a55ee09b 100644 --- a/dali/operators/paste/paste.h +++ b/dali/operators/image/paste/paste.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_PASTE_PASTE_H_ -#define DALI_OPERATORS_PASTE_PASTE_H_ +#ifndef DALI_OPERATORS_IMAGE_PASTE_PASTE_H_ +#define DALI_OPERATORS_IMAGE_PASTE_PASTE_H_ #include #include @@ -78,4 +78,4 @@ class Paste : public Operator { } // namespace dali -#endif // DALI_OPERATORS_PASTE_PASTE_H_ +#endif // DALI_OPERATORS_IMAGE_PASTE_PASTE_H_ diff --git a/dali/operators/paste/CMakeLists.txt b/dali/operators/image/remap/CMakeLists.txt similarity index 100% rename from dali/operators/paste/CMakeLists.txt rename to dali/operators/image/remap/CMakeLists.txt diff --git a/dali/operators/displacement/displacement_filter.cc b/dali/operators/image/remap/displacement_filter.cc similarity index 94% rename from dali/operators/displacement/displacement_filter.cc rename to dali/operators/image/remap/displacement_filter.cc index d98d2e83..89b1fc25 100644 --- a/dali/operators/displacement/displacement_filter.cc +++ b/dali/operators/image/remap/displacement_filter.cc @@ -13,7 +13,7 @@ // limitations under the License. -#include "dali/operators/displacement/displacement_filter.h" +#include "dali/operators/image/remap/displacement_filter.h" namespace dali { diff --git a/dali/operators/displacement/displacement_filter.h b/dali/operators/image/remap/displacement_filter.h similarity index 89% rename from dali/operators/displacement/displacement_filter.h rename to dali/operators/image/remap/displacement_filter.h index 091f4ca6..235234f7 100644 --- a/dali/operators/displacement/displacement_filter.h +++ b/dali/operators/image/remap/displacement_filter.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_DISPLACEMENT_DISPLACEMENT_FILTER_H_ -#define DALI_OPERATORS_DISPLACEMENT_DISPLACEMENT_FILTER_H_ +#ifndef DALI_OPERATORS_IMAGE_REMAP_DISPLACEMENT_FILTER_H_ +#define DALI_OPERATORS_IMAGE_REMAP_DISPLACEMENT_FILTER_H_ #include "dali/core/common.h" #include "dali/core/geom/vec.h" @@ -53,4 +53,4 @@ class DisplacementFilter : public Operator {}; } // namespace dali -#endif // DALI_OPERATORS_DISPLACEMENT_DISPLACEMENT_FILTER_H_ +#endif // DALI_OPERATORS_IMAGE_REMAP_DISPLACEMENT_FILTER_H_ diff --git a/dali/operators/displacement/displacement_filter_impl_cpu.h b/dali/operators/image/remap/displacement_filter_impl_cpu.h similarity index 95% rename from dali/operators/displacement/displacement_filter_impl_cpu.h rename to dali/operators/image/remap/displacement_filter_impl_cpu.h index 19a3b699..4a1fe6a4 100644 --- a/dali/operators/displacement/displacement_filter_impl_cpu.h +++ b/dali/operators/image/remap/displacement_filter_impl_cpu.h @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_DISPLACEMENT_DISPLACEMENT_FILTER_IMPL_CPU_H_ -#define DALI_OPERATORS_DISPLACEMENT_DISPLACEMENT_FILTER_IMPL_CPU_H_ +#ifndef DALI_OPERATORS_IMAGE_REMAP_DISPLACEMENT_FILTER_IMPL_CPU_H_ +#define DALI_OPERATORS_IMAGE_REMAP_DISPLACEMENT_FILTER_IMPL_CPU_H_ #include #include #include #include "dali/core/common.h" -#include "dali/operators/displacement/displacement_filter.h" +#include "dali/operators/image/remap/displacement_filter.h" #include "dali/pipeline/data/views.h" #include "dali/kernels/kernel_params.h" #include "dali/kernels/imgproc/sampler.h" @@ -189,4 +189,4 @@ class DisplacementFilter } // namespace dali -#endif // DALI_OPERATORS_DISPLACEMENT_DISPLACEMENT_FILTER_IMPL_CPU_H_ +#endif // DALI_OPERATORS_IMAGE_REMAP_DISPLACEMENT_FILTER_IMPL_CPU_H_ diff --git a/dali/operators/displacement/displacement_filter_impl_gpu.cuh b/dali/operators/image/remap/displacement_filter_impl_gpu.cuh similarity index 98% rename from dali/operators/displacement/displacement_filter_impl_gpu.cuh rename to dali/operators/image/remap/displacement_filter_impl_gpu.cuh index 5ec8c082..41554506 100644 --- a/dali/operators/displacement/displacement_filter_impl_gpu.cuh +++ b/dali/operators/image/remap/displacement_filter_impl_gpu.cuh @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_DISPLACEMENT_DISPLACEMENT_FILTER_IMPL_GPU_CUH_ -#define DALI_OPERATORS_DISPLACEMENT_DISPLACEMENT_FILTER_IMPL_GPU_CUH_ +#ifndef DALI_OPERATORS_IMAGE_REMAP_DISPLACEMENT_FILTER_IMPL_GPU_CUH_ +#define DALI_OPERATORS_IMAGE_REMAP_DISPLACEMENT_FILTER_IMPL_GPU_CUH_ #include #include "dali/core/common.h" #include "dali/kernels/imgproc/sampler.h" -#include "dali/operators/displacement/displacement_filter.h" +#include "dali/operators/image/remap/displacement_filter.h" namespace dali { @@ -412,4 +412,4 @@ class DisplacementFilter #include #include "dali/core/host_dev.h" #include "dali/pipeline/operator/operator.h" -#include "dali/operators/displacement/displacement_filter.h" +#include "dali/operators/image/remap/displacement_filter.h" #include "dali/operators/util/randomizer.h" namespace dali { @@ -71,4 +71,4 @@ class Jitter : public DisplacementFilter> { } // namespace dali -#endif // DALI_OPERATORS_DISPLACEMENT_JITTER_H_ +#endif // DALI_OPERATORS_IMAGE_REMAP_JITTER_H_ diff --git a/dali/operators/displacement/rotate.cc b/dali/operators/image/remap/rotate.cc similarity index 97% rename from dali/operators/displacement/rotate.cc rename to dali/operators/image/remap/rotate.cc index 92b2af89..9e5ed715 100644 --- a/dali/operators/displacement/rotate.cc +++ b/dali/operators/image/remap/rotate.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/displacement/rotate.h" +#include "dali/operators/image/remap/rotate.h" namespace dali { diff --git a/dali/operators/displacement/rotate.cu b/dali/operators/image/remap/rotate.cu similarity index 93% rename from dali/operators/displacement/rotate.cu rename to dali/operators/image/remap/rotate.cu index 0f9c984b..86f7ed0d 100644 --- a/dali/operators/displacement/rotate.cu +++ b/dali/operators/image/remap/rotate.cu @@ -13,7 +13,7 @@ // limitations under the License. -#include "dali/operators/displacement/rotate.h" +#include "dali/operators/image/remap/rotate.h" namespace dali { DALI_REGISTER_OPERATOR(Rotate, Rotate, GPU); diff --git a/dali/operators/displacement/rotate.h b/dali/operators/image/remap/rotate.h similarity index 84% rename from dali/operators/displacement/rotate.h rename to dali/operators/image/remap/rotate.h index 69b9385a..a0b32f6f 100644 --- a/dali/operators/displacement/rotate.h +++ b/dali/operators/image/remap/rotate.h @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_DISPLACEMENT_ROTATE_H_ -#define DALI_OPERATORS_DISPLACEMENT_ROTATE_H_ +#ifndef DALI_OPERATORS_IMAGE_REMAP_ROTATE_H_ +#define DALI_OPERATORS_IMAGE_REMAP_ROTATE_H_ #include #include #include #include "dali/kernels/imgproc/warp/affine.h" #include "dali/kernels/imgproc/warp/mapping_traits.h" -#include "dali/operators/displacement/warp.h" -#include "dali/operators/displacement/rotate_params.h" +#include "dali/operators/image/remap/warp.h" +#include "dali/operators/image/remap/rotate_params.h" namespace dali { @@ -45,4 +45,4 @@ class Rotate : public Warp> { } // namespace dali -#endif // DALI_OPERATORS_DISPLACEMENT_ROTATE_H_ +#endif // DALI_OPERATORS_IMAGE_REMAP_ROTATE_H_ diff --git a/dali/operators/displacement/rotate_params.h b/dali/operators/image/remap/rotate_params.h similarity index 97% rename from dali/operators/displacement/rotate_params.h rename to dali/operators/image/remap/rotate_params.h index 0b8cb3d9..20ef0fbe 100644 --- a/dali/operators/displacement/rotate_params.h +++ b/dali/operators/image/remap/rotate_params.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_DISPLACEMENT_ROTATE_PARAMS_H_ -#define DALI_OPERATORS_DISPLACEMENT_ROTATE_PARAMS_H_ +#ifndef DALI_OPERATORS_IMAGE_REMAP_ROTATE_PARAMS_H_ +#define DALI_OPERATORS_IMAGE_REMAP_ROTATE_PARAMS_H_ #include #include @@ -23,7 +23,7 @@ #include "dali/kernels/imgproc/warp/affine.h" #include "dali/kernels/imgproc/warp/mapping_traits.h" #include "dali/kernels/imgproc/roi.h" -#include "dali/operators/displacement/warp_param_provider.h" +#include "dali/operators/image/remap/warp_param_provider.h" #include "dali/core/tensor_shape_print.h" #include "dali/core/format.h" @@ -294,4 +294,4 @@ class RotateParamProvider } // namespace dali -#endif // DALI_OPERATORS_DISPLACEMENT_ROTATE_PARAMS_H_ +#endif // DALI_OPERATORS_IMAGE_REMAP_ROTATE_PARAMS_H_ diff --git a/dali/operators/displacement/sphere.cc b/dali/operators/image/remap/sphere.cc similarity index 88% rename from dali/operators/displacement/sphere.cc rename to dali/operators/image/remap/sphere.cc index 338a986b..958aa788 100644 --- a/dali/operators/displacement/sphere.cc +++ b/dali/operators/image/remap/sphere.cc @@ -13,8 +13,8 @@ // limitations under the License. -#include "dali/operators/displacement/sphere.h" -#include "dali/operators/displacement/displacement_filter_impl_cpu.h" +#include "dali/operators/image/remap/sphere.h" +#include "dali/operators/image/remap/displacement_filter_impl_cpu.h" namespace dali { diff --git a/dali/operators/displacement/sphere.cu b/dali/operators/image/remap/sphere.cu similarity index 85% rename from dali/operators/displacement/sphere.cu rename to dali/operators/image/remap/sphere.cu index c5564d11..b3d76141 100644 --- a/dali/operators/displacement/sphere.cu +++ b/dali/operators/image/remap/sphere.cu @@ -13,8 +13,8 @@ // limitations under the License. -#include "dali/operators/displacement/sphere.h" -#include "dali/operators/displacement/displacement_filter_impl_gpu.cuh" +#include "dali/operators/image/remap/sphere.h" +#include "dali/operators/image/remap/displacement_filter_impl_gpu.cuh" namespace dali { diff --git a/dali/operators/displacement/sphere.h b/dali/operators/image/remap/sphere.h similarity index 88% rename from dali/operators/displacement/sphere.h rename to dali/operators/image/remap/sphere.h index ad0f405d..a5d25331 100644 --- a/dali/operators/displacement/sphere.h +++ b/dali/operators/image/remap/sphere.h @@ -13,14 +13,14 @@ // limitations under the License. -#ifndef DALI_OPERATORS_DISPLACEMENT_SPHERE_H_ -#define DALI_OPERATORS_DISPLACEMENT_SPHERE_H_ +#ifndef DALI_OPERATORS_IMAGE_REMAP_SPHERE_H_ +#define DALI_OPERATORS_IMAGE_REMAP_SPHERE_H_ #include #include #include "dali/pipeline/operator/operator.h" #include "dali/core/geom/vec.h" -#include "dali/operators/displacement/displacement_filter.h" +#include "dali/operators/image/remap/displacement_filter.h" namespace dali { @@ -58,4 +58,4 @@ class Sphere : public DisplacementFilter { } // namespace dali -#endif // DALI_OPERATORS_DISPLACEMENT_SPHERE_H_ +#endif // DALI_OPERATORS_IMAGE_REMAP_SPHERE_H_ diff --git a/dali/operators/displacement/warp.h b/dali/operators/image/remap/warp.h similarity index 98% rename from dali/operators/displacement/warp.h rename to dali/operators/image/remap/warp.h index 49d3acc0..5418a55d 100644 --- a/dali/operators/displacement/warp.h +++ b/dali/operators/image/remap/warp.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_DISPLACEMENT_WARP_H_ -#define DALI_OPERATORS_DISPLACEMENT_WARP_H_ +#ifndef DALI_OPERATORS_IMAGE_REMAP_WARP_H_ +#define DALI_OPERATORS_IMAGE_REMAP_WARP_H_ #include #include @@ -29,7 +29,7 @@ #include "dali/kernels/imgproc/warp_cpu.h" #include "dali/kernels/imgproc/warp_gpu.h" #include "dali/pipeline/operator/operator.h" -#include "dali/operators/displacement/warp_param_provider.h" +#include "dali/operators/image/remap/warp_param_provider.h" #include "dali/pipeline/data/views.h" namespace dali { @@ -347,4 +347,4 @@ class Warp : public Operator { } // namespace dali -#endif // DALI_OPERATORS_DISPLACEMENT_WARP_H_ +#endif // DALI_OPERATORS_IMAGE_REMAP_WARP_H_ diff --git a/dali/operators/displacement/warp_affine.cc b/dali/operators/image/remap/warp_affine.cc similarity index 96% rename from dali/operators/displacement/warp_affine.cc rename to dali/operators/image/remap/warp_affine.cc index 41bb7647..4657743f 100644 --- a/dali/operators/displacement/warp_affine.cc +++ b/dali/operators/image/remap/warp_affine.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/displacement/warp_affine.h" +#include "dali/operators/image/remap/warp_affine.h" namespace dali { diff --git a/dali/operators/displacement/warp_affine.cu b/dali/operators/image/remap/warp_affine.cu similarity index 93% rename from dali/operators/displacement/warp_affine.cu rename to dali/operators/image/remap/warp_affine.cu index 9182eb7d..8bc3d4ea 100644 --- a/dali/operators/displacement/warp_affine.cu +++ b/dali/operators/image/remap/warp_affine.cu @@ -13,7 +13,7 @@ // limitations under the License. #include -#include "dali/operators/displacement/warp_affine.h" +#include "dali/operators/image/remap/warp_affine.h" namespace dali { diff --git a/dali/operators/displacement/warp_affine.h b/dali/operators/image/remap/warp_affine.h similarity index 83% rename from dali/operators/displacement/warp_affine.h rename to dali/operators/image/remap/warp_affine.h index e1a28522..f9cd0aee 100644 --- a/dali/operators/displacement/warp_affine.h +++ b/dali/operators/image/remap/warp_affine.h @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_DISPLACEMENT_WARP_AFFINE_H_ -#define DALI_OPERATORS_DISPLACEMENT_WARP_AFFINE_H_ +#ifndef DALI_OPERATORS_IMAGE_REMAP_WARP_AFFINE_H_ +#define DALI_OPERATORS_IMAGE_REMAP_WARP_AFFINE_H_ #include #include #include #include "dali/kernels/imgproc/warp/affine.h" #include "dali/kernels/imgproc/warp/mapping_traits.h" -#include "dali/operators/displacement/warp.h" -#include "dali/operators/displacement/warp_affine_params.h" +#include "dali/operators/image/remap/warp.h" +#include "dali/operators/image/remap/warp_affine_params.h" namespace dali { @@ -45,4 +45,4 @@ class WarpAffine : public Warp> { } // namespace dali -#endif // DALI_OPERATORS_DISPLACEMENT_WARP_AFFINE_H_ +#endif // DALI_OPERATORS_IMAGE_REMAP_WARP_AFFINE_H_ diff --git a/dali/operators/displacement/warp_affine_params.h b/dali/operators/image/remap/warp_affine_params.h similarity index 95% rename from dali/operators/displacement/warp_affine_params.h rename to dali/operators/image/remap/warp_affine_params.h index 9790c6f1..317b7efb 100644 --- a/dali/operators/displacement/warp_affine_params.h +++ b/dali/operators/image/remap/warp_affine_params.h @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_DISPLACEMENT_WARP_AFFINE_PARAMS_H_ -#define DALI_OPERATORS_DISPLACEMENT_WARP_AFFINE_PARAMS_H_ +#ifndef DALI_OPERATORS_IMAGE_REMAP_WARP_AFFINE_PARAMS_H_ +#define DALI_OPERATORS_IMAGE_REMAP_WARP_AFFINE_PARAMS_H_ #include #include #include "dali/pipeline/operator/operator.h" #include "dali/kernels/imgproc/warp/affine.h" #include "dali/kernels/imgproc/warp/mapping_traits.h" -#include "dali/operators/displacement/warp_param_provider.h" +#include "dali/operators/image/remap/warp_param_provider.h" #include "dali/core/tensor_shape_print.h" namespace dali { @@ -145,4 +145,4 @@ class WarpAffineParamProvider } // namespace dali -#endif // DALI_OPERATORS_DISPLACEMENT_WARP_AFFINE_PARAMS_H_ +#endif // DALI_OPERATORS_IMAGE_REMAP_WARP_AFFINE_PARAMS_H_ diff --git a/dali/operators/displacement/warp_attr.cc b/dali/operators/image/remap/warp_attr.cc similarity index 100% rename from dali/operators/displacement/warp_attr.cc rename to dali/operators/image/remap/warp_attr.cc diff --git a/dali/operators/displacement/warp_param_provider.h b/dali/operators/image/remap/warp_param_provider.h similarity index 98% rename from dali/operators/displacement/warp_param_provider.h rename to dali/operators/image/remap/warp_param_provider.h index 38fb81c7..56a49153 100644 --- a/dali/operators/displacement/warp_param_provider.h +++ b/dali/operators/image/remap/warp_param_provider.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_DISPLACEMENT_WARP_PARAM_PROVIDER_H_ -#define DALI_OPERATORS_DISPLACEMENT_WARP_PARAM_PROVIDER_H_ +#ifndef DALI_OPERATORS_IMAGE_REMAP_WARP_PARAM_PROVIDER_H_ +#define DALI_OPERATORS_IMAGE_REMAP_WARP_PARAM_PROVIDER_H_ #include #include @@ -337,4 +337,4 @@ class WarpParamProvider : public InterpTypeProvider, public BorderTypeProvider #include #include #include "dali/core/host_dev.h" #include "dali/core/geom/vec.h" -#include "dali/operators/displacement/displacement_filter.h" +#include "dali/operators/image/remap/displacement_filter.h" namespace dali { @@ -71,4 +71,4 @@ class Water : public DisplacementFilter { } // namespace dali -#endif // DALI_OPERATORS_DISPLACEMENT_WATER_H_ +#endif // DALI_OPERATORS_IMAGE_REMAP_WATER_H_ diff --git a/dali/operators/resize/CMakeLists.txt b/dali/operators/image/resize/CMakeLists.txt similarity index 100% rename from dali/operators/resize/CMakeLists.txt rename to dali/operators/image/resize/CMakeLists.txt diff --git a/dali/operators/resize/random_resized_crop.cc b/dali/operators/image/resize/random_resized_crop.cc similarity index 97% rename from dali/operators/resize/random_resized_crop.cc rename to dali/operators/image/resize/random_resized_crop.cc index f81d768a..0f1da675 100644 --- a/dali/operators/resize/random_resized_crop.cc +++ b/dali/operators/image/resize/random_resized_crop.cc @@ -16,7 +16,7 @@ #include #include -#include "dali/operators/resize/random_resized_crop.h" +#include "dali/operators/image/resize/random_resized_crop.h" #include "dali/pipeline/operator/common.h" #include "dali/util/ocv.h" diff --git a/dali/operators/resize/random_resized_crop.cu b/dali/operators/image/resize/random_resized_crop.cu similarity index 96% rename from dali/operators/resize/random_resized_crop.cu rename to dali/operators/image/resize/random_resized_crop.cu index a6769163..a918608e 100644 --- a/dali/operators/resize/random_resized_crop.cu +++ b/dali/operators/image/resize/random_resized_crop.cu @@ -17,7 +17,7 @@ #include #include "dali/pipeline/data/views.h" -#include "dali/operators/resize/random_resized_crop.h" +#include "dali/operators/image/resize/random_resized_crop.h" #include "dali/util/random_crop_generator.h" namespace dali { diff --git a/dali/operators/resize/random_resized_crop.h b/dali/operators/image/resize/random_resized_crop.h similarity index 90% rename from dali/operators/resize/random_resized_crop.h rename to dali/operators/image/resize/random_resized_crop.h index 9eaf3972..7cce7c32 100644 --- a/dali/operators/resize/random_resized_crop.h +++ b/dali/operators/image/resize/random_resized_crop.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_RESIZE_RANDOM_RESIZED_CROP_H_ -#define DALI_OPERATORS_RESIZE_RANDOM_RESIZED_CROP_H_ +#ifndef DALI_OPERATORS_IMAGE_RESIZE_RANDOM_RESIZED_CROP_H_ +#define DALI_OPERATORS_IMAGE_RESIZE_RANDOM_RESIZED_CROP_H_ #include #include @@ -23,8 +23,8 @@ #include "dali/pipeline/operator/operator.h" #include "dali/pipeline/operator/op_spec.h" #include "dali/pipeline/operator/common.h" -#include "dali/operators/resize/resize_base.h" -#include "dali/operators/crop/random_crop_attr.h" +#include "dali/operators/image/resize/resize_base.h" +#include "dali/operators/image/crop/random_crop_attr.h" #include "dali/kernels/imgproc/resample/params.h" namespace dali { @@ -93,4 +93,4 @@ class RandomResizedCrop : public Operator } // namespace dali -#endif // DALI_OPERATORS_RESIZE_RANDOM_RESIZED_CROP_H_ +#endif // DALI_OPERATORS_IMAGE_RESIZE_RANDOM_RESIZED_CROP_H_ diff --git a/dali/operators/resize/resize.cc b/dali/operators/image/resize/resize.cc similarity index 98% rename from dali/operators/resize/resize.cc rename to dali/operators/image/resize/resize.cc index 9d503c5a..60985810 100755 --- a/dali/operators/resize/resize.cc +++ b/dali/operators/image/resize/resize.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/resize/resize.h" +#include "dali/operators/image/resize/resize.h" #include "dali/pipeline/data/views.h" namespace dali { diff --git a/dali/operators/resize/resize.cu b/dali/operators/image/resize/resize.cu similarity index 98% rename from dali/operators/resize/resize.cu rename to dali/operators/image/resize/resize.cu index 66b2f5a9..dd22cd06 100644 --- a/dali/operators/resize/resize.cu +++ b/dali/operators/image/resize/resize.cu @@ -17,7 +17,7 @@ #include #include -#include "dali/operators/resize/resize.h" +#include "dali/operators/image/resize/resize.h" #include "dali/core/static_switch.h" #include "dali/pipeline/data/views.h" diff --git a/dali/operators/resize/resize.h b/dali/operators/image/resize/resize.h similarity index 90% rename from dali/operators/resize/resize.h rename to dali/operators/image/resize/resize.h index 125b17a1..ef1c8477 100644 --- a/dali/operators/resize/resize.h +++ b/dali/operators/image/resize/resize.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_RESIZE_RESIZE_H_ -#define DALI_OPERATORS_RESIZE_RESIZE_H_ +#ifndef DALI_OPERATORS_IMAGE_RESIZE_RESIZE_H_ +#define DALI_OPERATORS_IMAGE_RESIZE_RESIZE_H_ #include #include @@ -23,8 +23,8 @@ #include "dali/pipeline/operator/common.h" #include "dali/core/error_handling.h" #include "dali/pipeline/operator/operator.h" -#include "dali/operators/fused/resize_crop_mirror.h" -#include "dali/operators/resize/resize_base.h" +#include "dali/operators/image/resize/resize_crop_mirror.h" +#include "dali/operators/image/resize/resize_base.h" #include "dali/kernels/context.h" #include "dali/kernels/scratch.h" #include "dali/kernels/imgproc/resample/params.h" @@ -78,4 +78,4 @@ class Resize : public Operator } // namespace dali -#endif // DALI_OPERATORS_RESIZE_RESIZE_H_ +#endif // DALI_OPERATORS_IMAGE_RESIZE_RESIZE_H_ diff --git a/dali/operators/resize/resize_base.cc b/dali/operators/image/resize/resize_base.cc similarity index 99% rename from dali/operators/resize/resize_base.cc rename to dali/operators/image/resize/resize_base.cc index 3860377b..3ea62178 100644 --- a/dali/operators/resize/resize_base.cc +++ b/dali/operators/image/resize/resize_base.cc @@ -14,7 +14,7 @@ #include "dali/kernels/imgproc/resample.h" #include "dali/kernels/imgproc/resample_cpu.h" -#include "dali/operators/resize/resize_base.h" +#include "dali/operators/image/resize/resize_base.h" #include "dali/pipeline/data/views.h" namespace dali { diff --git a/dali/operators/resize/resize_base.h b/dali/operators/image/resize/resize_base.h similarity index 94% rename from dali/operators/resize/resize_base.h rename to dali/operators/image/resize/resize_base.h index f5d64eeb..57639ed0 100644 --- a/dali/operators/resize/resize_base.h +++ b/dali/operators/image/resize/resize_base.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_RESIZE_RESIZE_BASE_H_ -#define DALI_OPERATORS_RESIZE_RESIZE_BASE_H_ +#ifndef DALI_OPERATORS_IMAGE_RESIZE_RESIZE_BASE_H_ +#define DALI_OPERATORS_IMAGE_RESIZE_RESIZE_BASE_H_ #include #include @@ -81,4 +81,4 @@ class DLL_PUBLIC ResizeBase : public ResamplingFilterAttr { } // namespace dali -#endif // DALI_OPERATORS_RESIZE_RESIZE_BASE_H_ +#endif // DALI_OPERATORS_IMAGE_RESIZE_RESIZE_BASE_H_ diff --git a/dali/operators/fused/resize_crop_mirror.cc b/dali/operators/image/resize/resize_crop_mirror.cc similarity index 96% rename from dali/operators/fused/resize_crop_mirror.cc rename to dali/operators/image/resize/resize_crop_mirror.cc index 779c7fa9..2244e67f 100755 --- a/dali/operators/fused/resize_crop_mirror.cc +++ b/dali/operators/image/resize/resize_crop_mirror.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/fused/resize_crop_mirror.h" +#include "dali/operators/image/resize/resize_crop_mirror.h" namespace dali { diff --git a/dali/operators/fused/resize_crop_mirror.h b/dali/operators/image/resize/resize_crop_mirror.h similarity index 97% rename from dali/operators/fused/resize_crop_mirror.h rename to dali/operators/image/resize/resize_crop_mirror.h index 0abb0e88..8252b282 100755 --- a/dali/operators/fused/resize_crop_mirror.h +++ b/dali/operators/image/resize/resize_crop_mirror.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_FUSED_RESIZE_CROP_MIRROR_H_ -#define DALI_OPERATORS_FUSED_RESIZE_CROP_MIRROR_H_ +#ifndef DALI_OPERATORS_IMAGE_RESIZE_RESIZE_CROP_MIRROR_H_ +#define DALI_OPERATORS_IMAGE_RESIZE_RESIZE_CROP_MIRROR_H_ #include #include @@ -25,7 +25,7 @@ #include "dali/image/transform.h" #include "dali/pipeline/operator/operator.h" #include "dali/pipeline/operator/common.h" -#include "dali/operators/crop/crop_attr.h" +#include "dali/operators/image/crop/crop_attr.h" namespace dali { @@ -279,4 +279,4 @@ class FastResizeCropMirror : public ResizeCropMirror { } // namespace dali -#endif // DALI_OPERATORS_FUSED_RESIZE_CROP_MIRROR_H_ +#endif // DALI_OPERATORS_IMAGE_RESIZE_RESIZE_CROP_MIRROR_H_ diff --git a/dali/operators/fused/resize_crop_mirror_test.cc b/dali/operators/image/resize/resize_crop_mirror_test.cc similarity index 100% rename from dali/operators/fused/resize_crop_mirror_test.cc rename to dali/operators/image/resize/resize_crop_mirror_test.cc diff --git a/dali/operators/resize/resize_test.cc b/dali/operators/image/resize/resize_test.cc similarity index 100% rename from dali/operators/resize/resize_test.cc rename to dali/operators/image/resize/resize_test.cc diff --git a/dali/operators/support/CMakeLists.txt b/dali/operators/math/CMakeLists.txt similarity index 88% rename from dali/operators/support/CMakeLists.txt rename to dali/operators/math/CMakeLists.txt index 535dbbb1..954913c9 100644 --- a/dali/operators/support/CMakeLists.txt +++ b/dali/operators/math/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. +# Copyright (c) 2020 NVIDIA CORPORATION. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -12,9 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -add_subdirectory(random) - # Get all the source files and dump test files +add_subdirectory(expressions) + collect_headers(DALI_INST_HDRS PARENT_SCOPE) collect_sources(DALI_OPERATOR_SRCS PARENT_SCOPE) collect_test_sources(DALI_OPERATOR_TEST_SRCS PARENT_SCOPE) diff --git a/dali/operators/expressions/CMakeLists.txt b/dali/operators/math/expressions/CMakeLists.txt similarity index 100% rename from dali/operators/expressions/CMakeLists.txt rename to dali/operators/math/expressions/CMakeLists.txt diff --git a/dali/operators/expressions/arithmetic.cc b/dali/operators/math/expressions/arithmetic.cc similarity index 98% rename from dali/operators/expressions/arithmetic.cc rename to dali/operators/math/expressions/arithmetic.cc index 2c18db8c..c35d3bd2 100644 --- a/dali/operators/expressions/arithmetic.cc +++ b/dali/operators/math/expressions/arithmetic.cc @@ -15,7 +15,7 @@ #include #include "dali/kernels/type_tag.h" -#include "dali/operators/expressions/arithmetic.h" +#include "dali/operators/math/expressions/arithmetic.h" namespace dali { diff --git a/dali/operators/expressions/arithmetic.cu b/dali/operators/math/expressions/arithmetic.cu similarity index 95% rename from dali/operators/expressions/arithmetic.cu rename to dali/operators/math/expressions/arithmetic.cu index 1a4ee75f..762d489f 100644 --- a/dali/operators/expressions/arithmetic.cu +++ b/dali/operators/math/expressions/arithmetic.cu @@ -13,7 +13,7 @@ // limitations under the License. #include "dali/kernels/type_tag.h" -#include "dali/operators/expressions/arithmetic.h" +#include "dali/operators/math/expressions/arithmetic.h" namespace dali { diff --git a/dali/operators/expressions/arithmetic.h b/dali/operators/math/expressions/arithmetic.h similarity index 97% rename from dali/operators/expressions/arithmetic.h rename to dali/operators/math/expressions/arithmetic.h index cb710f24..090aa760 100644 --- a/dali/operators/expressions/arithmetic.h +++ b/dali/operators/math/expressions/arithmetic.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_EXPRESSIONS_ARITHMETIC_H_ -#define DALI_OPERATORS_EXPRESSIONS_ARITHMETIC_H_ +#ifndef DALI_OPERATORS_MATH_EXPRESSIONS_ARITHMETIC_H_ +#define DALI_OPERATORS_MATH_EXPRESSIONS_ARITHMETIC_H_ #include #include @@ -27,8 +27,8 @@ #include "dali/core/tensor_shape.h" #include "dali/core/tensor_shape_print.h" #include "dali/kernels/type_tag.h" -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_impl_factory.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_impl_factory.h" #include "dali/pipeline/operator/operator.h" namespace dali { @@ -372,4 +372,4 @@ class ArithmeticGenericOp : public Operator { } // namespace dali -#endif // DALI_OPERATORS_EXPRESSIONS_ARITHMETIC_H_ +#endif // DALI_OPERATORS_MATH_EXPRESSIONS_ARITHMETIC_H_ diff --git a/dali/operators/expressions/arithmetic_meta.h b/dali/operators/math/expressions/arithmetic_meta.h similarity index 99% rename from dali/operators/expressions/arithmetic_meta.h rename to dali/operators/math/expressions/arithmetic_meta.h index 97505706..d702f8a6 100644 --- a/dali/operators/expressions/arithmetic_meta.h +++ b/dali/operators/math/expressions/arithmetic_meta.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_EXPRESSIONS_ARITHMETIC_META_H_ -#define DALI_OPERATORS_EXPRESSIONS_ARITHMETIC_META_H_ +#ifndef DALI_OPERATORS_MATH_EXPRESSIONS_ARITHMETIC_META_H_ +#define DALI_OPERATORS_MATH_EXPRESSIONS_ARITHMETIC_META_H_ #include #include @@ -714,4 +714,4 @@ inline bool IsScalarLike(const TensorListShape<> &shape) { } // namespace dali -#endif // DALI_OPERATORS_EXPRESSIONS_ARITHMETIC_META_H_ +#endif // DALI_OPERATORS_MATH_EXPRESSIONS_ARITHMETIC_META_H_ diff --git a/dali/operators/expressions/arithmetic_test.cc b/dali/operators/math/expressions/arithmetic_test.cc similarity index 99% rename from dali/operators/expressions/arithmetic_test.cc rename to dali/operators/math/expressions/arithmetic_test.cc index e77a5b4a..1cb30e6b 100644 --- a/dali/operators/expressions/arithmetic_test.cc +++ b/dali/operators/math/expressions/arithmetic_test.cc @@ -19,8 +19,8 @@ #include #include "dali/core/static_switch.h" -#include "dali/operators/expressions/arithmetic.h" -#include "dali/operators/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/arithmetic.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" #include "dali/pipeline/data/types.h" #include "dali/pipeline/pipeline.h" #include "dali/test/dali_operator_test.h" diff --git a/dali/operators/expressions/constant_storage.h b/dali/operators/math/expressions/constant_storage.h similarity index 93% rename from dali/operators/expressions/constant_storage.h rename to dali/operators/math/expressions/constant_storage.h index b4ff7616..e635cf2e 100644 --- a/dali/operators/expressions/constant_storage.h +++ b/dali/operators/math/expressions/constant_storage.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_EXPRESSIONS_CONSTANT_STORAGE_H_ -#define DALI_OPERATORS_EXPRESSIONS_CONSTANT_STORAGE_H_ +#ifndef DALI_OPERATORS_MATH_EXPRESSIONS_CONSTANT_STORAGE_H_ +#define DALI_OPERATORS_MATH_EXPRESSIONS_CONSTANT_STORAGE_H_ #include #include @@ -23,8 +23,8 @@ #include "dali/core/format.h" #include "dali/core/static_switch.h" -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_tree.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_tree.h" #include "dali/pipeline/data/types.h" #include "dali/pipeline/operator/op_spec.h" #include "dali/pipeline/util/backend2workspace_map.h" @@ -112,4 +112,4 @@ class ConstantStorage { } // namespace dali -#endif // DALI_OPERATORS_EXPRESSIONS_CONSTANT_STORAGE_H_ +#endif // DALI_OPERATORS_MATH_EXPRESSIONS_CONSTANT_STORAGE_H_ diff --git a/dali/operators/expressions/constant_storage_test.cc b/dali/operators/math/expressions/constant_storage_test.cc similarity index 95% rename from dali/operators/expressions/constant_storage_test.cc rename to dali/operators/math/expressions/constant_storage_test.cc index 6f60f643..3a435b81 100644 --- a/dali/operators/expressions/constant_storage_test.cc +++ b/dali/operators/math/expressions/constant_storage_test.cc @@ -19,9 +19,9 @@ #include #include "dali/core/static_switch.h" -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/constant_storage.h" -#include "dali/operators/expressions/expression_tree.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/constant_storage.h" +#include "dali/operators/math/expressions/expression_tree.h" #include "dali/pipeline/operator/op_spec.h" namespace dali { diff --git a/dali/operators/color_space/CMakeLists.txt b/dali/operators/math/expressions/expression_factory_instances/CMakeLists.txt similarity index 92% rename from dali/operators/color_space/CMakeLists.txt rename to dali/operators/math/expressions/expression_factory_instances/CMakeLists.txt index 10204a5d..30466bd8 100644 --- a/dali/operators/color_space/CMakeLists.txt +++ b/dali/operators/math/expressions/expression_factory_instances/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved. +# Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/dali/operators/expressions/expression_factory_instances/expression_factory_add.cc b/dali/operators/math/expressions/expression_factory_instances/expression_factory_add.cc similarity index 75% rename from dali/operators/expressions/expression_factory_instances/expression_factory_add.cc rename to dali/operators/math/expressions/expression_factory_instances/expression_factory_add.cc index d07f2313..9bff11db 100644 --- a/dali/operators/expressions/expression_factory_instances/expression_factory_add.cc +++ b/dali/operators/math/expressions/expression_factory_instances/expression_factory_add.cc @@ -13,9 +13,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_impl_cpu.h" -#include "dali/operators/expressions/expression_factory_instances/expression_impl_factory.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_impl_cpu.h" +#include "dali/operators/math/expressions/expression_factory_instances/expression_impl_factory.h" namespace dali { diff --git a/dali/operators/expressions/expression_factory_instances/expression_factory_add.cu b/dali/operators/math/expressions/expression_factory_instances/expression_factory_add.cu similarity index 76% rename from dali/operators/expressions/expression_factory_instances/expression_factory_add.cu rename to dali/operators/math/expressions/expression_factory_instances/expression_factory_add.cu index ab1be0f5..55b30e1d 100644 --- a/dali/operators/expressions/expression_factory_instances/expression_factory_add.cu +++ b/dali/operators/math/expressions/expression_factory_instances/expression_factory_add.cu @@ -14,9 +14,9 @@ // limitations under the License. #include "dali/core/static_switch.h" -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_impl_gpu.cuh" -#include "dali/operators/expressions/expression_factory_instances/expression_impl_factory.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_impl_gpu.cuh" +#include "dali/operators/math/expressions/expression_factory_instances/expression_impl_factory.h" namespace dali { diff --git a/dali/operators/expressions/expression_factory_instances/expression_factory_bit_and.cc b/dali/operators/math/expressions/expression_factory_instances/expression_factory_bit_and.cc similarity index 75% rename from dali/operators/expressions/expression_factory_instances/expression_factory_bit_and.cc rename to dali/operators/math/expressions/expression_factory_instances/expression_factory_bit_and.cc index 27eb3dc1..0348fa94 100644 --- a/dali/operators/expressions/expression_factory_instances/expression_factory_bit_and.cc +++ b/dali/operators/math/expressions/expression_factory_instances/expression_factory_bit_and.cc @@ -13,9 +13,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_impl_cpu.h" -#include "dali/operators/expressions/expression_factory_instances/expression_impl_factory.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_impl_cpu.h" +#include "dali/operators/math/expressions/expression_factory_instances/expression_impl_factory.h" namespace dali { diff --git a/dali/operators/expressions/expression_factory_instances/expression_factory_bit_and.cu b/dali/operators/math/expressions/expression_factory_instances/expression_factory_bit_and.cu similarity index 76% rename from dali/operators/expressions/expression_factory_instances/expression_factory_bit_and.cu rename to dali/operators/math/expressions/expression_factory_instances/expression_factory_bit_and.cu index 9bae9ea5..66adc9e1 100644 --- a/dali/operators/expressions/expression_factory_instances/expression_factory_bit_and.cu +++ b/dali/operators/math/expressions/expression_factory_instances/expression_factory_bit_and.cu @@ -14,9 +14,9 @@ // limitations under the License. #include "dali/core/static_switch.h" -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_impl_gpu.cuh" -#include "dali/operators/expressions/expression_factory_instances/expression_impl_factory.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_impl_gpu.cuh" +#include "dali/operators/math/expressions/expression_factory_instances/expression_impl_factory.h" namespace dali { diff --git a/dali/operators/expressions/expression_factory_instances/expression_factory_bit_or.cc b/dali/operators/math/expressions/expression_factory_instances/expression_factory_bit_or.cc similarity index 75% rename from dali/operators/expressions/expression_factory_instances/expression_factory_bit_or.cc rename to dali/operators/math/expressions/expression_factory_instances/expression_factory_bit_or.cc index 94c2da71..541d9109 100644 --- a/dali/operators/expressions/expression_factory_instances/expression_factory_bit_or.cc +++ b/dali/operators/math/expressions/expression_factory_instances/expression_factory_bit_or.cc @@ -13,9 +13,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_impl_cpu.h" -#include "dali/operators/expressions/expression_factory_instances/expression_impl_factory.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_impl_cpu.h" +#include "dali/operators/math/expressions/expression_factory_instances/expression_impl_factory.h" namespace dali { diff --git a/dali/operators/expressions/expression_factory_instances/expression_factory_bit_or.cu b/dali/operators/math/expressions/expression_factory_instances/expression_factory_bit_or.cu similarity index 76% rename from dali/operators/expressions/expression_factory_instances/expression_factory_bit_or.cu rename to dali/operators/math/expressions/expression_factory_instances/expression_factory_bit_or.cu index 4273bdc7..10be7384 100644 --- a/dali/operators/expressions/expression_factory_instances/expression_factory_bit_or.cu +++ b/dali/operators/math/expressions/expression_factory_instances/expression_factory_bit_or.cu @@ -14,9 +14,9 @@ // limitations under the License. #include "dali/core/static_switch.h" -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_impl_gpu.cuh" -#include "dali/operators/expressions/expression_factory_instances/expression_impl_factory.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_impl_gpu.cuh" +#include "dali/operators/math/expressions/expression_factory_instances/expression_impl_factory.h" namespace dali { diff --git a/dali/operators/expressions/expression_factory_instances/expression_factory_bit_xor.cc b/dali/operators/math/expressions/expression_factory_instances/expression_factory_bit_xor.cc similarity index 75% rename from dali/operators/expressions/expression_factory_instances/expression_factory_bit_xor.cc rename to dali/operators/math/expressions/expression_factory_instances/expression_factory_bit_xor.cc index 043bbd35..8ecf3f6d 100644 --- a/dali/operators/expressions/expression_factory_instances/expression_factory_bit_xor.cc +++ b/dali/operators/math/expressions/expression_factory_instances/expression_factory_bit_xor.cc @@ -13,9 +13,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_impl_cpu.h" -#include "dali/operators/expressions/expression_factory_instances/expression_impl_factory.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_impl_cpu.h" +#include "dali/operators/math/expressions/expression_factory_instances/expression_impl_factory.h" namespace dali { diff --git a/dali/operators/expressions/expression_factory_instances/expression_factory_bit_xor.cu b/dali/operators/math/expressions/expression_factory_instances/expression_factory_bit_xor.cu similarity index 76% rename from dali/operators/expressions/expression_factory_instances/expression_factory_bit_xor.cu rename to dali/operators/math/expressions/expression_factory_instances/expression_factory_bit_xor.cu index 0eeb9fbe..eff0fcb5 100644 --- a/dali/operators/expressions/expression_factory_instances/expression_factory_bit_xor.cu +++ b/dali/operators/math/expressions/expression_factory_instances/expression_factory_bit_xor.cu @@ -14,9 +14,9 @@ // limitations under the License. #include "dali/core/static_switch.h" -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_impl_gpu.cuh" -#include "dali/operators/expressions/expression_factory_instances/expression_impl_factory.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_impl_gpu.cuh" +#include "dali/operators/math/expressions/expression_factory_instances/expression_impl_factory.h" namespace dali { diff --git a/dali/operators/expressions/expression_factory_instances/expression_factory_div.cc b/dali/operators/math/expressions/expression_factory_instances/expression_factory_div.cc similarity index 75% rename from dali/operators/expressions/expression_factory_instances/expression_factory_div.cc rename to dali/operators/math/expressions/expression_factory_instances/expression_factory_div.cc index 095ed8d7..7dff6f21 100644 --- a/dali/operators/expressions/expression_factory_instances/expression_factory_div.cc +++ b/dali/operators/math/expressions/expression_factory_instances/expression_factory_div.cc @@ -13,9 +13,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_impl_cpu.h" -#include "dali/operators/expressions/expression_factory_instances/expression_impl_factory.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_impl_cpu.h" +#include "dali/operators/math/expressions/expression_factory_instances/expression_impl_factory.h" namespace dali { diff --git a/dali/operators/expressions/expression_factory_instances/expression_factory_div.cu b/dali/operators/math/expressions/expression_factory_instances/expression_factory_div.cu similarity index 76% rename from dali/operators/expressions/expression_factory_instances/expression_factory_div.cu rename to dali/operators/math/expressions/expression_factory_instances/expression_factory_div.cu index 2d85639d..a6ec65c3 100644 --- a/dali/operators/expressions/expression_factory_instances/expression_factory_div.cu +++ b/dali/operators/math/expressions/expression_factory_instances/expression_factory_div.cu @@ -14,9 +14,9 @@ // limitations under the License. #include "dali/core/static_switch.h" -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_impl_gpu.cuh" -#include "dali/operators/expressions/expression_factory_instances/expression_impl_factory.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_impl_gpu.cuh" +#include "dali/operators/math/expressions/expression_factory_instances/expression_impl_factory.h" namespace dali { diff --git a/dali/operators/expressions/expression_factory_instances/expression_factory_eq.cc b/dali/operators/math/expressions/expression_factory_instances/expression_factory_eq.cc similarity index 75% rename from dali/operators/expressions/expression_factory_instances/expression_factory_eq.cc rename to dali/operators/math/expressions/expression_factory_instances/expression_factory_eq.cc index d5d855d0..53e2a1a6 100644 --- a/dali/operators/expressions/expression_factory_instances/expression_factory_eq.cc +++ b/dali/operators/math/expressions/expression_factory_instances/expression_factory_eq.cc @@ -13,9 +13,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_impl_cpu.h" -#include "dali/operators/expressions/expression_factory_instances/expression_impl_factory.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_impl_cpu.h" +#include "dali/operators/math/expressions/expression_factory_instances/expression_impl_factory.h" namespace dali { diff --git a/dali/operators/expressions/expression_factory_instances/expression_factory_eq.cu b/dali/operators/math/expressions/expression_factory_instances/expression_factory_eq.cu similarity index 76% rename from dali/operators/expressions/expression_factory_instances/expression_factory_eq.cu rename to dali/operators/math/expressions/expression_factory_instances/expression_factory_eq.cu index a70826d6..21ce436a 100644 --- a/dali/operators/expressions/expression_factory_instances/expression_factory_eq.cu +++ b/dali/operators/math/expressions/expression_factory_instances/expression_factory_eq.cu @@ -14,9 +14,9 @@ // limitations under the License. #include "dali/core/static_switch.h" -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_impl_gpu.cuh" -#include "dali/operators/expressions/expression_factory_instances/expression_impl_factory.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_impl_gpu.cuh" +#include "dali/operators/math/expressions/expression_factory_instances/expression_impl_factory.h" namespace dali { diff --git a/dali/operators/expressions/expression_factory_instances/expression_factory_fdiv.cc b/dali/operators/math/expressions/expression_factory_instances/expression_factory_fdiv.cc similarity index 75% rename from dali/operators/expressions/expression_factory_instances/expression_factory_fdiv.cc rename to dali/operators/math/expressions/expression_factory_instances/expression_factory_fdiv.cc index 72ecb06c..40374b2f 100644 --- a/dali/operators/expressions/expression_factory_instances/expression_factory_fdiv.cc +++ b/dali/operators/math/expressions/expression_factory_instances/expression_factory_fdiv.cc @@ -13,9 +13,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_impl_cpu.h" -#include "dali/operators/expressions/expression_factory_instances/expression_impl_factory.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_impl_cpu.h" +#include "dali/operators/math/expressions/expression_factory_instances/expression_impl_factory.h" namespace dali { diff --git a/dali/operators/expressions/expression_factory_instances/expression_factory_fdiv.cu b/dali/operators/math/expressions/expression_factory_instances/expression_factory_fdiv.cu similarity index 76% rename from dali/operators/expressions/expression_factory_instances/expression_factory_fdiv.cu rename to dali/operators/math/expressions/expression_factory_instances/expression_factory_fdiv.cu index 2ec0fea4..30228260 100644 --- a/dali/operators/expressions/expression_factory_instances/expression_factory_fdiv.cu +++ b/dali/operators/math/expressions/expression_factory_instances/expression_factory_fdiv.cu @@ -14,9 +14,9 @@ // limitations under the License. #include "dali/core/static_switch.h" -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_impl_gpu.cuh" -#include "dali/operators/expressions/expression_factory_instances/expression_impl_factory.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_impl_gpu.cuh" +#include "dali/operators/math/expressions/expression_factory_instances/expression_impl_factory.h" namespace dali { diff --git a/dali/operators/expressions/expression_factory_instances/expression_factory_geq.cc b/dali/operators/math/expressions/expression_factory_instances/expression_factory_geq.cc similarity index 75% rename from dali/operators/expressions/expression_factory_instances/expression_factory_geq.cc rename to dali/operators/math/expressions/expression_factory_instances/expression_factory_geq.cc index 0821855c..13a2e229 100644 --- a/dali/operators/expressions/expression_factory_instances/expression_factory_geq.cc +++ b/dali/operators/math/expressions/expression_factory_instances/expression_factory_geq.cc @@ -13,9 +13,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_impl_cpu.h" -#include "dali/operators/expressions/expression_factory_instances/expression_impl_factory.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_impl_cpu.h" +#include "dali/operators/math/expressions/expression_factory_instances/expression_impl_factory.h" namespace dali { diff --git a/dali/operators/expressions/expression_factory_instances/expression_factory_geq.cu b/dali/operators/math/expressions/expression_factory_instances/expression_factory_geq.cu similarity index 76% rename from dali/operators/expressions/expression_factory_instances/expression_factory_geq.cu rename to dali/operators/math/expressions/expression_factory_instances/expression_factory_geq.cu index 0c782f79..cdda3dec 100644 --- a/dali/operators/expressions/expression_factory_instances/expression_factory_geq.cu +++ b/dali/operators/math/expressions/expression_factory_instances/expression_factory_geq.cu @@ -14,9 +14,9 @@ // limitations under the License. #include "dali/core/static_switch.h" -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_impl_gpu.cuh" -#include "dali/operators/expressions/expression_factory_instances/expression_impl_factory.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_impl_gpu.cuh" +#include "dali/operators/math/expressions/expression_factory_instances/expression_impl_factory.h" namespace dali { diff --git a/dali/operators/expressions/expression_factory_instances/expression_factory_gt.cc b/dali/operators/math/expressions/expression_factory_instances/expression_factory_gt.cc similarity index 75% rename from dali/operators/expressions/expression_factory_instances/expression_factory_gt.cc rename to dali/operators/math/expressions/expression_factory_instances/expression_factory_gt.cc index a22e0fdf..a923531c 100644 --- a/dali/operators/expressions/expression_factory_instances/expression_factory_gt.cc +++ b/dali/operators/math/expressions/expression_factory_instances/expression_factory_gt.cc @@ -13,9 +13,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_impl_cpu.h" -#include "dali/operators/expressions/expression_factory_instances/expression_impl_factory.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_impl_cpu.h" +#include "dali/operators/math/expressions/expression_factory_instances/expression_impl_factory.h" namespace dali { diff --git a/dali/operators/expressions/expression_factory_instances/expression_factory_gt.cu b/dali/operators/math/expressions/expression_factory_instances/expression_factory_gt.cu similarity index 76% rename from dali/operators/expressions/expression_factory_instances/expression_factory_gt.cu rename to dali/operators/math/expressions/expression_factory_instances/expression_factory_gt.cu index d0b5e925..b86fae68 100644 --- a/dali/operators/expressions/expression_factory_instances/expression_factory_gt.cu +++ b/dali/operators/math/expressions/expression_factory_instances/expression_factory_gt.cu @@ -14,9 +14,9 @@ // limitations under the License. #include "dali/core/static_switch.h" -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_impl_gpu.cuh" -#include "dali/operators/expressions/expression_factory_instances/expression_impl_factory.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_impl_gpu.cuh" +#include "dali/operators/math/expressions/expression_factory_instances/expression_impl_factory.h" namespace dali { diff --git a/dali/operators/expressions/expression_factory_instances/expression_factory_leq.cc b/dali/operators/math/expressions/expression_factory_instances/expression_factory_leq.cc similarity index 75% rename from dali/operators/expressions/expression_factory_instances/expression_factory_leq.cc rename to dali/operators/math/expressions/expression_factory_instances/expression_factory_leq.cc index 05b40376..65889864 100644 --- a/dali/operators/expressions/expression_factory_instances/expression_factory_leq.cc +++ b/dali/operators/math/expressions/expression_factory_instances/expression_factory_leq.cc @@ -13,9 +13,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_impl_cpu.h" -#include "dali/operators/expressions/expression_factory_instances/expression_impl_factory.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_impl_cpu.h" +#include "dali/operators/math/expressions/expression_factory_instances/expression_impl_factory.h" namespace dali { diff --git a/dali/operators/expressions/expression_factory_instances/expression_factory_leq.cu b/dali/operators/math/expressions/expression_factory_instances/expression_factory_leq.cu similarity index 76% rename from dali/operators/expressions/expression_factory_instances/expression_factory_leq.cu rename to dali/operators/math/expressions/expression_factory_instances/expression_factory_leq.cu index 11a4c29d..4c86477f 100644 --- a/dali/operators/expressions/expression_factory_instances/expression_factory_leq.cu +++ b/dali/operators/math/expressions/expression_factory_instances/expression_factory_leq.cu @@ -14,9 +14,9 @@ // limitations under the License. #include "dali/core/static_switch.h" -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_impl_gpu.cuh" -#include "dali/operators/expressions/expression_factory_instances/expression_impl_factory.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_impl_gpu.cuh" +#include "dali/operators/math/expressions/expression_factory_instances/expression_impl_factory.h" namespace dali { diff --git a/dali/operators/expressions/expression_factory_instances/expression_factory_lt.cc b/dali/operators/math/expressions/expression_factory_instances/expression_factory_lt.cc similarity index 75% rename from dali/operators/expressions/expression_factory_instances/expression_factory_lt.cc rename to dali/operators/math/expressions/expression_factory_instances/expression_factory_lt.cc index 1385f549..00fcb58b 100644 --- a/dali/operators/expressions/expression_factory_instances/expression_factory_lt.cc +++ b/dali/operators/math/expressions/expression_factory_instances/expression_factory_lt.cc @@ -13,9 +13,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_impl_cpu.h" -#include "dali/operators/expressions/expression_factory_instances/expression_impl_factory.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_impl_cpu.h" +#include "dali/operators/math/expressions/expression_factory_instances/expression_impl_factory.h" namespace dali { diff --git a/dali/operators/expressions/expression_factory_instances/expression_factory_lt.cu b/dali/operators/math/expressions/expression_factory_instances/expression_factory_lt.cu similarity index 76% rename from dali/operators/expressions/expression_factory_instances/expression_factory_lt.cu rename to dali/operators/math/expressions/expression_factory_instances/expression_factory_lt.cu index f7c2c397..bb6bf77c 100644 --- a/dali/operators/expressions/expression_factory_instances/expression_factory_lt.cu +++ b/dali/operators/math/expressions/expression_factory_instances/expression_factory_lt.cu @@ -14,9 +14,9 @@ // limitations under the License. #include "dali/core/static_switch.h" -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_impl_gpu.cuh" -#include "dali/operators/expressions/expression_factory_instances/expression_impl_factory.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_impl_gpu.cuh" +#include "dali/operators/math/expressions/expression_factory_instances/expression_impl_factory.h" namespace dali { diff --git a/dali/operators/expressions/expression_factory_instances/expression_factory_minus.cc b/dali/operators/math/expressions/expression_factory_instances/expression_factory_minus.cc similarity index 75% rename from dali/operators/expressions/expression_factory_instances/expression_factory_minus.cc rename to dali/operators/math/expressions/expression_factory_instances/expression_factory_minus.cc index 249abf19..7fe312e8 100644 --- a/dali/operators/expressions/expression_factory_instances/expression_factory_minus.cc +++ b/dali/operators/math/expressions/expression_factory_instances/expression_factory_minus.cc @@ -13,9 +13,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_impl_cpu.h" -#include "dali/operators/expressions/expression_factory_instances/expression_impl_factory.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_impl_cpu.h" +#include "dali/operators/math/expressions/expression_factory_instances/expression_impl_factory.h" namespace dali { diff --git a/dali/operators/expressions/expression_factory_instances/expression_factory_minus.cu b/dali/operators/math/expressions/expression_factory_instances/expression_factory_minus.cu similarity index 76% rename from dali/operators/expressions/expression_factory_instances/expression_factory_minus.cu rename to dali/operators/math/expressions/expression_factory_instances/expression_factory_minus.cu index d360368a..600c12c6 100644 --- a/dali/operators/expressions/expression_factory_instances/expression_factory_minus.cu +++ b/dali/operators/math/expressions/expression_factory_instances/expression_factory_minus.cu @@ -14,9 +14,9 @@ // limitations under the License. #include "dali/core/static_switch.h" -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_impl_gpu.cuh" -#include "dali/operators/expressions/expression_factory_instances/expression_impl_factory.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_impl_gpu.cuh" +#include "dali/operators/math/expressions/expression_factory_instances/expression_impl_factory.h" namespace dali { diff --git a/dali/operators/expressions/expression_factory_instances/expression_factory_mod.cc b/dali/operators/math/expressions/expression_factory_instances/expression_factory_mod.cc similarity index 75% rename from dali/operators/expressions/expression_factory_instances/expression_factory_mod.cc rename to dali/operators/math/expressions/expression_factory_instances/expression_factory_mod.cc index de2ba72b..44ebc0d4 100644 --- a/dali/operators/expressions/expression_factory_instances/expression_factory_mod.cc +++ b/dali/operators/math/expressions/expression_factory_instances/expression_factory_mod.cc @@ -13,9 +13,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_impl_cpu.h" -#include "dali/operators/expressions/expression_factory_instances/expression_impl_factory.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_impl_cpu.h" +#include "dali/operators/math/expressions/expression_factory_instances/expression_impl_factory.h" namespace dali { diff --git a/dali/operators/expressions/expression_factory_instances/expression_factory_mod.cu b/dali/operators/math/expressions/expression_factory_instances/expression_factory_mod.cu similarity index 76% rename from dali/operators/expressions/expression_factory_instances/expression_factory_mod.cu rename to dali/operators/math/expressions/expression_factory_instances/expression_factory_mod.cu index 94377376..91d0dfe0 100644 --- a/dali/operators/expressions/expression_factory_instances/expression_factory_mod.cu +++ b/dali/operators/math/expressions/expression_factory_instances/expression_factory_mod.cu @@ -14,9 +14,9 @@ // limitations under the License. #include "dali/core/static_switch.h" -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_impl_gpu.cuh" -#include "dali/operators/expressions/expression_factory_instances/expression_impl_factory.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_impl_gpu.cuh" +#include "dali/operators/math/expressions/expression_factory_instances/expression_impl_factory.h" namespace dali { diff --git a/dali/operators/expressions/expression_factory_instances/expression_factory_mul.cc b/dali/operators/math/expressions/expression_factory_instances/expression_factory_mul.cc similarity index 75% rename from dali/operators/expressions/expression_factory_instances/expression_factory_mul.cc rename to dali/operators/math/expressions/expression_factory_instances/expression_factory_mul.cc index 1556832a..516e7b4c 100644 --- a/dali/operators/expressions/expression_factory_instances/expression_factory_mul.cc +++ b/dali/operators/math/expressions/expression_factory_instances/expression_factory_mul.cc @@ -13,9 +13,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_impl_cpu.h" -#include "dali/operators/expressions/expression_factory_instances/expression_impl_factory.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_impl_cpu.h" +#include "dali/operators/math/expressions/expression_factory_instances/expression_impl_factory.h" namespace dali { diff --git a/dali/operators/expressions/expression_factory_instances/expression_factory_mul.cu b/dali/operators/math/expressions/expression_factory_instances/expression_factory_mul.cu similarity index 76% rename from dali/operators/expressions/expression_factory_instances/expression_factory_mul.cu rename to dali/operators/math/expressions/expression_factory_instances/expression_factory_mul.cu index bdb8f75b..49c017bd 100644 --- a/dali/operators/expressions/expression_factory_instances/expression_factory_mul.cu +++ b/dali/operators/math/expressions/expression_factory_instances/expression_factory_mul.cu @@ -14,9 +14,9 @@ // limitations under the License. #include "dali/core/static_switch.h" -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_impl_gpu.cuh" -#include "dali/operators/expressions/expression_factory_instances/expression_impl_factory.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_impl_gpu.cuh" +#include "dali/operators/math/expressions/expression_factory_instances/expression_impl_factory.h" namespace dali { diff --git a/dali/operators/expressions/expression_factory_instances/expression_factory_neq.cc b/dali/operators/math/expressions/expression_factory_instances/expression_factory_neq.cc similarity index 75% rename from dali/operators/expressions/expression_factory_instances/expression_factory_neq.cc rename to dali/operators/math/expressions/expression_factory_instances/expression_factory_neq.cc index 85e6b212..38962d36 100644 --- a/dali/operators/expressions/expression_factory_instances/expression_factory_neq.cc +++ b/dali/operators/math/expressions/expression_factory_instances/expression_factory_neq.cc @@ -13,9 +13,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_impl_cpu.h" -#include "dali/operators/expressions/expression_factory_instances/expression_impl_factory.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_impl_cpu.h" +#include "dali/operators/math/expressions/expression_factory_instances/expression_impl_factory.h" namespace dali { diff --git a/dali/operators/expressions/expression_factory_instances/expression_factory_neq.cu b/dali/operators/math/expressions/expression_factory_instances/expression_factory_neq.cu similarity index 76% rename from dali/operators/expressions/expression_factory_instances/expression_factory_neq.cu rename to dali/operators/math/expressions/expression_factory_instances/expression_factory_neq.cu index dbdccd65..4a208e7b 100644 --- a/dali/operators/expressions/expression_factory_instances/expression_factory_neq.cu +++ b/dali/operators/math/expressions/expression_factory_instances/expression_factory_neq.cu @@ -14,9 +14,9 @@ // limitations under the License. #include "dali/core/static_switch.h" -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_impl_gpu.cuh" -#include "dali/operators/expressions/expression_factory_instances/expression_impl_factory.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_impl_gpu.cuh" +#include "dali/operators/math/expressions/expression_factory_instances/expression_impl_factory.h" namespace dali { diff --git a/dali/operators/expressions/expression_factory_instances/expression_factory_plus.cc b/dali/operators/math/expressions/expression_factory_instances/expression_factory_plus.cc similarity index 75% rename from dali/operators/expressions/expression_factory_instances/expression_factory_plus.cc rename to dali/operators/math/expressions/expression_factory_instances/expression_factory_plus.cc index 89f91df6..a83948e7 100644 --- a/dali/operators/expressions/expression_factory_instances/expression_factory_plus.cc +++ b/dali/operators/math/expressions/expression_factory_instances/expression_factory_plus.cc @@ -13,9 +13,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_impl_cpu.h" -#include "dali/operators/expressions/expression_factory_instances/expression_impl_factory.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_impl_cpu.h" +#include "dali/operators/math/expressions/expression_factory_instances/expression_impl_factory.h" namespace dali { diff --git a/dali/operators/expressions/expression_factory_instances/expression_factory_plus.cu b/dali/operators/math/expressions/expression_factory_instances/expression_factory_plus.cu similarity index 76% rename from dali/operators/expressions/expression_factory_instances/expression_factory_plus.cu rename to dali/operators/math/expressions/expression_factory_instances/expression_factory_plus.cu index fe9b55d8..5a1fb506 100644 --- a/dali/operators/expressions/expression_factory_instances/expression_factory_plus.cu +++ b/dali/operators/math/expressions/expression_factory_instances/expression_factory_plus.cu @@ -14,9 +14,9 @@ // limitations under the License. #include "dali/core/static_switch.h" -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_impl_gpu.cuh" -#include "dali/operators/expressions/expression_factory_instances/expression_impl_factory.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_impl_gpu.cuh" +#include "dali/operators/math/expressions/expression_factory_instances/expression_impl_factory.h" namespace dali { diff --git a/dali/operators/expressions/expression_factory_instances/expression_factory_sub.cc b/dali/operators/math/expressions/expression_factory_instances/expression_factory_sub.cc similarity index 75% rename from dali/operators/expressions/expression_factory_instances/expression_factory_sub.cc rename to dali/operators/math/expressions/expression_factory_instances/expression_factory_sub.cc index cd4a236b..31a8d8f1 100644 --- a/dali/operators/expressions/expression_factory_instances/expression_factory_sub.cc +++ b/dali/operators/math/expressions/expression_factory_instances/expression_factory_sub.cc @@ -13,9 +13,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_impl_cpu.h" -#include "dali/operators/expressions/expression_factory_instances/expression_impl_factory.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_impl_cpu.h" +#include "dali/operators/math/expressions/expression_factory_instances/expression_impl_factory.h" namespace dali { diff --git a/dali/operators/expressions/expression_factory_instances/expression_factory_sub.cu b/dali/operators/math/expressions/expression_factory_instances/expression_factory_sub.cu similarity index 76% rename from dali/operators/expressions/expression_factory_instances/expression_factory_sub.cu rename to dali/operators/math/expressions/expression_factory_instances/expression_factory_sub.cu index b8dc3fcf..0cf8a062 100644 --- a/dali/operators/expressions/expression_factory_instances/expression_factory_sub.cu +++ b/dali/operators/math/expressions/expression_factory_instances/expression_factory_sub.cu @@ -14,9 +14,9 @@ // limitations under the License. #include "dali/core/static_switch.h" -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_impl_gpu.cuh" -#include "dali/operators/expressions/expression_factory_instances/expression_impl_factory.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_impl_gpu.cuh" +#include "dali/operators/math/expressions/expression_factory_instances/expression_impl_factory.h" namespace dali { diff --git a/dali/operators/expressions/expression_factory_instances/expression_impl_factory.h b/dali/operators/math/expressions/expression_factory_instances/expression_impl_factory.h similarity index 97% rename from dali/operators/expressions/expression_factory_instances/expression_impl_factory.h rename to dali/operators/math/expressions/expression_factory_instances/expression_impl_factory.h index 55ca4b08..190074db 100644 --- a/dali/operators/expressions/expression_factory_instances/expression_impl_factory.h +++ b/dali/operators/math/expressions/expression_factory_instances/expression_impl_factory.h @@ -13,13 +13,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_EXPRESSIONS_EXPRESSION_FACTORY_INSTANCES_EXPRESSION_IMPL_FACTORY_H_ -#define DALI_OPERATORS_EXPRESSIONS_EXPRESSION_FACTORY_INSTANCES_EXPRESSION_IMPL_FACTORY_H_ +#ifndef DALI_OPERATORS_MATH_EXPRESSIONS_EXPRESSION_FACTORY_INSTANCES_EXPRESSION_IMPL_FACTORY_H_ +#define DALI_OPERATORS_MATH_EXPRESSIONS_EXPRESSION_FACTORY_INSTANCES_EXPRESSION_IMPL_FACTORY_H_ #include -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_impl_cpu.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_impl_cpu.h" #include "dali/core/static_switch.h" namespace dali { @@ -415,4 +415,4 @@ std::unique_ptr OpFactory(arithm_meta #include "dali/pipeline/data/types.h" -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_impl_factory.h" -#include "dali/operators/expressions/expression_tree.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_impl_factory.h" +#include "dali/operators/math/expressions/expression_tree.h" #include "dali/pipeline/operator/op_spec.h" #include "dali/pipeline/util/backend2workspace_map.h" #include "dali/pipeline/workspace/workspace.h" @@ -124,4 +124,4 @@ class ExprImplCpuTC : public ExprImplBase { } // namespace dali -#endif // DALI_OPERATORS_EXPRESSIONS_EXPRESSION_IMPL_CPU_H_ +#endif // DALI_OPERATORS_MATH_EXPRESSIONS_EXPRESSION_IMPL_CPU_H_ diff --git a/dali/operators/expressions/expression_impl_factory.h b/dali/operators/math/expressions/expression_impl_factory.h similarity index 94% rename from dali/operators/expressions/expression_impl_factory.h rename to dali/operators/math/expressions/expression_impl_factory.h index 05e6c2e1..14cac561 100644 --- a/dali/operators/expressions/expression_impl_factory.h +++ b/dali/operators/math/expressions/expression_impl_factory.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_EXPRESSIONS_EXPRESSION_IMPL_FACTORY_H_ -#define DALI_OPERATORS_EXPRESSIONS_EXPRESSION_IMPL_FACTORY_H_ +#ifndef DALI_OPERATORS_MATH_EXPRESSIONS_EXPRESSION_IMPL_FACTORY_H_ +#define DALI_OPERATORS_MATH_EXPRESSIONS_EXPRESSION_IMPL_FACTORY_H_ #include #include @@ -23,10 +23,10 @@ #include "dali/core/small_vector.h" #include "dali/core/static_switch.h" -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/constant_storage.h" -#include "dali/operators/expressions/expression_tile.h" -#include "dali/operators/expressions/expression_tree.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/constant_storage.h" +#include "dali/operators/math/expressions/expression_tile.h" +#include "dali/operators/math/expressions/expression_tree.h" #include "dali/pipeline/data/types.h" #include "dali/pipeline/util/backend2workspace_map.h" #include "dali/pipeline/workspace/workspace.h" @@ -178,4 +178,4 @@ struct ExprImplCache { } // namespace dali -#endif // DALI_OPERATORS_EXPRESSIONS_EXPRESSION_IMPL_FACTORY_H_ +#endif // DALI_OPERATORS_MATH_EXPRESSIONS_EXPRESSION_IMPL_FACTORY_H_ diff --git a/dali/operators/expressions/expression_impl_factory_cpu.cc b/dali/operators/math/expressions/expression_impl_factory_cpu.cc similarity index 87% rename from dali/operators/expressions/expression_impl_factory_cpu.cc rename to dali/operators/math/expressions/expression_impl_factory_cpu.cc index 5e6dad87..04c50c7b 100644 --- a/dali/operators/expressions/expression_impl_factory_cpu.cc +++ b/dali/operators/math/expressions/expression_impl_factory_cpu.cc @@ -15,11 +15,11 @@ #include #include "dali/core/static_switch.h" -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_factory_instances/expression_impl_factory.h" -#include "dali/operators/expressions/expression_impl_cpu.h" -#include "dali/operators/expressions/expression_impl_factory.h" -#include "dali/operators/expressions/expression_tree.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_factory_instances/expression_impl_factory.h" +#include "dali/operators/math/expressions/expression_impl_cpu.h" +#include "dali/operators/math/expressions/expression_impl_factory.h" +#include "dali/operators/math/expressions/expression_tree.h" namespace dali { diff --git a/dali/operators/expressions/expression_impl_factory_gpu.cu b/dali/operators/math/expressions/expression_impl_factory_gpu.cu similarity index 87% rename from dali/operators/expressions/expression_impl_factory_gpu.cu rename to dali/operators/math/expressions/expression_impl_factory_gpu.cu index 4cca1bab..9effdbb2 100644 --- a/dali/operators/expressions/expression_impl_factory_gpu.cu +++ b/dali/operators/math/expressions/expression_impl_factory_gpu.cu @@ -15,11 +15,11 @@ #include #include "dali/core/static_switch.h" -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_factory_instances/expression_impl_factory.h" -#include "dali/operators/expressions/expression_impl_factory.h" -#include "dali/operators/expressions/expression_impl_gpu.cuh" -#include "dali/operators/expressions/expression_tree.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_factory_instances/expression_impl_factory.h" +#include "dali/operators/math/expressions/expression_impl_factory.h" +#include "dali/operators/math/expressions/expression_impl_gpu.cuh" +#include "dali/operators/math/expressions/expression_tree.h" namespace dali { diff --git a/dali/operators/expressions/expression_impl_gpu.cuh b/dali/operators/math/expressions/expression_impl_gpu.cuh similarity index 94% rename from dali/operators/expressions/expression_impl_gpu.cuh rename to dali/operators/math/expressions/expression_impl_gpu.cuh index 45ad1702..58eedd86 100644 --- a/dali/operators/expressions/expression_impl_gpu.cuh +++ b/dali/operators/math/expressions/expression_impl_gpu.cuh @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_EXPRESSIONS_EXPRESSION_IMPL_GPU_CUH_ -#define DALI_OPERATORS_EXPRESSIONS_EXPRESSION_IMPL_GPU_CUH_ +#ifndef DALI_OPERATORS_MATH_EXPRESSIONS_EXPRESSION_IMPL_GPU_CUH_ +#define DALI_OPERATORS_MATH_EXPRESSIONS_EXPRESSION_IMPL_GPU_CUH_ #include #include "dali/pipeline/data/types.h" -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_impl_factory.h" -#include "dali/operators/expressions/expression_tree.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_impl_factory.h" +#include "dali/operators/math/expressions/expression_tree.h" #include "dali/pipeline/operator/op_spec.h" #include "dali/pipeline/util/backend2workspace_map.h" #include "dali/pipeline/workspace/workspace.h" @@ -168,4 +168,4 @@ using ExprImplGpuTC = ExprImplGPUInvoke #include @@ -21,7 +21,7 @@ #include #include -#include "dali/operators/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" #include "dali/pipeline/data/types.h" #include "dali/pipeline/util/backend2workspace_map.h" #include "dali/pipeline/workspace/workspace.h" @@ -78,4 +78,4 @@ struct ExtendedTileDesc { } // namespace dali -#endif // DALI_OPERATORS_EXPRESSIONS_EXPRESSION_TILE_H_ +#endif // DALI_OPERATORS_MATH_EXPRESSIONS_EXPRESSION_TILE_H_ diff --git a/dali/operators/expressions/expression_tree.cc b/dali/operators/math/expressions/expression_tree.cc similarity index 97% rename from dali/operators/expressions/expression_tree.cc rename to dali/operators/math/expressions/expression_tree.cc index 92dcfadd..e40630b6 100644 --- a/dali/operators/expressions/expression_tree.cc +++ b/dali/operators/math/expressions/expression_tree.cc @@ -20,9 +20,9 @@ #include "dali/core/format.h" #include "dali/core/static_switch.h" -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_impl_cpu.h" -#include "dali/operators/expressions/expression_tree.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_impl_cpu.h" +#include "dali/operators/math/expressions/expression_tree.h" namespace dali { diff --git a/dali/operators/expressions/expression_tree.h b/dali/operators/math/expressions/expression_tree.h similarity index 94% rename from dali/operators/expressions/expression_tree.h rename to dali/operators/math/expressions/expression_tree.h index 8b2efbdb..20ad9aa5 100644 --- a/dali/operators/expressions/expression_tree.h +++ b/dali/operators/math/expressions/expression_tree.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_EXPRESSIONS_EXPRESSION_TREE_H_ -#define DALI_OPERATORS_EXPRESSIONS_EXPRESSION_TREE_H_ +#ifndef DALI_OPERATORS_MATH_EXPRESSIONS_EXPRESSION_TREE_H_ +#define DALI_OPERATORS_MATH_EXPRESSIONS_EXPRESSION_TREE_H_ #include #include @@ -21,8 +21,8 @@ #include #include -#include "dali/operators/expressions/arithmetic_meta.h" -#include "dali/operators/expressions/expression_tile.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/expression_tile.h" #include "dali/pipeline/data/types.h" #include "dali/pipeline/util/backend2workspace_map.h" #include "dali/pipeline/workspace/workspace.h" @@ -232,4 +232,4 @@ inline bool IsScalarLike(const ExprNode &node) { } // namespace dali -#endif // DALI_OPERATORS_EXPRESSIONS_EXPRESSION_TREE_H_ +#endif // DALI_OPERATORS_MATH_EXPRESSIONS_EXPRESSION_TREE_H_ diff --git a/dali/operators/expressions/expression_tree_test.cc b/dali/operators/math/expressions/expression_tree_test.cc similarity index 96% rename from dali/operators/expressions/expression_tree_test.cc rename to dali/operators/math/expressions/expression_tree_test.cc index abdbb75a..a1cd3369 100644 --- a/dali/operators/expressions/expression_tree_test.cc +++ b/dali/operators/math/expressions/expression_tree_test.cc @@ -20,8 +20,8 @@ #include "dali/core/static_switch.h" #include "dali/pipeline/data/types.h" -#include "dali/operators/expressions/arithmetic.h" -#include "dali/operators/expressions/arithmetic_meta.h" +#include "dali/operators/math/expressions/arithmetic.h" +#include "dali/operators/math/expressions/arithmetic_meta.h" #include "dali/pipeline/pipeline.h" #include "dali/test/dali_operator_test.h" diff --git a/dali/operators/support/random/CMakeLists.txt b/dali/operators/random/CMakeLists.txt similarity index 100% rename from dali/operators/support/random/CMakeLists.txt rename to dali/operators/random/CMakeLists.txt diff --git a/dali/operators/support/random/coin_flip.cc b/dali/operators/random/coin_flip.cc similarity index 95% rename from dali/operators/support/random/coin_flip.cc rename to dali/operators/random/coin_flip.cc index b28842f3..59d7e822 100644 --- a/dali/operators/support/random/coin_flip.cc +++ b/dali/operators/random/coin_flip.cc @@ -13,7 +13,7 @@ // limitations under the License. -#include "dali/operators/support/random/coin_flip.h" +#include "dali/operators/random/coin_flip.h" namespace dali { diff --git a/dali/operators/support/random/coin_flip.h b/dali/operators/random/coin_flip.h similarity index 91% rename from dali/operators/support/random/coin_flip.h rename to dali/operators/random/coin_flip.h index 90bfd892..a1a885f5 100644 --- a/dali/operators/support/random/coin_flip.h +++ b/dali/operators/random/coin_flip.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_SUPPORT_RANDOM_COIN_FLIP_H_ -#define DALI_OPERATORS_SUPPORT_RANDOM_COIN_FLIP_H_ +#ifndef DALI_OPERATORS_RANDOM_COIN_FLIP_H_ +#define DALI_OPERATORS_RANDOM_COIN_FLIP_H_ #include #include @@ -57,4 +57,4 @@ class CoinFlip : public Operator { } // namespace dali -#endif // DALI_OPERATORS_SUPPORT_RANDOM_COIN_FLIP_H_ +#endif // DALI_OPERATORS_RANDOM_COIN_FLIP_H_ diff --git a/dali/operators/util/normal_distribution_op.cc b/dali/operators/random/normal_distribution_op.cc similarity index 98% rename from dali/operators/util/normal_distribution_op.cc rename to dali/operators/random/normal_distribution_op.cc index 578b8263..fddce704 100644 --- a/dali/operators/util/normal_distribution_op.cc +++ b/dali/operators/random/normal_distribution_op.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/util/normal_distribution_op.h" +#include "dali/operators/random/normal_distribution_op.h" #include "dali/core/static_switch.h" #define NORM_TYPES (uint8_t, int8_t, uint16_t, int16_t, uint32_t, int32_t, uint64_t, int64_t, \ diff --git a/dali/operators/util/normal_distribution_op.h b/dali/operators/random/normal_distribution_op.h similarity index 96% rename from dali/operators/util/normal_distribution_op.h rename to dali/operators/random/normal_distribution_op.h index a5e5ba3c..4171bbb5 100644 --- a/dali/operators/util/normal_distribution_op.h +++ b/dali/operators/random/normal_distribution_op.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_UTIL_NORMAL_DISTRIBUTION_OP_H_ -#define DALI_OPERATORS_UTIL_NORMAL_DISTRIBUTION_OP_H_ +#ifndef DALI_OPERATORS_RANDOM_NORMAL_DISTRIBUTION_OP_H_ +#define DALI_OPERATORS_RANDOM_NORMAL_DISTRIBUTION_OP_H_ #include #include @@ -144,4 +144,4 @@ class NormalDistributionCpu : public NormalDistribution { } // namespace dali -#endif // DALI_OPERATORS_UTIL_NORMAL_DISTRIBUTION_OP_H_ +#endif // DALI_OPERATORS_RANDOM_NORMAL_DISTRIBUTION_OP_H_ diff --git a/dali/operators/support/random/uniform.cc b/dali/operators/random/uniform.cc similarity index 96% rename from dali/operators/support/random/uniform.cc rename to dali/operators/random/uniform.cc index 7e47531c..f142064b 100644 --- a/dali/operators/support/random/uniform.cc +++ b/dali/operators/random/uniform.cc @@ -12,10 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. - #include - -#include "dali/operators/support/random/uniform.h" +#include "dali/operators/random/uniform.h" namespace dali { diff --git a/dali/operators/support/random/uniform.h b/dali/operators/random/uniform.h similarity index 92% rename from dali/operators/support/random/uniform.h rename to dali/operators/random/uniform.h index 6c5ac3df..b3e50b6b 100644 --- a/dali/operators/support/random/uniform.h +++ b/dali/operators/random/uniform.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_SUPPORT_RANDOM_UNIFORM_H_ -#define DALI_OPERATORS_SUPPORT_RANDOM_UNIFORM_H_ +#ifndef DALI_OPERATORS_RANDOM_UNIFORM_H_ +#define DALI_OPERATORS_RANDOM_UNIFORM_H_ #include #include @@ -67,4 +67,4 @@ class Uniform : public Operator { } // namespace dali -#endif // DALI_OPERATORS_SUPPORT_RANDOM_UNIFORM_H_ +#endif // DALI_OPERATORS_RANDOM_UNIFORM_H_ diff --git a/dali/operators/sequence/CMakeLists.txt b/dali/operators/sequence/CMakeLists.txt index 10f674aa..e37e481d 100644 --- a/dali/operators/sequence/CMakeLists.txt +++ b/dali/operators/sequence/CMakeLists.txt @@ -13,6 +13,10 @@ # limitations under the License. # Get all the source files and dump test files +if (BUILD_NVOF) + add_subdirectory(optical_flow) +endif() + collect_headers(DALI_INST_HDRS PARENT_SCOPE) collect_sources(DALI_OPERATOR_SRCS PARENT_SCOPE) collect_test_sources(DALI_OPERATOR_TEST_SRCS PARENT_SCOPE) diff --git a/dali/operators/optical_flow/CMakeLists.txt b/dali/operators/sequence/optical_flow/CMakeLists.txt similarity index 100% rename from dali/operators/optical_flow/CMakeLists.txt rename to dali/operators/sequence/optical_flow/CMakeLists.txt diff --git a/dali/operators/optical_flow/optical_flow.cc b/dali/operators/sequence/optical_flow/optical_flow.cc similarity index 98% rename from dali/operators/optical_flow/optical_flow.cc rename to dali/operators/sequence/optical_flow/optical_flow.cc index 80487b52..f8cda2b0 100644 --- a/dali/operators/optical_flow/optical_flow.cc +++ b/dali/operators/sequence/optical_flow/optical_flow.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "dali/pipeline/data/views.h" -#include "dali/operators/optical_flow/optical_flow.h" +#include "dali/operators/sequence/optical_flow/optical_flow.h" namespace dali { diff --git a/dali/operators/optical_flow/optical_flow.h b/dali/operators/sequence/optical_flow/optical_flow.h similarity index 95% rename from dali/operators/optical_flow/optical_flow.h rename to dali/operators/sequence/optical_flow/optical_flow.h index 03939a80..063e0fc4 100644 --- a/dali/operators/optical_flow/optical_flow.h +++ b/dali/operators/sequence/optical_flow/optical_flow.h @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_OPTICAL_FLOW_OPTICAL_FLOW_H_ -#define DALI_OPERATORS_OPTICAL_FLOW_OPTICAL_FLOW_H_ +#ifndef DALI_OPERATORS_SEQUENCE_OPTICAL_FLOW_OPTICAL_FLOW_H_ +#define DALI_OPERATORS_SEQUENCE_OPTICAL_FLOW_OPTICAL_FLOW_H_ #include #include #include "dali/pipeline/data/views.h" #include "dali/pipeline/data/backend.h" #include "dali/pipeline/operator/operator.h" -#include "dali/operators/optical_flow/optical_flow_adapter/optical_flow_stub.h" -#include "dali/operators/optical_flow/turing_of/optical_flow_turing.h" +#include "dali/operators/sequence/optical_flow/optical_flow_adapter/optical_flow_stub.h" +#include "dali/operators/sequence/optical_flow/turing_of/optical_flow_turing.h" namespace dali { @@ -180,4 +180,4 @@ class OpticalFlow : public Operator { } // namespace dali -#endif // DALI_OPERATORS_OPTICAL_FLOW_OPTICAL_FLOW_H_ +#endif // DALI_OPERATORS_SEQUENCE_OPTICAL_FLOW_OPTICAL_FLOW_H_ diff --git a/dali/operators/optical_flow/optical_flow_adapter/CMakeLists.txt b/dali/operators/sequence/optical_flow/optical_flow_adapter/CMakeLists.txt similarity index 100% rename from dali/operators/optical_flow/optical_flow_adapter/CMakeLists.txt rename to dali/operators/sequence/optical_flow/optical_flow_adapter/CMakeLists.txt diff --git a/dali/operators/optical_flow/optical_flow_adapter/optical_flow_adapter.h b/dali/operators/sequence/optical_flow/optical_flow_adapter/optical_flow_adapter.h similarity index 88% rename from dali/operators/optical_flow/optical_flow_adapter/optical_flow_adapter.h rename to dali/operators/sequence/optical_flow/optical_flow_adapter/optical_flow_adapter.h index 45c58f0a..d9385de1 100644 --- a/dali/operators/optical_flow/optical_flow_adapter/optical_flow_adapter.h +++ b/dali/operators/sequence/optical_flow/optical_flow_adapter/optical_flow_adapter.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_OPTICAL_FLOW_OPTICAL_FLOW_ADAPTER_OPTICAL_FLOW_ADAPTER_H_ -#define DALI_OPERATORS_OPTICAL_FLOW_OPTICAL_FLOW_ADAPTER_OPTICAL_FLOW_ADAPTER_H_ +#ifndef DALI_OPERATORS_SEQUENCE_OPTICAL_FLOW_OPTICAL_FLOW_ADAPTER_OPTICAL_FLOW_ADAPTER_H_ +#define DALI_OPERATORS_SEQUENCE_OPTICAL_FLOW_OPTICAL_FLOW_ADAPTER_OPTICAL_FLOW_ADAPTER_H_ #include @@ -72,4 +72,4 @@ class DLL_PUBLIC OpticalFlowAdapter { } // namespace optical_flow } // namespace dali -#endif // DALI_OPERATORS_OPTICAL_FLOW_OPTICAL_FLOW_ADAPTER_OPTICAL_FLOW_ADAPTER_H_ +#endif // DALI_OPERATORS_SEQUENCE_OPTICAL_FLOW_OPTICAL_FLOW_ADAPTER_OPTICAL_FLOW_ADAPTER_H_ diff --git a/dali/operators/optical_flow/optical_flow_adapter/optical_flow_adapter_test.cc b/dali/operators/sequence/optical_flow/optical_flow_adapter/optical_flow_adapter_test.cc similarity index 96% rename from dali/operators/optical_flow/optical_flow_adapter/optical_flow_adapter_test.cc rename to dali/operators/sequence/optical_flow/optical_flow_adapter/optical_flow_adapter_test.cc index 9960c6ef..88b2bd53 100644 --- a/dali/operators/optical_flow/optical_flow_adapter/optical_flow_adapter_test.cc +++ b/dali/operators/sequence/optical_flow/optical_flow_adapter/optical_flow_adapter_test.cc @@ -16,7 +16,7 @@ #include #include "dali/core/backend_tags.h" -#include "dali/operators/optical_flow/optical_flow_adapter/optical_flow_stub.h" +#include "dali/operators/sequence/optical_flow/optical_flow_adapter/optical_flow_stub.h" #include "dali/core/cuda_utils.h" namespace dali { diff --git a/dali/operators/optical_flow/optical_flow_adapter/optical_flow_stub.h b/dali/operators/sequence/optical_flow/optical_flow_adapter/optical_flow_stub.h similarity index 88% rename from dali/operators/optical_flow/optical_flow_adapter/optical_flow_stub.h rename to dali/operators/sequence/optical_flow/optical_flow_adapter/optical_flow_stub.h index db8023aa..0a56e9b6 100644 --- a/dali/operators/optical_flow/optical_flow_adapter/optical_flow_stub.h +++ b/dali/operators/sequence/optical_flow/optical_flow_adapter/optical_flow_stub.h @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_OPTICAL_FLOW_OPTICAL_FLOW_ADAPTER_OPTICAL_FLOW_STUB_H_ -#define DALI_OPERATORS_OPTICAL_FLOW_OPTICAL_FLOW_ADAPTER_OPTICAL_FLOW_STUB_H_ +#ifndef DALI_OPERATORS_SEQUENCE_OPTICAL_FLOW_OPTICAL_FLOW_ADAPTER_OPTICAL_FLOW_STUB_H_ +#define DALI_OPERATORS_SEQUENCE_OPTICAL_FLOW_OPTICAL_FLOW_ADAPTER_OPTICAL_FLOW_STUB_H_ #include #include "dali/core/tensor_view.h" -#include "dali/operators/optical_flow/optical_flow_adapter/optical_flow_adapter.h" +#include "dali/operators/sequence/optical_flow/optical_flow_adapter/optical_flow_adapter.h" namespace dali { namespace optical_flow { @@ -77,4 +77,4 @@ inline void OpticalFlowStub::CalcOpticalFlow( } // namespace optical_flow } // namespace dali -#endif // DALI_OPERATORS_OPTICAL_FLOW_OPTICAL_FLOW_ADAPTER_OPTICAL_FLOW_STUB_H_ +#endif // DALI_OPERATORS_SEQUENCE_OPTICAL_FLOW_OPTICAL_FLOW_ADAPTER_OPTICAL_FLOW_STUB_H_ diff --git a/dali/operators/optical_flow/optical_flow_test.cc b/dali/operators/sequence/optical_flow/optical_flow_test.cc similarity index 97% rename from dali/operators/optical_flow/optical_flow_test.cc rename to dali/operators/sequence/optical_flow/optical_flow_test.cc index 13b22f7b..91013e80 100644 --- a/dali/operators/optical_flow/optical_flow_test.cc +++ b/dali/operators/sequence/optical_flow/optical_flow_test.cc @@ -18,7 +18,7 @@ #include #include -#include "dali/operators/optical_flow/optical_flow.h" +#include "dali/operators/sequence/optical_flow/optical_flow.h" #include "dali/test/dali_operator_test.h" #include "dali/test/dali_operator_test_utils.h" #include "dali/test/dali_test_config.h" diff --git a/dali/operators/optical_flow/turing_of/CMakeLists.txt b/dali/operators/sequence/optical_flow/turing_of/CMakeLists.txt similarity index 100% rename from dali/operators/optical_flow/turing_of/CMakeLists.txt rename to dali/operators/sequence/optical_flow/turing_of/CMakeLists.txt diff --git a/dali/operators/optical_flow/turing_of/optical_flow_buffer.h b/dali/operators/sequence/optical_flow/turing_of/optical_flow_buffer.h similarity index 91% rename from dali/operators/optical_flow/turing_of/optical_flow_buffer.h rename to dali/operators/sequence/optical_flow/turing_of/optical_flow_buffer.h index d8e3b370..e395fddd 100644 --- a/dali/operators/optical_flow/turing_of/optical_flow_buffer.h +++ b/dali/operators/sequence/optical_flow/turing_of/optical_flow_buffer.h @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_OPTICAL_FLOW_TURING_OF_OPTICAL_FLOW_BUFFER_H_ -#define DALI_OPERATORS_OPTICAL_FLOW_TURING_OF_OPTICAL_FLOW_BUFFER_H_ +#ifndef DALI_OPERATORS_SEQUENCE_OPTICAL_FLOW_TURING_OF_OPTICAL_FLOW_BUFFER_H_ +#define DALI_OPERATORS_SEQUENCE_OPTICAL_FLOW_TURING_OF_OPTICAL_FLOW_BUFFER_H_ #include #include "dali/core/error_handling.h" -#include "dali/operators/optical_flow/turing_of/utils.h" +#include "dali/operators/sequence/optical_flow/turing_of/utils.h" #include namespace dali { @@ -111,4 +111,4 @@ class OpticalFlowBuffer { } // namespace optical_flow } // namespace dali -#endif // DALI_OPERATORS_OPTICAL_FLOW_TURING_OF_OPTICAL_FLOW_BUFFER_H_ +#endif // DALI_OPERATORS_SEQUENCE_OPTICAL_FLOW_TURING_OF_OPTICAL_FLOW_BUFFER_H_ diff --git a/dali/operators/optical_flow/turing_of/optical_flow_turing.cc b/dali/operators/sequence/optical_flow/turing_of/optical_flow_turing.cc similarity index 99% rename from dali/operators/optical_flow/turing_of/optical_flow_turing.cc rename to dali/operators/sequence/optical_flow/turing_of/optical_flow_turing.cc index 4314e6b3..abfb0ddd 100644 --- a/dali/operators/optical_flow/turing_of/optical_flow_turing.cc +++ b/dali/operators/sequence/optical_flow/turing_of/optical_flow_turing.cc @@ -14,7 +14,7 @@ #include -#include "dali/operators/optical_flow/turing_of/optical_flow_turing.h" +#include "dali/operators/sequence/optical_flow/turing_of/optical_flow_turing.h" #include "dali/core/device_guard.h" namespace dali { diff --git a/dali/operators/optical_flow/turing_of/optical_flow_turing.cu b/dali/operators/sequence/optical_flow/turing_of/optical_flow_turing.cu similarity index 98% rename from dali/operators/optical_flow/turing_of/optical_flow_turing.cu rename to dali/operators/sequence/optical_flow/turing_of/optical_flow_turing.cu index 7a7bf8cc..e18a5959 100644 --- a/dali/operators/optical_flow/turing_of/optical_flow_turing.cu +++ b/dali/operators/sequence/optical_flow/turing_of/optical_flow_turing.cu @@ -13,7 +13,7 @@ // limitations under the License. #include "dali/core/error_handling.h" -#include "dali/operators/optical_flow/turing_of/optical_flow_turing.h" +#include "dali/operators/sequence/optical_flow/turing_of/optical_flow_turing.h" namespace dali { namespace optical_flow { diff --git a/dali/operators/optical_flow/turing_of/optical_flow_turing.h b/dali/operators/sequence/optical_flow/turing_of/optical_flow_turing.h similarity index 93% rename from dali/operators/optical_flow/turing_of/optical_flow_turing.h rename to dali/operators/sequence/optical_flow/turing_of/optical_flow_turing.h index edb02c31..f8c12387 100644 --- a/dali/operators/optical_flow/turing_of/optical_flow_turing.h +++ b/dali/operators/sequence/optical_flow/turing_of/optical_flow_turing.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_OPTICAL_FLOW_TURING_OF_OPTICAL_FLOW_TURING_H_ -#define DALI_OPERATORS_OPTICAL_FLOW_TURING_OF_OPTICAL_FLOW_TURING_H_ +#ifndef DALI_OPERATORS_SEQUENCE_OPTICAL_FLOW_TURING_OF_OPTICAL_FLOW_TURING_H_ +#define DALI_OPERATORS_SEQUENCE_OPTICAL_FLOW_TURING_OF_OPTICAL_FLOW_TURING_H_ #include #include @@ -23,8 +23,8 @@ #include "nvOpticalFlowCuda.h" #include "nvOpticalFlowCommon.h" #include "dali/core/common.h" -#include "dali/operators/optical_flow/optical_flow_adapter/optical_flow_adapter.h" -#include "dali/operators/optical_flow/turing_of/optical_flow_buffer.h" +#include "dali/operators/sequence/optical_flow/optical_flow_adapter/optical_flow_adapter.h" +#include "dali/operators/sequence/optical_flow/turing_of/optical_flow_buffer.h" namespace dali { namespace optical_flow { @@ -164,4 +164,4 @@ class DLL_PUBLIC OpticalFlowTuring : public OpticalFlowAdapter { } // namespace optical_flow } // namespace dali -#endif // DALI_OPERATORS_OPTICAL_FLOW_TURING_OF_OPTICAL_FLOW_TURING_H_ +#endif // DALI_OPERATORS_SEQUENCE_OPTICAL_FLOW_TURING_OF_OPTICAL_FLOW_TURING_H_ diff --git a/dali/operators/optical_flow/turing_of/optical_flow_turing_test.cc b/dali/operators/sequence/optical_flow/turing_of/optical_flow_turing_test.cc similarity index 99% rename from dali/operators/optical_flow/turing_of/optical_flow_turing_test.cc rename to dali/operators/sequence/optical_flow/turing_of/optical_flow_turing_test.cc index ea88fa78..76568554 100644 --- a/dali/operators/optical_flow/turing_of/optical_flow_turing_test.cc +++ b/dali/operators/sequence/optical_flow/turing_of/optical_flow_turing_test.cc @@ -24,7 +24,7 @@ #include "dali/kernels/alloc.h" #include "dali/kernels/common/copy.h" #include "dali/test/mat2tensor.h" -#include "dali/operators/optical_flow/turing_of/optical_flow_turing.h" +#include "dali/operators/sequence/optical_flow/turing_of/optical_flow_turing.h" #include "dali/test/dali_test_config.h" #include "dali/core/cuda_utils.h" diff --git a/dali/operators/optical_flow/turing_of/utils.h b/dali/operators/sequence/optical_flow/turing_of/utils.h similarity index 87% rename from dali/operators/optical_flow/turing_of/utils.h rename to dali/operators/sequence/optical_flow/turing_of/utils.h index 929d1bad..fec545b6 100644 --- a/dali/operators/optical_flow/turing_of/utils.h +++ b/dali/operators/sequence/optical_flow/turing_of/utils.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_OPTICAL_FLOW_TURING_OF_UTILS_H_ -#define DALI_OPERATORS_OPTICAL_FLOW_TURING_OF_UTILS_H_ +#ifndef DALI_OPERATORS_SEQUENCE_OPTICAL_FLOW_TURING_OF_UTILS_H_ +#define DALI_OPERATORS_SEQUENCE_OPTICAL_FLOW_TURING_OF_UTILS_H_ #define TURING_OF_API_CALL(nvOFAPI) \ do \ @@ -26,4 +26,4 @@ } \ } while (0) -#endif // DALI_OPERATORS_OPTICAL_FLOW_TURING_OF_UTILS_H_ +#endif // DALI_OPERATORS_SEQUENCE_OPTICAL_FLOW_TURING_OF_UTILS_H_ diff --git a/dali/operators/transpose/cutt/CMakeLists.txt b/dali/operators/ssd/CMakeLists.txt similarity index 100% rename from dali/operators/transpose/cutt/CMakeLists.txt rename to dali/operators/ssd/CMakeLists.txt diff --git a/dali/operators/detection/box_encoder.cc b/dali/operators/ssd/box_encoder.cc similarity index 99% rename from dali/operators/detection/box_encoder.cc rename to dali/operators/ssd/box_encoder.cc index c8ed4042..8fbc6f19 100644 --- a/dali/operators/detection/box_encoder.cc +++ b/dali/operators/ssd/box_encoder.cc @@ -15,7 +15,7 @@ #include #include -#include "dali/operators/detection/box_encoder.h" +#include "dali/operators/ssd/box_encoder.h" namespace dali { void BoxEncoder::CalculateIousForBox(float *ious, const BoundingBox &box) const { diff --git a/dali/operators/detection/box_encoder.cu b/dali/operators/ssd/box_encoder.cu similarity index 99% rename from dali/operators/detection/box_encoder.cu rename to dali/operators/ssd/box_encoder.cu index 3ec2f3a6..0e446f78 100644 --- a/dali/operators/detection/box_encoder.cu +++ b/dali/operators/ssd/box_encoder.cu @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "dali/operators/detection/box_encoder.cuh" +#include "dali/operators/ssd/box_encoder.cuh" #include #include #include diff --git a/dali/operators/detection/box_encoder.cuh b/dali/operators/ssd/box_encoder.cuh similarity index 96% rename from dali/operators/detection/box_encoder.cuh rename to dali/operators/ssd/box_encoder.cuh index 871a928b..59fa1063 100644 --- a/dali/operators/detection/box_encoder.cuh +++ b/dali/operators/ssd/box_encoder.cuh @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_DETECTION_BOX_ENCODER_CUH_ -#define DALI_OPERATORS_DETECTION_BOX_ENCODER_CUH_ +#ifndef DALI_OPERATORS_SSD_BOX_ENCODER_CUH_ +#define DALI_OPERATORS_SSD_BOX_ENCODER_CUH_ #include #include #include "dali/core/tensor_shape.h" -#include "dali/operators/detection/box_encoder.h" +#include "dali/operators/ssd/box_encoder.h" namespace dali { template <> diff --git a/dali/operators/detection/box_encoder.h b/dali/operators/ssd/box_encoder.h similarity index 96% rename from dali/operators/detection/box_encoder.h rename to dali/operators/ssd/box_encoder.h index aa7c5d2f..62fd21d7 100644 --- a/dali/operators/detection/box_encoder.h +++ b/dali/operators/ssd/box_encoder.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_DETECTION_BOX_ENCODER_H_ -#define DALI_OPERATORS_DETECTION_BOX_ENCODER_H_ +#ifndef DALI_OPERATORS_SSD_BOX_ENCODER_H_ +#define DALI_OPERATORS_SSD_BOX_ENCODER_H_ #include #include @@ -111,4 +111,4 @@ class BoxEncoder: public Operator { } // namespace dali -#endif // DALI_OPERATORS_DETECTION_BOX_ENCODER_H_ +#endif // DALI_OPERATORS_SSD_BOX_ENCODER_H_ diff --git a/dali/operators/detection/box_encoder_test.cc b/dali/operators/ssd/box_encoder_test.cc similarity index 100% rename from dali/operators/detection/box_encoder_test.cc rename to dali/operators/ssd/box_encoder_test.cc diff --git a/dali/operators/detection/random_crop.cc b/dali/operators/ssd/random_crop.cc similarity index 99% rename from dali/operators/detection/random_crop.cc rename to dali/operators/ssd/random_crop.cc index 1e467d4c..89ab96c4 100644 --- a/dali/operators/detection/random_crop.cc +++ b/dali/operators/ssd/random_crop.cc @@ -18,7 +18,7 @@ #include #include -#include "dali/operators/detection/random_crop.h" +#include "dali/operators/ssd/random_crop.h" #include "dali/pipeline/operator/common.h" #include "dali/util/ocv.h" diff --git a/dali/operators/detection/random_crop.h b/dali/operators/ssd/random_crop.h similarity index 94% rename from dali/operators/detection/random_crop.h rename to dali/operators/ssd/random_crop.h index ee019405..6afd9ed2 100644 --- a/dali/operators/detection/random_crop.h +++ b/dali/operators/ssd/random_crop.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef DALI_OPERATORS_DETECTION_RANDOM_CROP_H_ -#define DALI_OPERATORS_DETECTION_RANDOM_CROP_H_ +#ifndef DALI_OPERATORS_SSD_RANDOM_CROP_H_ +#define DALI_OPERATORS_SSD_RANDOM_CROP_H_ #include #include @@ -96,4 +96,4 @@ class SSDRandomCrop : public Operator { } // namespace dali -#endif // DALI_OPERATORS_DETECTION_RANDOM_CROP_H_ +#endif // DALI_OPERATORS_SSD_RANDOM_CROP_H_ diff --git a/dali/operators/util/CMakeLists.txt b/dali/operators/util/CMakeLists.txt index 4a89bcdd..30466bd8 100644 --- a/dali/operators/util/CMakeLists.txt +++ b/dali/operators/util/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. +# Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License.