Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch half.hpp file location reorg #2275

Merged
merged 1 commit into from
Jul 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion driver/driver.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,11 @@
#ifndef GUARD_MIOPEN_DRIVER_HPP
#define GUARD_MIOPEN_DRIVER_HPP

#include "half.hpp"
#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL
#include <half/half.hpp>
#else
#include <half.hpp>
#endif

#include "random.hpp"

Expand Down
4 changes: 4 additions & 0 deletions driver/reduce_driver.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,11 @@
#include <string>
#include <cassert>
#include <type_traits>
#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL
#include <half/half.hpp>
#else
#include <half.hpp>
#endif
#include "random.hpp"

#include "miopen_Reduction.hpp"
Expand Down
2 changes: 1 addition & 1 deletion fin
Copy link
Collaborator Author

@junliume junliume Jul 25, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Submodule fin updated from 55c154 to 389d24
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
#include <initializer_list>
#include <cstdlib>
#include <stdlib.h>
#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL
#include <half/half.hpp>
#else
#include <half.hpp>
#endif
#include "config.hpp"
#include "print.hpp"
#include "device.hpp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
#include <initializer_list>
#include <cstdlib>
#include <stdlib.h>
#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL
#include <half/half.hpp>
#else
#include <half.hpp>
#endif
#include "config.hpp"
#include "print.hpp"
#include "device.hpp"
Expand Down
4 changes: 4 additions & 0 deletions src/fusion.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,11 @@
#include <ios>
#include <algorithm>
#include <string>
#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL
#include <half/half.hpp>
#else
#include <half.hpp>
#endif

#define MIOPEN_CHECK(x) \
if(x != miopenStatusSuccess) \
Expand Down
4 changes: 4 additions & 0 deletions src/gemm_v2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,11 @@
#endif

#if MIOPEN_USE_ROCBLAS
#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL
#include <half/half.hpp>
#else
#include <half.hpp>
#endif
#if MIOPEN_ROCBLAS_VERSION_FLAT < 2045000
#include <rocblas.h>
#else
Expand Down
4 changes: 4 additions & 0 deletions src/include/miopen/op_kernel_args.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@

#include <type_traits>
#include <cstdint>
#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL
#include <half/half.hpp>
#else
#include <half.hpp>
#endif
#include <boost/container/small_vector.hpp>

struct OpKernelArg
Expand Down
4 changes: 4 additions & 0 deletions src/include/miopen/reduce_common.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,11 @@
#ifndef GUARD_MIOPEN_REDUCE_COMMON_HPP
#define GUARD_MIOPEN_REDUCE_COMMON_HPP

#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL
#include <half/half.hpp>
#else
#include <half.hpp>
#endif
#include <miopen/bfloat16.hpp>

namespace reduce {
Expand Down
4 changes: 4 additions & 0 deletions src/include/miopen/visit_float.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@
#define GUARD_MLOPEN_VISIT_FLOAT_HPP

#include <miopen/miopen.h>
#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL
#include <half/half.hpp>
#else
#include <half.hpp>
#endif
#include <miopen/bfloat16.hpp>

namespace miopen {
Expand Down
6 changes: 5 additions & 1 deletion src/solver/conv_asm_1x1u_bias_activ_fused.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,11 @@
#include <miopen/fusion/solvers.hpp>
#include <miopen/fusion/fusion_invoke_params.hpp>

#include "half.hpp"
#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL
#include <half/half.hpp>
#else
#include <half.hpp>
#endif

using half_float::half;

Expand Down
4 changes: 4 additions & 0 deletions src/solver/conv_ocl_dir2Dfwd_exhaustive_search.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,11 @@
#include <miopen/legacy_exhaustive_search.hpp>
#include <miopen/bfloat16.hpp>
#include <miopen/fusion/fusion_invoke_params.hpp>
#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL
#include <half/half.hpp>
#else
#include <half.hpp>
#endif

#ifdef max
#undef max
Expand Down
4 changes: 4 additions & 0 deletions test/cpu_reduce_util.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,11 @@
#ifndef GUARD_CPU_REDUCE_UTIL_HPP
#define GUARD_CPU_REDUCE_UTIL_HPP

#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL
#include <half/half.hpp>
#else
#include <half.hpp>
#endif
#include <limits>
#include <cmath>
#include <cassert>
Expand Down
4 changes: 4 additions & 0 deletions test/driver.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,11 @@

#include <functional>
#include <deque>
#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL
#include <half/half.hpp>
#else
#include <half.hpp>
#endif
#include <type_traits>
#include <boost/filesystem.hpp>
#include <miopen/functional.hpp>
Expand Down
4 changes: 4 additions & 0 deletions test/gpu_reference_kernel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,11 @@
#include <ctime>
#include <tuple> // std::ignore
#include <type_traits>
#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL
#include <half/half.hpp>
#else
#include <half.hpp>
#endif
#include "test.hpp"
#include "driver.hpp"
#include "tensor_holder.hpp"
Expand Down
4 changes: 4 additions & 0 deletions test/serialize.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,11 @@

#include <miopen/rank.hpp>
#include <miopen/each_args.hpp>
#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL
#include <half/half.hpp>
#else
#include <half.hpp>
#endif
#include <fstream>
#include <string>
#include <tuple>
Expand Down
4 changes: 4 additions & 0 deletions test/tensor_holder.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,11 @@

#include "serialize.hpp"

#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL
#include <half/half.hpp>
#else
#include <half.hpp>
#endif
#include <iomanip>
#include <fstream>

Expand Down