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

Rename namespace alpaka::concepts to alpaka::inteface #2410

Merged
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
4 changes: 2 additions & 2 deletions include/alpaka/acc/AccCpuOmp2Blocks.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
// Implementation details.
#include "alpaka/acc/Tag.hpp"
#include "alpaka/core/ClipCast.hpp"
#include "alpaka/core/Concepts.hpp"
#include "alpaka/core/Interface.hpp"
#include "alpaka/dev/DevCpu.hpp"

#include <limits>
Expand Down Expand Up @@ -76,7 +76,7 @@ namespace alpaka
, public rand::RandStdLib
# endif
, public warp::WarpSingleThread
, public concepts::Implements<ConceptAcc, AccCpuOmp2Blocks<TDim, TIdx>>
, public interface::Implements<ConceptAcc, AccCpuOmp2Blocks<TDim, TIdx>>
{
static_assert(
sizeof(TIdx) >= sizeof(int),
Expand Down
4 changes: 2 additions & 2 deletions include/alpaka/acc/AccCpuOmp2Threads.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
// Implementation details.
#include "alpaka/acc/Tag.hpp"
#include "alpaka/core/ClipCast.hpp"
#include "alpaka/core/Concepts.hpp"
#include "alpaka/core/Interface.hpp"
#include "alpaka/dev/DevCpu.hpp"

#include <limits>
Expand Down Expand Up @@ -76,7 +76,7 @@ namespace alpaka
, public rand::RandStdLib
# endif
, public warp::WarpSingleThread
, public concepts::Implements<ConceptAcc, AccCpuOmp2Threads<TDim, TIdx>>
, public interface::Implements<ConceptAcc, AccCpuOmp2Threads<TDim, TIdx>>
{
static_assert(
sizeof(TIdx) >= sizeof(int),
Expand Down
4 changes: 2 additions & 2 deletions include/alpaka/acc/AccCpuSerial.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

// Implementation details.
#include "alpaka/acc/Tag.hpp"
#include "alpaka/core/Concepts.hpp"
#include "alpaka/core/Interface.hpp"
#include "alpaka/dev/DevCpu.hpp"

#include <memory>
Expand Down Expand Up @@ -69,7 +69,7 @@ namespace alpaka
, public rand::RandStdLib
# endif
, public warp::WarpSingleThread
, public concepts::Implements<ConceptAcc, AccCpuSerial<TDim, TIdx>>
, public interface::Implements<ConceptAcc, AccCpuSerial<TDim, TIdx>>
{
static_assert(
sizeof(TIdx) >= sizeof(int),
Expand Down
4 changes: 2 additions & 2 deletions include/alpaka/acc/AccCpuTbbBlocks.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
// Implementation details.
#include "alpaka/acc/Tag.hpp"
#include "alpaka/core/ClipCast.hpp"
#include "alpaka/core/Concepts.hpp"
#include "alpaka/core/Interface.hpp"
#include "alpaka/dev/DevCpu.hpp"

#include <memory>
Expand Down Expand Up @@ -70,7 +70,7 @@ namespace alpaka
, public rand::RandStdLib
# endif
, public warp::WarpSingleThread
, public concepts::Implements<ConceptAcc, AccCpuTbbBlocks<TDim, TIdx>>
, public interface::Implements<ConceptAcc, AccCpuTbbBlocks<TDim, TIdx>>
{
static_assert(
sizeof(TIdx) >= sizeof(int),
Expand Down
4 changes: 2 additions & 2 deletions include/alpaka/acc/AccCpuThreads.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#include "alpaka/acc/Tag.hpp"
#include "alpaka/core/BoostPredef.hpp"
#include "alpaka/core/ClipCast.hpp"
#include "alpaka/core/Concepts.hpp"
#include "alpaka/core/Interface.hpp"
#include "alpaka/dev/DevCpu.hpp"

#include <memory>
Expand Down Expand Up @@ -71,7 +71,7 @@ namespace alpaka
, public rand::RandStdLib
# endif
, public warp::WarpSingleThread
, public concepts::Implements<ConceptAcc, AccCpuThreads<TDim, TIdx>>
, public interface::Implements<ConceptAcc, AccCpuThreads<TDim, TIdx>>
{
static_assert(
sizeof(TIdx) >= sizeof(int),
Expand Down
4 changes: 2 additions & 2 deletions include/alpaka/acc/AccGenericSycl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
// Implementation details.
#include "alpaka/core/BoostPredef.hpp"
#include "alpaka/core/ClipCast.hpp"
#include "alpaka/core/Concepts.hpp"
#include "alpaka/core/Interface.hpp"
#include "alpaka/core/Sycl.hpp"

#include <cstddef>
Expand Down Expand Up @@ -70,7 +70,7 @@ namespace alpaka
, public rand::RandGenericSycl<TDim>
# endif
, public warp::WarpGenericSycl<TDim>
, public concepts::Implements<ConceptAcc, AccGenericSycl<TTag, TDim, TIdx>>
, public interface::Implements<ConceptAcc, AccGenericSycl<TTag, TDim, TIdx>>
{
static_assert(TDim::value > 0, "The SYCL accelerator must have a dimension greater than zero.");

Expand Down
4 changes: 2 additions & 2 deletions include/alpaka/acc/AccGpuUniformCudaHipRt.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@

// Implementation details.
#include "alpaka/core/ClipCast.hpp"
#include "alpaka/core/Concepts.hpp"
#include "alpaka/core/Cuda.hpp"
#include "alpaka/core/Interface.hpp"
#include "alpaka/dev/DevUniformCudaHipRt.hpp"

#include <typeinfo>
Expand Down Expand Up @@ -67,7 +67,7 @@ namespace alpaka
, public rand::RandUniformCudaHipRand<TApi>
# endif
, public warp::WarpUniformCudaHipBuiltIn
, public concepts::Implements<ConceptAcc, AccGpuUniformCudaHipRt<TApi, TDim, TIdx>>
, public interface::Implements<ConceptAcc, AccGpuUniformCudaHipRt<TApi, TDim, TIdx>>
{
static_assert(
sizeof(TIdx) >= sizeof(int),
Expand Down
8 changes: 4 additions & 4 deletions include/alpaka/acc/Traits.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

#include "alpaka/acc/AccDevProps.hpp"
#include "alpaka/core/Common.hpp"
#include "alpaka/core/Concepts.hpp"
#include "alpaka/core/DemangleTypeNames.hpp"
#include "alpaka/core/Interface.hpp"
#include "alpaka/dev/Traits.hpp"
#include "alpaka/dim/Traits.hpp"
#include "alpaka/idx/Traits.hpp"
Expand All @@ -27,7 +27,7 @@ namespace alpaka

//! True if TAcc is an accelerator, i.e. if it implements the ConceptAcc concept.
template<typename TAcc>
inline constexpr bool isAccelerator = concepts::ImplementsConcept<ConceptAcc, TAcc>::value;
inline constexpr bool isAccelerator = interface::ImplementsInterface<ConceptAcc, TAcc>::value;

//! The accelerator traits.
namespace trait
Expand Down Expand Up @@ -89,7 +89,7 @@ namespace alpaka
template<typename TAcc, typename TDev>
ALPAKA_FN_HOST auto getAccDevProps(TDev const& dev) -> AccDevProps<Dim<TAcc>, Idx<TAcc>>
{
using ImplementationBase = concepts::ImplementationBase<ConceptAcc, TAcc>;
using ImplementationBase = interface::ImplementationBase<ConceptAcc, TAcc>;
return trait::GetAccDevProps<ImplementationBase>::getAccDevProps(dev);
}

Expand All @@ -105,7 +105,7 @@ namespace alpaka
namespace trait
{
template<typename TAcc, typename TProperty>
struct QueueType<TAcc, TProperty, std::enable_if_t<concepts::ImplementsConcept<ConceptAcc, TAcc>::value>>
struct QueueType<TAcc, TProperty, std::enable_if_t<interface::ImplementsInterface<ConceptAcc, TAcc>::value>>
{
using type = typename QueueType<typename alpaka::trait::PlatformType<TAcc>::type, TProperty>::type;
};
Expand Down
2 changes: 1 addition & 1 deletion include/alpaka/alpaka.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@
#include "alpaka/core/BoostPredef.hpp"
#include "alpaka/core/ClipCast.hpp"
#include "alpaka/core/Common.hpp"
#include "alpaka/core/Concepts.hpp"
#include "alpaka/core/Cuda.hpp"
#include "alpaka/core/Debug.hpp"
#include "alpaka/core/Hip.hpp"
#include "alpaka/core/Interface.hpp"
#include "alpaka/core/OmpSchedule.hpp"
#include "alpaka/core/Positioning.hpp"
#include "alpaka/core/RemoveRestrict.hpp"
Expand Down
6 changes: 3 additions & 3 deletions include/alpaka/atomic/AtomicHierarchy.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ namespace alpaka
TGridAtomic,
TBlockAtomic,
TThreadAtomic,
concepts::Implements<ConceptAtomicGrids, TGridAtomic>,
concepts::Implements<ConceptAtomicBlocks, TBlockAtomic>,
concepts::Implements<ConceptAtomicThreads, TThreadAtomic>>>>;
interface::Implements<ConceptAtomicGrids, TGridAtomic>,
interface::Implements<ConceptAtomicBlocks, TBlockAtomic>,
interface::Implements<ConceptAtomicThreads, TThreadAtomic>>>>;
} // namespace alpaka
6 changes: 3 additions & 3 deletions include/alpaka/atomic/Traits.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include "alpaka/atomic/Op.hpp"
#include "alpaka/core/Common.hpp"
#include "alpaka/core/Concepts.hpp"
#include "alpaka/core/Interface.hpp"
#include "alpaka/core/Positioning.hpp"

#include <type_traits>
Expand Down Expand Up @@ -76,7 +76,7 @@ namespace alpaka
T const& value,
THierarchy const& = THierarchy()) -> T
{
using ImplementationBase = typename concepts::ImplementationBase<AtomicHierarchyConcept<THierarchy>, TAtomic>;
using ImplementationBase = typename interface::ImplementationBase<AtomicHierarchyConcept<THierarchy>, TAtomic>;
return trait::AtomicOp<TOp, ImplementationBase, T, THierarchy>::atomicOp(atomic, addr, value);
}

Expand All @@ -98,7 +98,7 @@ namespace alpaka
T const& value,
THierarchy const& = THierarchy()) -> T
{
using ImplementationBase = typename concepts::ImplementationBase<AtomicHierarchyConcept<THierarchy>, TAtomic>;
using ImplementationBase = typename interface::ImplementationBase<AtomicHierarchyConcept<THierarchy>, TAtomic>;
return trait::AtomicOp<TOp, ImplementationBase, T, THierarchy>::atomicOp(atomic, addr, compare, value);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace alpaka
{
//! The SYCL block shared memory allocator.
class BlockSharedMemDynGenericSycl
: public concepts::Implements<ConceptBlockSharedDyn, BlockSharedMemDynGenericSycl>
: public interface::Implements<ConceptBlockSharedDyn, BlockSharedMemDynGenericSycl>
{
public:
using BlockSharedMemDynBase = BlockSharedMemDynGenericSycl;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ namespace alpaka
//! memory.
template<std::size_t TStaticAllocKiB = BlockSharedDynMemberAllocKiB>
class alignas(core::vectorization::defaultAlignment) BlockSharedMemDynMember
: public concepts::Implements<ConceptBlockSharedDyn, BlockSharedMemDynMember<TStaticAllocKiB>>
: public interface::Implements<ConceptBlockSharedDyn, BlockSharedMemDynMember<TStaticAllocKiB>>
{
public:
BlockSharedMemDynMember(std::size_t sizeBytes) : m_dynPitch(getPitch(sizeBytes))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include "alpaka/block/shared/dyn/Traits.hpp"
#include "alpaka/core/BoostPredef.hpp"
#include "alpaka/core/Concepts.hpp"
#include "alpaka/core/Interface.hpp"

#include <cstddef>
#include <type_traits>
Expand All @@ -17,7 +17,7 @@ namespace alpaka
{
//! The GPU CUDA/HIP block shared memory allocator.
class BlockSharedMemDynUniformCudaHipBuiltIn
: public concepts::Implements<ConceptBlockSharedDyn, BlockSharedMemDynUniformCudaHipBuiltIn>
: public interface::Implements<ConceptBlockSharedDyn, BlockSharedMemDynUniformCudaHipBuiltIn>
{
};

Expand Down
4 changes: 2 additions & 2 deletions include/alpaka/block/shared/dyn/Traits.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#pragma once

#include "alpaka/core/Common.hpp"
#include "alpaka/core/Concepts.hpp"
#include "alpaka/core/Interface.hpp"

#include <type_traits>

Expand Down Expand Up @@ -38,7 +38,7 @@ namespace alpaka
template<typename T, typename TBlockSharedMemDyn>
ALPAKA_FN_ACC auto getDynSharedMem(TBlockSharedMemDyn const& blockSharedMemDyn) -> T*
{
using ImplementationBase = concepts::ImplementationBase<ConceptBlockSharedDyn, TBlockSharedMemDyn>;
using ImplementationBase = interface::ImplementationBase<ConceptBlockSharedDyn, TBlockSharedMemDyn>;
return trait::GetDynSharedMem<T, ImplementationBase>::getMem(blockSharedMemDyn);
}
} // namespace alpaka
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ namespace alpaka
//! The generic SYCL shared memory allocator.
class BlockSharedMemStGenericSycl
: public alpaka::detail::BlockSharedMemStMemberImpl<>
, public concepts::Implements<ConceptBlockSharedSt, BlockSharedMemStGenericSycl>
, public interface::Implements<ConceptBlockSharedSt, BlockSharedMemStGenericSycl>
{
public:
BlockSharedMemStGenericSycl(sycl::local_accessor<std::byte> accessor)
Expand Down
2 changes: 1 addition & 1 deletion include/alpaka/block/shared/st/BlockSharedMemStMember.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ namespace alpaka
template<std::size_t TDataAlignBytes = core::vectorization::defaultAlignment>
class BlockSharedMemStMember
: public detail::BlockSharedMemStMemberImpl<TDataAlignBytes>
, public concepts::Implements<ConceptBlockSharedSt, BlockSharedMemStMember<TDataAlignBytes>>
, public interface::Implements<ConceptBlockSharedSt, BlockSharedMemStMember<TDataAlignBytes>>
{
public:
using detail::BlockSharedMemStMemberImpl<TDataAlignBytes>::BlockSharedMemStMemberImpl;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ namespace alpaka
template<std::size_t TDataAlignBytes = core::vectorization::defaultAlignment>
class BlockSharedMemStMemberMasterSync
: public detail::BlockSharedMemStMemberImpl<TDataAlignBytes>
, public concepts::Implements<ConceptBlockSharedSt, BlockSharedMemStMemberMasterSync<TDataAlignBytes>>
, public interface::Implements<ConceptBlockSharedSt, BlockSharedMemStMemberMasterSync<TDataAlignBytes>>
{
public:
BlockSharedMemStMemberMasterSync(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include "alpaka/block/shared/st/Traits.hpp"
#include "alpaka/core/BoostPredef.hpp"
#include "alpaka/core/Concepts.hpp"
#include "alpaka/core/Interface.hpp"

#include <cstdint>
#include <type_traits>
Expand All @@ -17,7 +17,7 @@ namespace alpaka
{
//! The GPU CUDA/HIP block shared memory allocator.
class BlockSharedMemStUniformCudaHipBuiltIn
: public concepts::Implements<ConceptBlockSharedSt, BlockSharedMemStUniformCudaHipBuiltIn>
: public interface::Implements<ConceptBlockSharedSt, BlockSharedMemStUniformCudaHipBuiltIn>
{
};

Expand Down
6 changes: 3 additions & 3 deletions include/alpaka/block/shared/st/Traits.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#pragma once

#include "alpaka/core/Common.hpp"
#include "alpaka/core/Concepts.hpp"
#include "alpaka/core/Interface.hpp"

#include <type_traits>

Expand Down Expand Up @@ -41,7 +41,7 @@ namespace alpaka
template<typename T, std::size_t TuniqueId, typename TBlockSharedMemSt>
ALPAKA_FN_ACC auto declareSharedVar(TBlockSharedMemSt const& blockSharedMemSt) -> T&
{
using ImplementationBase = concepts::ImplementationBase<ConceptBlockSharedSt, TBlockSharedMemSt>;
using ImplementationBase = interface::ImplementationBase<ConceptBlockSharedSt, TBlockSharedMemSt>;
return trait::DeclareSharedVar<T, TuniqueId, ImplementationBase>::declareVar(blockSharedMemSt);
}

Expand All @@ -53,7 +53,7 @@ namespace alpaka
template<typename TBlockSharedMemSt>
ALPAKA_FN_ACC auto freeSharedVars(TBlockSharedMemSt& blockSharedMemSt) -> void
{
using ImplementationBase = concepts::ImplementationBase<ConceptBlockSharedSt, TBlockSharedMemSt>;
using ImplementationBase = interface::ImplementationBase<ConceptBlockSharedSt, TBlockSharedMemSt>;
trait::FreeSharedVars<ImplementationBase>::freeVars(blockSharedMemSt);
}
} // namespace alpaka
2 changes: 1 addition & 1 deletion include/alpaka/block/sync/BlockSyncBarrierOmp.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
namespace alpaka
{
//! The OpenMP barrier block synchronization.
class BlockSyncBarrierOmp : public concepts::Implements<ConceptBlockSync, BlockSyncBarrierOmp>
class BlockSyncBarrierOmp : public interface::Implements<ConceptBlockSync, BlockSyncBarrierOmp>
{
public:
std::uint8_t mutable m_generation = 0u;
Expand Down
2 changes: 1 addition & 1 deletion include/alpaka/block/sync/BlockSyncBarrierThread.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ namespace alpaka
{
//! The thread id map barrier block synchronization.
template<typename TIdx>
class BlockSyncBarrierThread : public concepts::Implements<ConceptBlockSync, BlockSyncBarrierThread<TIdx>>
class BlockSyncBarrierThread : public interface::Implements<ConceptBlockSync, BlockSyncBarrierThread<TIdx>>
{
public:
using Barrier = core::threads::BarrierThread<TIdx>;
Expand Down
2 changes: 1 addition & 1 deletion include/alpaka/block/sync/BlockSyncGenericSycl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace alpaka
{
//! The SYCL block synchronization.
template<typename TDim>
class BlockSyncGenericSycl : public concepts::Implements<ConceptBlockSync, BlockSyncGenericSycl<TDim>>
class BlockSyncGenericSycl : public interface::Implements<ConceptBlockSync, BlockSyncGenericSycl<TDim>>
{
public:
using BlockSyncBase = BlockSyncGenericSycl<TDim>;
Expand Down
2 changes: 1 addition & 1 deletion include/alpaka/block/sync/BlockSyncNoOp.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
namespace alpaka
{
//! The no op block synchronization.
class BlockSyncNoOp : public concepts::Implements<ConceptBlockSync, BlockSyncNoOp>
class BlockSyncNoOp : public interface::Implements<ConceptBlockSync, BlockSyncNoOp>
{
};

Expand Down
4 changes: 2 additions & 2 deletions include/alpaka/block/sync/BlockSyncUniformCudaHipBuiltIn.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@

#include "alpaka/block/sync/Traits.hpp"
#include "alpaka/core/BoostPredef.hpp"
#include "alpaka/core/Concepts.hpp"
#include "alpaka/core/Interface.hpp"

#if defined(ALPAKA_ACC_GPU_CUDA_ENABLED) || defined(ALPAKA_ACC_GPU_HIP_ENABLED)

namespace alpaka
{
//! The GPU CUDA/HIP block synchronization.
class BlockSyncUniformCudaHipBuiltIn
: public concepts::Implements<ConceptBlockSync, BlockSyncUniformCudaHipBuiltIn>
: public interface::Implements<ConceptBlockSync, BlockSyncUniformCudaHipBuiltIn>
{
};

Expand Down
Loading
Loading