From fd8d782941213d8799a150773180612e7840cc97 Mon Sep 17 00:00:00 2001 From: Artur Wojcik Date: Fri, 1 Sep 2023 00:49:51 +0200 Subject: [PATCH] half: fix compiling with HIP SDK 5.7+ on Windows --- driver/driver.hpp | 2 +- driver/reduce_driver.hpp | 2 +- .../host/driver_offline/src/conv_bwd_driver_offline.cpp | 2 +- .../host/driver_offline/src/conv_fwd_driver_offline.cpp | 2 +- src/fusion.cpp | 2 +- src/gemm_v2.cpp | 2 +- src/include/miopen/op_kernel_args.hpp | 2 +- src/include/miopen/reduce_common.hpp | 2 +- src/include/miopen/visit_float.hpp | 2 +- src/solver/conv_asm_1x1u_bias_activ_fused.cpp | 2 +- src/solver/conv_ocl_dir2Dfwd_exhaustive_search.cpp | 2 +- test/cpu_reduce_util.hpp | 2 +- test/driver.hpp | 2 +- test/gpu_reference_kernel.cpp | 2 +- test/serialize.hpp | 2 +- test/tensor_holder.hpp | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/driver/driver.hpp b/driver/driver.hpp index 1aef479dfd..b970369dd1 100644 --- a/driver/driver.hpp +++ b/driver/driver.hpp @@ -26,7 +26,7 @@ #ifndef GUARD_MIOPEN_DRIVER_HPP #define GUARD_MIOPEN_DRIVER_HPP -#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL +#if !defined(_WIN32) && (HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL) #include #else #include diff --git a/driver/reduce_driver.hpp b/driver/reduce_driver.hpp index 9d5787c542..2fa88564ab 100644 --- a/driver/reduce_driver.hpp +++ b/driver/reduce_driver.hpp @@ -43,7 +43,7 @@ #include #include #include -#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL +#if !defined(_WIN32) && (HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL) #include #else #include diff --git a/src/composable_kernel/host/driver_offline/src/conv_bwd_driver_offline.cpp b/src/composable_kernel/host/driver_offline/src/conv_bwd_driver_offline.cpp index b4ed42362f..6853955d33 100644 --- a/src/composable_kernel/host/driver_offline/src/conv_bwd_driver_offline.cpp +++ b/src/composable_kernel/host/driver_offline/src/conv_bwd_driver_offline.cpp @@ -3,7 +3,7 @@ #include #include #include -#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL +#if !defined(_WIN32) && (HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL) #include #else #include diff --git a/src/composable_kernel/host/driver_offline/src/conv_fwd_driver_offline.cpp b/src/composable_kernel/host/driver_offline/src/conv_fwd_driver_offline.cpp index 1bf65fc658..2a78263c49 100644 --- a/src/composable_kernel/host/driver_offline/src/conv_fwd_driver_offline.cpp +++ b/src/composable_kernel/host/driver_offline/src/conv_fwd_driver_offline.cpp @@ -3,7 +3,7 @@ #include #include #include -#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL +#if !defined(_WIN32) && (HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL) #include #else #include diff --git a/src/fusion.cpp b/src/fusion.cpp index 3ec9dd0ec1..d092ff84f2 100644 --- a/src/fusion.cpp +++ b/src/fusion.cpp @@ -39,7 +39,7 @@ #include #include #include -#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL +#if !defined(_WIN32) && (HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL) #include #else #include diff --git a/src/gemm_v2.cpp b/src/gemm_v2.cpp index a75a58ee6b..617466a692 100644 --- a/src/gemm_v2.cpp +++ b/src/gemm_v2.cpp @@ -35,7 +35,7 @@ #endif #if MIOPEN_USE_ROCBLAS -#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL +#if !defined(_WIN32) && (HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL) #include #else #include diff --git a/src/include/miopen/op_kernel_args.hpp b/src/include/miopen/op_kernel_args.hpp index fe733d298b..cd7b6d8f84 100644 --- a/src/include/miopen/op_kernel_args.hpp +++ b/src/include/miopen/op_kernel_args.hpp @@ -3,7 +3,7 @@ #include #include -#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL +#if !defined(_WIN32) && (HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL) #include #else #include diff --git a/src/include/miopen/reduce_common.hpp b/src/include/miopen/reduce_common.hpp index fb3cb265dc..2176102736 100644 --- a/src/include/miopen/reduce_common.hpp +++ b/src/include/miopen/reduce_common.hpp @@ -26,7 +26,7 @@ #ifndef GUARD_MIOPEN_REDUCE_COMMON_HPP #define GUARD_MIOPEN_REDUCE_COMMON_HPP -#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL +#if !defined(_WIN32) && (HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL) #include #else #include diff --git a/src/include/miopen/visit_float.hpp b/src/include/miopen/visit_float.hpp index 8170ce5478..ca856184f8 100644 --- a/src/include/miopen/visit_float.hpp +++ b/src/include/miopen/visit_float.hpp @@ -28,7 +28,7 @@ #define GUARD_MLOPEN_VISIT_FLOAT_HPP #include -#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL +#if !defined(_WIN32) && (HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL) #include #else #include diff --git a/src/solver/conv_asm_1x1u_bias_activ_fused.cpp b/src/solver/conv_asm_1x1u_bias_activ_fused.cpp index c4ae30f859..b1c759b65d 100644 --- a/src/solver/conv_asm_1x1u_bias_activ_fused.cpp +++ b/src/solver/conv_asm_1x1u_bias_activ_fused.cpp @@ -38,7 +38,7 @@ #include #include -#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL +#if !defined(_WIN32) && (HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL) #include #else #include diff --git a/src/solver/conv_ocl_dir2Dfwd_exhaustive_search.cpp b/src/solver/conv_ocl_dir2Dfwd_exhaustive_search.cpp index 7d5d320b81..37f5d34342 100644 --- a/src/solver/conv_ocl_dir2Dfwd_exhaustive_search.cpp +++ b/src/solver/conv_ocl_dir2Dfwd_exhaustive_search.cpp @@ -33,7 +33,7 @@ #include #include #include -#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL +#if !defined(_WIN32) && (HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL) #include #else #include diff --git a/test/cpu_reduce_util.hpp b/test/cpu_reduce_util.hpp index 99be88449d..12d2fe7ceb 100644 --- a/test/cpu_reduce_util.hpp +++ b/test/cpu_reduce_util.hpp @@ -26,7 +26,7 @@ #ifndef GUARD_CPU_REDUCE_UTIL_HPP #define GUARD_CPU_REDUCE_UTIL_HPP -#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL +#if !defined(_WIN32) && (HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL) #include #else #include diff --git a/test/driver.hpp b/test/driver.hpp index fb1e79f264..74a239c308 100644 --- a/test/driver.hpp +++ b/test/driver.hpp @@ -37,7 +37,7 @@ #include #include -#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL +#if !defined(_WIN32) && (HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL) #include #else #include diff --git a/test/gpu_reference_kernel.cpp b/test/gpu_reference_kernel.cpp index 65c7ac4f41..5190ea1a68 100644 --- a/test/gpu_reference_kernel.cpp +++ b/test/gpu_reference_kernel.cpp @@ -36,7 +36,7 @@ #include #include // std::ignore #include -#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL +#if !defined(_WIN32) && (HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL) #include #else #include diff --git a/test/serialize.hpp b/test/serialize.hpp index 0ebe37dab4..848d11f6b0 100644 --- a/test/serialize.hpp +++ b/test/serialize.hpp @@ -29,7 +29,7 @@ #include #include -#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL +#if !defined(_WIN32) && (HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL) #include #else #include diff --git a/test/tensor_holder.hpp b/test/tensor_holder.hpp index e103a1eece..4e935efb29 100644 --- a/test/tensor_holder.hpp +++ b/test/tensor_holder.hpp @@ -36,7 +36,7 @@ #include "serialize.hpp" -#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL +#if !defined(_WIN32) && (HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL) #include #else #include