ROCm · kiritigowda · Nov 27, 2024 · Sep 30, 2024 · Oct 3, 2024 · Oct 7, 2024
diff --git a/include/rppdefs.h b/include/rppdefs.h
@@ -33,6 +33,13 @@ SOFTWARE.
 
 #include <stddef.h>
 #include <cmath>
+#ifdef HIP_COMPILE
+    #include <hip/hip_fp16.h>
+#endif // HIP_COMPILE
+#include <half/half.hpp>
+using halfhpp = half_float::half;
+typedef halfhpp Rpp16f;
+
 #ifdef OCL_COMPILE
 #include <CL/cl.h>
 #endif

diff --git a/src/include/cl/rpp_cl_common.hpp b/src/include/cl/rpp_cl_common.hpp
@@ -33,9 +33,6 @@ SOFTWARE.
 #include <math.h>
 #include <algorithm>
 #include <rppdefs.h>
-#include <half/half.hpp>
-using half_float::half;
-typedef half Rpp16f;
 
 #define __CL_ENABLE_EXCEPTIONS
 #define CL_USE_DEPRECATED_OPENCL_1_2_APIS

diff --git a/src/include/cpu/rpp_cpu_common.hpp b/src/include/cpu/rpp_cpu_common.hpp
@@ -31,9 +31,6 @@ SOFTWARE.
 #include <cstring>
 #include <rppdefs.h>
 #include <omp.h>
-#include <half/half.hpp>
-using halfhpp = half_float::half;
-typedef halfhpp Rpp16f;
 #include "rpp_cpu_simd.hpp"
 
 #define PI                              3.14159265

diff --git a/src/include/cpu/rpp_cpu_simd.hpp b/src/include/cpu/rpp_cpu_simd.hpp
@@ -27,9 +27,6 @@ SOFTWARE.
 
 #include "stdio.h"
 #include "rppdefs.h"
-#include <half/half.hpp>
-using halfhpp = half_float::half;
-typedef halfhpp Rpp16f;
 
 #if _WIN32
 #include <intrin.h>

diff --git a/src/include/hip/rpp_hip_common.hpp b/src/include/hip/rpp_hip_common.hpp
@@ -26,15 +26,11 @@ SOFTWARE.
 #define RPP_HIP_COMMON_H
 
 #include <hip/hip_runtime.h>
-#include <hip/hip_fp16.h>
-#include <half/half.hpp>
 
 #include "rppdefs.h"
 #include "rpp/handle.hpp"
 #include "rpp_hip_roi_conversion.hpp"
 
-using halfhpp = half_float::half;
-typedef halfhpp Rpp16f;
 typedef unsigned char uchar;
 typedef signed char schar;
 typedef struct { uint   data[ 6]; } d_uint6_s;

diff --git a/src/modules/hip/kernel/color_twist.cpp b/src/modules/hip/kernel/color_twist.cpp
@@ -1,9 +1,6 @@
 #include <hip/hip_runtime.h>
-#include <half/half.hpp>
 #include "rpp_hip_host_decls.hpp"
 
-using half_float::half;
-
 #define saturate_8u(value) ((value) > 255 ? 255 : ((value) < 0 ? 0 : (value)))
 #define RPPMIN3(a,b,c) ((a < b) && (a < c) ? a : ((b < c) ? b : c))
 #define RPPMAX3(a,b,c) ((a > b) && (a > c) ? a : ((b > c) ? b : c))

diff --git a/src/modules/hip/kernel/crop.cpp b/src/modules/hip/kernel/crop.cpp
@@ -1,9 +1,6 @@
 #include <hip/hip_runtime.h>
-#include <half/half.hpp>
 #include "rpp_hip_host_decls.hpp"
 
-using half_float::half;
-
 #define saturate_8u(value) ((value) > 255 ? 255 : ((value) < 0 ? 0 : (value)))
 
 extern "C" __global__ void crop_batch(unsigned char *input,

diff --git a/src/modules/hip/kernel/crop_mirror_normalize.cpp b/src/modules/hip/kernel/crop_mirror_normalize.cpp
@@ -1,9 +1,6 @@
 #include <hip/hip_runtime.h>
-#include <half/half.hpp>
 #include "rpp_hip_host_decls.hpp"
 
-using half_float::half;
-
 #define saturate_8u(value) ((value) > 255 ? 255 : ((value) < 0 ? 0 : (value)))
 
 extern "C" __global__ void crop_mirror_normalize_batch(unsigned char *input,

diff --git a/src/modules/hip/kernel/resize.cpp b/src/modules/hip/kernel/resize.cpp
@@ -1,9 +1,6 @@
 #include <hip/hip_runtime.h>
-#include <half/half.hpp>
 #include "rpp_hip_host_decls.hpp"
 
-using half_float::half;
-
 #define saturate_8u(value) ((value) > 255 ? 255 : ((value) < 0 ? 0 : (value)))
 
 extern "C" __global__ void resize_pln(unsigned char *srcPtr,

diff --git a/src/modules/hip/kernel/rotate.cpp b/src/modules/hip/kernel/rotate.cpp
@@ -1,9 +1,6 @@
 #include <hip/hip_runtime.h>
-#include <half/half.hpp>
 #include "rpp_hip_host_decls.hpp"
 
-using half_float::half;
-
 #define saturate_8u(value) ((value) > 255 ? 255 : ((value) < 0 ? 0 : (value)))
 #define PI 3.14159265
 #define RAD(deg) (deg * PI / 180)

diff --git a/src/modules/hip/kernel/warp_affine.cpp b/src/modules/hip/kernel/warp_affine.cpp
@@ -1,9 +1,6 @@
 #include <hip/hip_runtime.h>
-#include <half/half.hpp>
 #include "rpp_hip_host_decls.hpp"
 
-using half_float::half;
-
 extern "C" __global__ void warp_affine_pln(unsigned char *srcPtr,
                                            unsigned char *dstPtr,
                                            float *affine,

diff --git a/src/modules/rppt_tensor_arithmetic_operations.cpp b/src/modules/rppt_tensor_arithmetic_operations.cpp
@@ -28,7 +28,6 @@ SOFTWARE.
 #include "cpu/host_tensor_arithmetic_operations.hpp"
 
 #ifdef HIP_COMPILE
-    #include <hip/hip_fp16.h>
     #include "hip/hip_tensor_arithmetic_operations.hpp"
 #endif // HIP_COMPILE
 

diff --git a/src/modules/rppt_tensor_color_augmentations.cpp b/src/modules/rppt_tensor_color_augmentations.cpp
@@ -28,7 +28,6 @@ SOFTWARE.
 #include "cpu/host_tensor_color_augmentations.hpp"
 
 #ifdef HIP_COMPILE
-    #include <hip/hip_fp16.h>
     #include "hip/hip_tensor_color_augmentations.hpp"
 #endif // HIP_COMPILE
 

diff --git a/src/modules/rppt_tensor_data_exchange_operations.cpp b/src/modules/rppt_tensor_data_exchange_operations.cpp
@@ -28,7 +28,6 @@ SOFTWARE.
 #include "cpu/host_tensor_data_exchange_operations.hpp"
 
 #ifdef HIP_COMPILE
-    #include <hip/hip_fp16.h>
     #include "hip/hip_tensor_data_exchange_operations.hpp"
 #endif // HIP_COMPILE
 

diff --git a/src/modules/rppt_tensor_effects_augmentations.cpp b/src/modules/rppt_tensor_effects_augmentations.cpp
@@ -29,8 +29,7 @@ SOFTWARE.
 #include "cpu/host_tensor_effects_augmentations.hpp"
 
 #ifdef HIP_COMPILE
-#include <hip/hip_fp16.h>
-#include "hip/hip_tensor_effects_augmentations.hpp"
+    #include "hip/hip_tensor_effects_augmentations.hpp"
 #endif // HIP_COMPILE
 
 /******************** gridmask ********************/

diff --git a/src/modules/rppt_tensor_filter_augmentations.cpp b/src/modules/rppt_tensor_filter_augmentations.cpp
@@ -28,7 +28,6 @@ SOFTWARE.
 #include "cpu/host_tensor_filter_augmentations.hpp"
 
 #ifdef HIP_COMPILE
-#include <hip/hip_fp16.h>
 #include "hip/hip_tensor_filter_augmentations.hpp"
 #endif // HIP_COMPILE
 

diff --git a/src/modules/rppt_tensor_geometric_augmentations.cpp b/src/modules/rppt_tensor_geometric_augmentations.cpp
@@ -28,7 +28,6 @@ SOFTWARE.
 #include "cpu/host_tensor_geometric_augmentations.hpp"
 
 #ifdef HIP_COMPILE
-#include <hip/hip_fp16.h>
 #include "hip/hip_tensor_geometric_augmentations.hpp"
 #endif // HIP_COMPILE
 

diff --git a/src/modules/rppt_tensor_logical_operations.cpp b/src/modules/rppt_tensor_logical_operations.cpp
@@ -28,7 +28,6 @@ SOFTWARE.
 #include "cpu/host_tensor_logical_operations.hpp"
 
 #ifdef HIP_COMPILE
-    #include <hip/hip_fp16.h>
     #include "hip/hip_tensor_logical_operations.hpp"
 #endif // HIP_COMPILE
 

diff --git a/src/modules/rppt_tensor_morphological_operations.cpp b/src/modules/rppt_tensor_morphological_operations.cpp
@@ -27,7 +27,6 @@ SOFTWARE.
 #include "rppt_tensor_morphological_operations.h"
 
 #ifdef HIP_COMPILE
-#include <hip/hip_fp16.h>
 #include "hip/hip_tensor_morphological_operations.hpp"
 #endif // HIP_COMPILE
 

diff --git a/src/modules/rppt_tensor_statistical_operations.cpp b/src/modules/rppt_tensor_statistical_operations.cpp
@@ -28,7 +28,6 @@ SOFTWARE.
 #include "cpu/host_tensor_statistical_operations.hpp"
 
 #ifdef HIP_COMPILE
-    #include <hip/hip_fp16.h>
     #include "hip/hip_tensor_statistical_operations.hpp"
 #endif // HIP_COMPILE
 

diff --git a/utilities/test_suite/HIP/Tensor_hip.cpp b/utilities/test_suite/HIP/Tensor_hip.cpp
@@ -36,11 +36,8 @@ SOFTWARE.
 #include <unistd.h>
 #include <time.h>
 #include <omp.h>
-#include <hip/hip_fp16.h>
 #include <fstream>
 
-typedef half Rpp16f;
-
 using namespace cv;
 using namespace std;
 

diff --git a/utilities/test_suite/HOST/Tensor_host.cpp b/utilities/test_suite/HOST/Tensor_host.cpp
@@ -36,15 +36,11 @@ SOFTWARE.
 #include <unistd.h>
 #include <time.h>
 #include <omp.h>
-#include <half/half.hpp>
 #include <fstream>
 
 using namespace cv;
 using namespace std;
 
-using half_float::half;
-typedef half Rpp16f;
-
 int main(int argc, char **argv)
 {
     // Handle inputs

diff --git a/utilities/test_suite/rpp_test_suite_image.h b/utilities/test_suite/rpp_test_suite_image.h
@@ -43,15 +43,6 @@ SOFTWARE.
 #include <map>
 #include <iomanip>
 
-#ifdef GPU_SUPPORT
-    #include <hip/hip_fp16.h>
-#else
-    #include <half/half.hpp>
-    using half_float::half;
-#endif
-
-typedef half Rpp16f;
-
 using namespace cv;
 using namespace std;