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.

Sign up for GitHub

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

Jump to bottom

[hipRTC] Fix conflicting workaround with updated hipRTC #2615

Closed
wants to merge 6 commits into from
Closed

[hipRTC] Fix conflicting workaround with updated hipRTC #2615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3da0045
attempt to fix found issue with hiprtc
junliume Dec 18, 2023
12237d2
Revert "attempt to fix found issue with hiprtc"
junliume Dec 18, 2023
df0b906
Use HIP version instead of removing code
junliume Dec 18, 2023
df7ebce
Remove prolematic GitHub action
junliume Dec 18, 2023
dbbcd83
fix clang tidy issues
junliume Dec 18, 2023
af8bdbf
fix clang format issues
junliume Dec 18, 2023
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
20 changes: 0 additions & 20 deletions .github/workflows/update_develop_nightly.yml
View file
Open in desktop

This file was deleted.

15 changes: 15 additions & 0 deletions src/composable_kernel/composable_kernel/include/utility/config.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,21 @@
#endif
#include "bfloat16_dev.hpp"

#ifdef __HIPCC_RTC__
#ifdef WORKAROUND_ISSUE_HIPRTC_TRUE_TYPE
#if HIP_PACKAGE_VERSION_FLAT >= 6000023494ULL
/// Definitions from <cstdint>, <cmath> conflict with
/// /opt/rocm/include/hip/amd_detail/amd_hip_vector_types.h.

typedef int int32_t;
typedef unsigned int uint32_t;

#endif
#else
#include <cstdint> // int8_t, int16_t
#endif
#endif // __HIPCC_RTC__

// "Constant" address space for kernel parameter
#define CONSTANT __attribute__((address_space(4)))

Expand Down
9 changes: 6 additions & 3 deletions src/composable_kernel/composable_kernel/include/utility/type.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
/// which defines std::true_type as well (which is wrong).

namespace std {
#if(HIP_PACKAGE_VERSION_FLAT < 6000023494ULL)

template <class T>
struct remove_reference
Expand Down Expand Up @@ -62,17 +63,19 @@ struct remove_cv
};

template <class T>
struct is_pointer_helper : std::false_type
struct is_pointer : is_pointer_helper<typename std::remove_cv<T>::type>
{
};

#endif

template <class T>
struct is_pointer_helper<T*> : std::true_type
struct is_pointer_helper : std::false_type
{
};

template <class T>
struct is_pointer : is_pointer_helper<typename std::remove_cv<T>::type>
struct is_pointer_helper<T*> : std::true_type
{
};

Expand Down