Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 13:23:51 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Move VecFromPortal classes to vtkm package

Browse Source 
These Vec-like objects can be generally usable in both the control and
execution environments.
This commit is contained in:
Kenneth Moreland 2016-10-25 16:55:48 -04:00
parent 719a8bd35d
commit b3d0e1f99b
10 changed files with 58 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vtkm/CMakeLists.txt
View File

@ -38,8 +38,10 @@ set(headers
TypeListTag.h
Types.h
TypeTraits.h
VectorAnalysis.h
VecFromPortal.h
VecFromPortalPermute.h
VecRectilinearPointCoordinates.h
VectorAnalysis.h
VecTraits.h
VecVariable.h
UnaryPredicates.h

49
vtkm/exec/internal/VecFromPortal.h → vtkm/VecFromPortal.h
View File

@ -17,8 +17,8 @@
// Laboratory (LANL), the U.S. Government retains certain rights in
// this software.
//============================================================================
#ifndef vtk_m_exec_internal_VecFromPortal_h
#define vtk_m_exec_internal_VecFromPortal_h
#ifndef vtk_m_VecFromPortal_h
#define vtk_m_VecFromPortal_h
#include <vtkm/Math.h>
#include <vtkm/Types.h>
@ -26,8 +26,6 @@
#include <vtkm/VecTraits.h>
namespace vtkm {
namespace exec {
namespace internal {
/// \brief A short variable-length array from a window in an ArrayPortal.
///
@ -42,23 +40,23 @@ public:
typename std::remove_const<typename PortalType::ValueType>::type;
VTKM_SUPPRESS_EXEC_WARNINGS
VTKM_EXEC
VTKM_EXEC_CONT
VecFromPortal() : NumComponents(0), Offset(0) { }
VTKM_SUPPRESS_EXEC_WARNINGS
VTKM_EXEC
VTKM_EXEC_CONT
VecFromPortal(const PortalType &portal,
vtkm::IdComponent numComponents = 0,
vtkm::Id offset = 0)
: Portal(portal), NumComponents(numComponents), Offset(offset) { }
VTKM_EXEC
VTKM_EXEC_CONT
vtkm::IdComponent GetNumberOfComponents() const {
return this->NumComponents;
}
template<typename T, vtkm::IdComponent DestSize>
VTKM_EXEC
VTKM_EXEC_CONT
void CopyInto(vtkm::Vec<T,DestSize> &dest) const
{
vtkm::IdComponent numComponents = vtkm::Min(DestSize, this->NumComponents);
@ -69,7 +67,7 @@ public:
}
VTKM_SUPPRESS_EXEC_WARNINGS
VTKM_EXEC
VTKM_EXEC_CONT
ComponentType operator[](vtkm::IdComponent index) const
{
return this->Portal.Get(index + this->Offset);
@ -81,17 +79,8 @@ private:
vtkm::Id Offset;
};
}
}
} // namespace vtkm::exec::internal
// Implementations of traits classes, which by definition are in the vtkm
// namespace.
namespace vtkm {
template<typename PortalType>
struct TypeTraits<vtkm::exec::internal::VecFromPortal<PortalType> >
struct TypeTraits<vtkm::VecFromPortal<PortalType> >
{
private:
typedef typename PortalType::ValueType ComponentType;
@ -100,36 +89,40 @@ public:
typedef typename vtkm::TypeTraits<ComponentType>::NumericTag NumericTag;
typedef TypeTraitsVectorTag DimensionalityTag;
VTKM_EXEC
static vtkm::exec::internal::VecFromPortal<PortalType> ZeroInitialization()
VTKM_SUPPRESS_EXEC_WARNINGS
VTKM_EXEC_CONT
static vtkm::VecFromPortal<PortalType> ZeroInitialization()
{
return vtkm::exec::internal::VecFromPortal<PortalType>();
return vtkm::VecFromPortal<PortalType>();
}
};
template<typename PortalType>
struct VecTraits<vtkm::exec::internal::VecFromPortal<PortalType> >
struct VecTraits<vtkm::VecFromPortal<PortalType> >
{
typedef vtkm::exec::internal::VecFromPortal<PortalType> VecType;
typedef vtkm::VecFromPortal<PortalType> VecType;
typedef typename VecType::ComponentType ComponentType;
typedef vtkm::VecTraitsTagMultipleComponents HasMultipleComponents;
typedef vtkm::VecTraitsTagSizeVariable IsSizeStatic;
VTKM_EXEC
VTKM_SUPPRESS_EXEC_WARNINGS
VTKM_EXEC_CONT
static vtkm::IdComponent GetNumberOfComponents(const VecType &vector) {
return vector.GetNumberOfComponents();
}
VTKM_EXEC
VTKM_SUPPRESS_EXEC_WARNINGS
VTKM_EXEC_CONT
static ComponentType GetComponent(const VecType &vector,
vtkm::IdComponent componentIndex)
{
return vector[componentIndex];
}
VTKM_SUPPRESS_EXEC_WARNINGS
template<vtkm::IdComponent destSize>
VTKM_EXEC
VTKM_EXEC_CONT
static void CopyInto(const VecType &src,
vtkm::Vec<ComponentType,destSize> &dest)
{
@ -139,4 +132,4 @@ struct VecTraits<vtkm::exec::internal::VecFromPortal<PortalType> >
} // namespace vtkm
#endif //vtk_m_exec_internal_VecFromPortal_h
#endif //vtk_m_VecFromPortal_h

51
vtkm/exec/internal/VecFromPortalPermute.h → vtkm/VecFromPortalPermute.h
View File

@ -17,8 +17,8 @@
// Laboratory (LANL), the U.S. Government retains certain rights in
// this software.
//============================================================================
#ifndef vtk_m_exec_internal_VecFromPortalPermute_h
#define vtk_m_exec_internal_VecFromPortalPermute_h
#ifndef vtk_m_VecFromPortalPermute_h
#define vtk_m_VecFromPortalPermute_h
#include <vtkm/Math.h>
#include <vtkm/Types.h>
@ -26,8 +26,6 @@
#include <vtkm/VecTraits.h>
namespace vtkm {
namespace exec {
namespace internal {
/// \brief A short vector from an ArrayPortal and a vector of indices.
///
@ -43,20 +41,24 @@ public:
typename std::remove_const<typename PortalType::ValueType>::type;
VTKM_EXEC
VTKM_SUPPRESS_EXEC_WARNINGS
VTKM_EXEC_CONT
VecFromPortalPermute() { }
VTKM_EXEC
VTKM_SUPPRESS_EXEC_WARNINGS
VTKM_EXEC_CONT
VecFromPortalPermute(const IndexVecType *indices, const PortalType &portal)
: Indices(indices), Portal(portal) { }
VTKM_EXEC
VTKM_SUPPRESS_EXEC_WARNINGS
VTKM_EXEC_CONT
vtkm::IdComponent GetNumberOfComponents() const {
return this->Indices->GetNumberOfComponents();
}
VTKM_SUPPRESS_EXEC_WARNINGS
template<vtkm::IdComponent DestSize>
VTKM_EXEC
VTKM_EXEC_CONT
void CopyInto(vtkm::Vec<ComponentType,DestSize> &dest) const
{
vtkm::IdComponent numComponents =
@ -68,7 +70,7 @@ public:
}
VTKM_SUPPRESS_EXEC_WARNINGS
VTKM_EXEC
VTKM_EXEC_CONT
ComponentType operator[](vtkm::IdComponent index) const
{
return this->Portal.Get((*this->Indices)[index]);
@ -79,21 +81,12 @@ private:
PortalType Portal;
};
}
}
} // namespace vtkm::exec::internal
// Implementations of traits classes, which by definition are in the vtkm
// namespace.
namespace vtkm {
template<typename IndexVecType, typename PortalType>
struct TypeTraits<
vtkm::exec::internal::VecFromPortalPermute<IndexVecType,PortalType> >
vtkm::VecFromPortalPermute<IndexVecType,PortalType> >
{
private:
typedef vtkm::exec::internal::VecFromPortalPermute<IndexVecType,PortalType>
typedef vtkm::VecFromPortalPermute<IndexVecType,PortalType>
VecType;
typedef typename PortalType::ValueType ComponentType;
@ -101,7 +94,8 @@ public:
typedef typename vtkm::TypeTraits<ComponentType>::NumericTag NumericTag;
typedef TypeTraitsVectorTag DimensionalityTag;
VTKM_EXEC
VTKM_SUPPRESS_EXEC_WARNINGS
VTKM_EXEC_CONT
static VecType ZeroInitialization()
{
return VecType();
@ -110,29 +104,32 @@ public:
template<typename IndexVecType, typename PortalType>
struct VecTraits<
vtkm::exec::internal::VecFromPortalPermute<IndexVecType,PortalType> >
vtkm::VecFromPortalPermute<IndexVecType,PortalType> >
{
typedef vtkm::exec::internal::VecFromPortalPermute<IndexVecType,PortalType>
typedef vtkm::VecFromPortalPermute<IndexVecType,PortalType>
VecType;
typedef typename VecType::ComponentType ComponentType;
typedef vtkm::VecTraitsTagMultipleComponents HasMultipleComponents;
typedef vtkm::VecTraitsTagSizeVariable IsSizeStatic;
VTKM_EXEC
VTKM_SUPPRESS_EXEC_WARNINGS
VTKM_EXEC_CONT
static vtkm::IdComponent GetNumberOfComponents(const VecType &vector) {
return vector.GetNumberOfComponents();
}
VTKM_EXEC
VTKM_SUPPRESS_EXEC_WARNINGS
VTKM_EXEC_CONT
static ComponentType GetComponent(const VecType &vector,
vtkm::IdComponent componentIndex)
{
return vector[componentIndex];
}
VTKM_SUPPRESS_EXEC_WARNINGS
template<vtkm::IdComponent destSize>
VTKM_EXEC
VTKM_EXEC_CONT
static void CopyInto(const VecType &src,
vtkm::Vec<ComponentType,destSize> &dest)
{
@ -142,4 +139,4 @@ struct VecTraits<
} // namespace vtkm
#endif //vtk_m_exec_internal_VecFromPortalPermute_h
#endif //vtk_m_VecFromPortalPermute_h

5
vtkm/exec/ConnectivityExplicit.h
View File

@ -23,7 +23,7 @@
#include <vtkm/CellShape.h>
#include <vtkm/Types.h>
#include <vtkm/exec/internal/VecFromPortal.h>
#include <vtkm/VecFromPortal.h>
namespace vtkm {
namespace exec {
@ -72,8 +72,7 @@ public:
return CellShapeTag(static_cast<vtkm::IdComponent>(this->Shapes.Get(index)));
}
typedef vtkm::exec::internal::VecFromPortal<ConnectivityPortalType>
IndicesType;
using IndicesType = vtkm::VecFromPortal<ConnectivityPortalType>;
/// Returns a Vec-like object containing the indices for the given index.
/// The object returned is not an actual array, but rather an object that

5
vtkm/exec/arg/FetchTagArrayTopologyMapIn.h
View File

@ -31,7 +31,7 @@
#include <vtkm/exec/ConnectivityStructured.h>
#include <vtkm/VecRectilinearPointCoordinates.h>
#include <vtkm/exec/internal/VecFromPortalPermute.h>
#include <vtkm/VecFromPortalPermute.h>
namespace vtkm {
namespace exec {
@ -68,8 +68,7 @@ struct FetchArrayTopologyMapInImplementation
// The FieldExecObjectType is expected to behave like an ArrayPortal.
typedef FieldExecObjectType PortalType;
typedef vtkm::exec::internal::VecFromPortalPermute<
IndexVecType,PortalType> ValueType;
using ValueType = vtkm::VecFromPortalPermute<IndexVecType,PortalType>;
VTKM_SUPPRESS_EXEC_WARNINGS
VTKM_EXEC

2
vtkm/exec/internal/CMakeLists.txt
View File

@ -20,8 +20,6 @@
set(headers
ErrorMessageBuffer.h
VecFromPortal.h
VecFromPortalPermute.h
WorkletInvokeFunctor.h
WorkletInvokeFunctorDetail.h
)

2
vtkm/exec/internal/testing/CMakeLists.txt
View File

@ -22,8 +22,6 @@
set(unit_tests
UnitTestErrorMessageBuffer.cxx
UnitTestVecFromPortal.cxx
UnitTestVecFromPortalPermute.cxx
UnitTestWorkletInvokeFunctor.cxx
)
vtkm_unit_tests(SOURCES ${unit_tests})

2
vtkm/testing/CMakeLists.txt
View File

@ -46,6 +46,8 @@ set(unit_tests
UnitTestTypes.cxx
UnitTestTypeTraits.cxx
UnitTestUnaryPredicates.cxx
UnitTestVecFromPortal.cxx
UnitTestVecFromPortalPermute.cxx
UnitTestVecRectilinearPointCoordinates.cxx
UnitTestVectorAnalysis.cxx
UnitTestVecTraits.cxx

4
vtkm/exec/internal/testing/UnitTestVecFromPortal.cxx → vtkm/testing/UnitTestVecFromPortal.cxx
View File

@ -18,7 +18,7 @@
// this software.
//============================================================================
#include <vtkm/exec/internal/VecFromPortal.h>
#include <vtkm/VecFromPortal.h>
#include <vtkm/testing/Testing.h>
@ -51,7 +51,7 @@ struct VecFromPortalTestFunctor
void operator()(T) const
{
typedef TestPortal<T> PortalType;
typedef vtkm::exec::internal::VecFromPortal<PortalType> VecType;
typedef vtkm::VecFromPortal<PortalType> VecType;
typedef vtkm::TypeTraits<VecType> TTraits;
typedef vtkm::VecTraits<VecType> VTraits;

4
vtkm/exec/internal/testing/UnitTestVecFromPortalPermute.cxx → vtkm/testing/UnitTestVecFromPortalPermute.cxx
View File

@ -18,7 +18,7 @@
// this software.
//============================================================================
#include <vtkm/exec/internal/VecFromPortalPermute.h>
#include <vtkm/VecFromPortalPermute.h>
#include <vtkm/VecVariable.h>
@ -54,7 +54,7 @@ struct VecFromPortalPermuteTestFunctor
{
typedef TestPortal<T> PortalType;
typedef vtkm::VecVariable<vtkm::Id,ARRAY_SIZE> IndexVecType;
typedef vtkm::exec::internal::VecFromPortalPermute<IndexVecType,PortalType>
typedef vtkm::VecFromPortalPermute<IndexVecType,PortalType>
VecType;
typedef vtkm::TypeTraits<VecType> TTraits;
typedef vtkm::VecTraits<VecType> VTraits;