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

__KOKKOSBATCHED_ENABLE_AVX__ -> KOKKOSBATCHED_IMPL_ENABLE_AVX #2451

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

__KOKKOSBATCHED_ENABLE_AVX__ -> KOKKOSBATCHED_IMPL_ENABLE_AVX #2451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions batched/dense/impl/KokkosBatched_Vector_SIMD_Arith.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ namespace KokkosBatched {
#define KOKKOSKERNELS_SIMD_ARITH_RETURN_REFERENCE_TYPE(T, l) Vector<SIMD<T>, l> &

/// simd, simd
#if defined(__KOKKOSBATCHED_ENABLE_AVX__)
#if defined(KOKKOSBATCHED_IMPL_ENABLE_AVX)
#if defined(__AVX512F__)
KOKKOS_FORCEINLINE_FUNCTION
static KOKKOSKERNELS_SIMD_ARITH_RETURN_TYPE(double, 8) operator+(const Vector<SIMD<double>, 8> &a,
Expand Down Expand Up @@ -203,7 +203,7 @@ KOKKOS_FORCEINLINE_FUNCTION static KOKKOSKERNELS_SIMD_ARITH_RETURN_REFERENCE_TYP

/// simd, simd

#if defined(__KOKKOSBATCHED_ENABLE_AVX__)
#if defined(KOKKOSBATCHED_IMPL_ENABLE_AVX)
#if defined(__AVX512F__)
KOKKOS_FORCEINLINE_FUNCTION
static KOKKOSKERNELS_SIMD_ARITH_RETURN_TYPE(double, 8) operator-(const Vector<SIMD<double>, 8> &a,
Expand Down Expand Up @@ -390,7 +390,7 @@ KOKKOS_FORCEINLINE_FUNCTION static KOKKOSKERNELS_SIMD_ARITH_RETURN_REFERENCE_TYP

/// simd, simd

#if defined(__KOKKOSBATCHED_ENABLE_AVX__)
#if defined(KOKKOSBATCHED_IMPL_ENABLE_AVX)
#if defined(__AVX512F__)
KOKKOS_FORCEINLINE_FUNCTION
static KOKKOSKERNELS_SIMD_ARITH_RETURN_TYPE(double, 8) operator*(const Vector<SIMD<double>, 8> &a,
Expand Down Expand Up @@ -526,7 +526,7 @@ KOKKOS_FORCEINLINE_FUNCTION static KOKKOSKERNELS_SIMD_ARITH_RETURN_REFERENCE_TYP

/// simd complex, real

#if defined(__KOKKOSBATCHED_ENABLE_AVX__)
#if defined(KOKKOSBATCHED_IMPL_ENABLE_AVX)
#if defined(__AVX512F__)

#if !defined(KOKKOS_COMPILER_GNU)
Expand Down Expand Up @@ -557,7 +557,7 @@ KOKKOS_FORCEINLINE_FUNCTION static KOKKOSKERNELS_SIMD_ARITH_RETURN_TYPE(Kokkos::
return a * Vector<SIMD<Kokkos::complex<T> >, l>(b);
}

#if defined(__KOKKOSBATCHED_ENABLE_AVX__)
#if defined(KOKKOSBATCHED_IMPL_ENABLE_AVX)
#if defined(__AVX512F__)

#if !defined(KOKKOS_COMPILER_GNU)
Expand Down Expand Up @@ -620,7 +620,7 @@ KOKKOS_FORCEINLINE_FUNCTION static KOKKOSKERNELS_SIMD_ARITH_RETURN_REFERENCE_TYP

/// simd, simd

#if defined(__KOKKOSBATCHED_ENABLE_AVX__)
#if defined(KOKKOSBATCHED_IMPL_ENABLE_AVX)
#if defined(__AVX512F__)
KOKKOS_FORCEINLINE_FUNCTION
static KOKKOSKERNELS_SIMD_ARITH_RETURN_TYPE(double, 8) operator/(const Vector<SIMD<double>, 8> &a,
Expand Down Expand Up @@ -746,7 +746,7 @@ KOKKOS_FORCEINLINE_FUNCTION static KOKKOSKERNELS_SIMD_ARITH_RETURN_REFERENCE_TYP
}

/// simd, real
#if defined(__KOKKOSBATCHED_ENABLE_AVX__)
#if defined(KOKKOSBATCHED_IMPL_ENABLE_AVX)
#if defined(__AVX512F__)

#if !defined(KOKKOS_COMPILER_GNU)
Expand Down
10 changes: 5 additions & 5 deletions batched/dense/src/KokkosBatched_Vector_SIMD.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
#include "KokkosKernels_Macros.hpp"

#if defined(__CUDA_ARCH__) || defined(__HIP_DEVICE_COMPILE__)
#undef __KOKKOSBATCHED_ENABLE_AVX__
#else
// compiler bug with AVX in some architectures
#define __KOKKOSBATCHED_ENABLE_AVX__
#undef KOKKOSBATCHED_IMPL_ENABLE_AVX
#else
#define KOKKOSBATCHED_IMPL_ENABLE_AVX
#endif

namespace KokkosBatched {
Expand Down Expand Up @@ -498,7 +498,7 @@ class Vector<SIMD<double>, 4> {
} // namespace KokkosBatched
#endif

#if defined(__KOKKOSBATCHED_ENABLE_AVX__)
#if defined(KOKKOSBATCHED_IMPL_ENABLE_AVX)
#if defined(__AVX__) || defined(__AVX2__)

#if CUDA_VERSION < 12022
Expand Down Expand Up @@ -790,7 +790,7 @@ class Vector<SIMD<Kokkos::complex<double> >, 4> {
} // namespace KokkosBatched

#endif /* #if defined(__AVX512F__) */
#endif /* #if defined(__KOKKOSBATCHED_ENABLE_AVX__) */
#endif /* #if defined(KOKKOSBATCHED_IMPL_ENABLE_AVX) */

#include "KokkosBatched_Vector_SIMD_Arith.hpp"
#include "KokkosBatched_Vector_SIMD_Logical.hpp"
Expand Down
Loading