mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-08 21:33:55 +00:00
Remove instances of ListTag in favor of List
This commit is contained in:
parent
92db376236
commit
d5fe4046c5
@ -10,7 +10,6 @@
|
||||
|
||||
#include "Benchmarker.h"
|
||||
|
||||
#include <vtkm/ListTag.h>
|
||||
#include <vtkm/Math.h>
|
||||
#include <vtkm/Range.h>
|
||||
#include <vtkm/VecTraits.h>
|
||||
|
@ -11,7 +11,6 @@
|
||||
#ifndef vtk_m_benchmarking_Benchmarker_h
|
||||
#define vtk_m_benchmarking_Benchmarker_h
|
||||
|
||||
#include <vtkm/ListTag.h>
|
||||
#include <vtkm/Math.h>
|
||||
#include <vtkm/cont/DeviceAdapterTag.h>
|
||||
#include <vtkm/cont/TryExecute.h>
|
||||
|
@ -18,7 +18,6 @@
|
||||
#include <vtkm/cont/ArrayHandleCartesianProduct.h>
|
||||
#include <vtkm/cont/ArrayHandleCast.h>
|
||||
#include <vtkm/cont/ArrayHandleUniformPointCoordinates.h>
|
||||
#include <vtkm/cont/StorageListTag.h>
|
||||
|
||||
namespace vtkm
|
||||
{
|
||||
|
@ -17,7 +17,7 @@
|
||||
#include <vtkm/cont/ArrayHandle.h>
|
||||
#include <vtkm/cont/Logging.h>
|
||||
|
||||
#include <vtkm/ListTag.h>
|
||||
#include <vtkm/List.h>
|
||||
#include <vtkm/Types.h>
|
||||
|
||||
#include <cassert>
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
#include <vtkm/cont/CastAndCall.h>
|
||||
#include <vtkm/cont/CellSet.h>
|
||||
#include <vtkm/cont/CellSetListTag.h>
|
||||
#include <vtkm/cont/CellSetList.h>
|
||||
#include <vtkm/cont/ErrorBadValue.h>
|
||||
#include <vtkm/cont/Logging.h>
|
||||
|
||||
@ -37,7 +37,7 @@ namespace cont
|
||||
/// to determine the type when running algorithms.
|
||||
///
|
||||
/// By default, \c DynamicCellSet will assume that the value type in the array
|
||||
/// matches one of the types specified by \c VTKM_DEFAULT_CELL_SET_LIST_TAG.
|
||||
/// matches one of the types specified by \c VTKM_DEFAULT_CELL_SET_LIST.
|
||||
/// This list can be changed by using the \c ResetCellSetList method. It is
|
||||
/// worthwhile to match these lists closely to the possible types that might be
|
||||
/// used. If a type is missing you will get a runtime error. If there are more
|
||||
@ -127,7 +127,7 @@ public:
|
||||
|
||||
/// Changes the cell set types to try casting to when resolving this dynamic
|
||||
/// cell set, which is specified with a list tag like those in
|
||||
/// CellSetListTag.h. Since C++ does not allow you to actually change the
|
||||
/// CellSetList.h. Since C++ does not allow you to actually change the
|
||||
/// template arguments, this method returns a new dynamic cell setobject.
|
||||
/// This method is particularly useful to narrow down (or expand) the types
|
||||
/// when using a cell set of particular constraints.
|
||||
@ -143,7 +143,7 @@ public:
|
||||
/// Attempts to cast the held cell set to a specific concrete type, then call
|
||||
/// the given functor with the cast cell set. The cell sets tried in the cast
|
||||
/// are those in the \c CellSetList template argument of the \c
|
||||
/// DynamicCellSetBase class (or \c VTKM_DEFAULT_CELL_SET_LIST_TAG for \c
|
||||
/// DynamicCellSetBase class (or \c VTKM_DEFAULT_CELL_SET_LIST for \c
|
||||
/// DynamicCellSet). You can use \c ResetCellSetList to get different
|
||||
/// behavior from \c CastAndCall.
|
||||
///
|
||||
|
@ -9,9 +9,9 @@
|
||||
//============================================================================
|
||||
#include <vtkm/cont/RuntimeDeviceInformation.h>
|
||||
|
||||
#include <vtkm/ListTag.h>
|
||||
#include <vtkm/List.h>
|
||||
#include <vtkm/cont/DeviceAdapter.h>
|
||||
#include <vtkm/cont/DeviceAdapterListTag.h>
|
||||
#include <vtkm/cont/DeviceAdapterList.h>
|
||||
#include <vtkm/cont/DeviceAdapterTag.h>
|
||||
|
||||
//Bring in each device adapters runtime class
|
||||
|
@ -10,9 +10,9 @@
|
||||
#ifndef vtk_m_cont_Timer_h
|
||||
#define vtk_m_cont_Timer_h
|
||||
|
||||
#include <vtkm/ListTag.h>
|
||||
#include <vtkm/List.h>
|
||||
#include <vtkm/cont/DeviceAdapter.h>
|
||||
#include <vtkm/cont/DeviceAdapterListTag.h>
|
||||
#include <vtkm/cont/DeviceAdapterList.h>
|
||||
|
||||
#include <vtkm/cont/vtkm_cont_export.h>
|
||||
|
||||
|
@ -165,7 +165,7 @@ inline bool TryExecuteImpl(vtkm::cont::DeviceAdapterId devId,
|
||||
/// This function returns \c true if the functor succeeded on a device,
|
||||
/// \c false otherwise.
|
||||
///
|
||||
/// If no device list is specified, then \c VTKM_DEFAULT_DEVICE_ADAPTER_LIST_TAG
|
||||
/// If no device list is specified, then \c VTKM_DEFAULT_DEVICE_ADAPTER_LIST
|
||||
/// is used.
|
||||
///
|
||||
template <typename Functor>
|
||||
@ -231,7 +231,7 @@ VTKM_CONT bool TryExecuteOnDevice(vtkm::cont::DeviceAdapterId devId,
|
||||
/// This function returns \c true if the functor succeeded on a device,
|
||||
/// \c false otherwise.
|
||||
///
|
||||
/// If no device list is specified, then \c VTKM_DEFAULT_DEVICE_ADAPTER_LIST_TAG
|
||||
/// If no device list is specified, then \c VTKM_DEFAULT_DEVICE_ADAPTER_LIST
|
||||
/// is used.
|
||||
///
|
||||
template <typename Functor, typename... Args>
|
||||
|
@ -21,7 +21,7 @@
|
||||
#include <vtkm/cont/CastAndCall.h>
|
||||
#include <vtkm/cont/ErrorBadType.h>
|
||||
#include <vtkm/cont/Logging.h>
|
||||
#include <vtkm/cont/StorageListTag.h>
|
||||
#include <vtkm/cont/StorageList.h>
|
||||
|
||||
#include <vtkm/cont/internal/VariantArrayHandleContainer.h>
|
||||
|
||||
@ -205,7 +205,7 @@ public:
|
||||
///
|
||||
/// In addition to the value type, an \c ArrayHandle also requires a storage tag.
|
||||
/// By default, \c CastAndCall attempts to cast the array using the storage tags
|
||||
/// listed in \c VTKM_DEFAULT_STORAGE_LIST_TAG. You can optionally give a custom
|
||||
/// listed in \c VTKM_DEFAULT_STORAGE_LIST. You can optionally give a custom
|
||||
/// list of storage tags as the second argument. If the storage of the underlying
|
||||
/// array does not match any of the storage tags given, then the array will
|
||||
/// be cast to an \c ArrayHandleVirtual, which can hold any array given the
|
||||
|
@ -10,7 +10,7 @@
|
||||
#ifndef vtk_m_cont_VirtualObjectHandle_h
|
||||
#define vtk_m_cont_VirtualObjectHandle_h
|
||||
|
||||
#include <vtkm/cont/DeviceAdapterListTag.h>
|
||||
#include <vtkm/cont/DeviceAdapterList.h>
|
||||
#include <vtkm/cont/ExecutionAndControlObjectBase.h>
|
||||
#include <vtkm/cont/internal/DeviceAdapterListHelpers.h>
|
||||
#include <vtkm/cont/internal/VirtualObjectTransfer.h>
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
#include <vtkm/cont/VirtualObjectHandle.h>
|
||||
|
||||
#include <vtkm/cont/DeviceAdapterListTag.h>
|
||||
#include <vtkm/cont/DeviceAdapterList.h>
|
||||
#include <vtkm/cont/DeviceAdapterTag.h>
|
||||
#include <vtkm/cont/internal/DeviceAdapterListHelpers.h>
|
||||
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
#include <vtkm/cont/arg/TypeCheck.h>
|
||||
|
||||
#include <vtkm/ListTag.h>
|
||||
#include <vtkm/List.h>
|
||||
|
||||
#include <vtkm/cont/ArrayHandle.h>
|
||||
|
||||
|
@ -10,7 +10,7 @@
|
||||
#ifndef vtk_m_cont_internal_DeviceAdapterListHelpers_h
|
||||
#define vtk_m_cont_internal_DeviceAdapterListHelpers_h
|
||||
|
||||
#include <vtkm/ListTag.h>
|
||||
#include <vtkm/List.h>
|
||||
#include <vtkm/cont/ErrorBadDevice.h>
|
||||
#include <vtkm/cont/RuntimeDeviceTracker.h>
|
||||
|
||||
|
@ -11,7 +11,7 @@
|
||||
#define vtk_m_cont_testing_TestingImplicitFunction_h
|
||||
|
||||
#include <vtkm/cont/CoordinateSystem.h>
|
||||
#include <vtkm/cont/DeviceAdapterListTag.h>
|
||||
#include <vtkm/cont/DeviceAdapterList.h>
|
||||
#include <vtkm/cont/DeviceAdapterTag.h>
|
||||
#include <vtkm/cont/ImplicitFunctionHandle.h>
|
||||
#include <vtkm/cont/testing/MakeTestDataSet.h>
|
||||
|
@ -50,11 +50,11 @@ void CheckSame(const vtkm::Vec<TypeId, N>& expected, const std::vector<TypeId>&
|
||||
}
|
||||
}
|
||||
|
||||
template <vtkm::IdComponent N, typename ListTag>
|
||||
void TryList(const vtkm::Vec<TypeId, N>& expected, ListTag)
|
||||
template <vtkm::IdComponent N, typename List>
|
||||
void TryList(const vtkm::Vec<TypeId, N>& expected, List)
|
||||
{
|
||||
TestFunctor functor;
|
||||
vtkm::ListForEach(functor, ListTag());
|
||||
vtkm::ListForEach(functor, List());
|
||||
CheckSame(expected, functor.FoundTypes);
|
||||
}
|
||||
|
||||
|
@ -8,6 +8,8 @@
|
||||
// PURPOSE. See the above copyright notice for more information.
|
||||
//============================================================================
|
||||
|
||||
// This tests deprecated code until it is deleted.
|
||||
|
||||
#include <vtkm/cont/StorageListTag.h>
|
||||
|
||||
#include <vtkm/cont/testing/Testing.h>
|
||||
|
@ -8,7 +8,7 @@
|
||||
// PURPOSE. See the above copyright notice for more information.
|
||||
//============================================================================
|
||||
|
||||
#include <vtkm/cont/DeviceAdapterListTag.h>
|
||||
#include <vtkm/cont/DeviceAdapterList.h>
|
||||
#include <vtkm/cont/RuntimeDeviceTracker.h>
|
||||
#include <vtkm/cont/Timer.h>
|
||||
|
||||
|
@ -10,7 +10,7 @@
|
||||
#ifndef vtk_m_exec_AtomicArrayExecutionObject_h
|
||||
#define vtk_m_exec_AtomicArrayExecutionObject_h
|
||||
|
||||
#include <vtkm/ListTag.h>
|
||||
#include <vtkm/List.h>
|
||||
#include <vtkm/cont/ArrayHandle.h>
|
||||
#include <vtkm/cont/DeviceAdapter.h>
|
||||
#include <vtkm/cont/internal/AtomicInterfaceExecution.h>
|
||||
|
@ -24,7 +24,7 @@ class Filter;
|
||||
//namespace detail
|
||||
//{
|
||||
//// template<typename T> vtkm::List<T> as_list(T);
|
||||
//vtkm::ListUniversal as_list(vtkm::ListTagUniversal);
|
||||
//vtkm::ListUniversal as_list(vtkm::ListUniversal);
|
||||
//template <typename... T>
|
||||
//vtkm::List<T...> as_list(vtkm::List<T...>);
|
||||
//}
|
||||
|
@ -13,13 +13,13 @@
|
||||
|
||||
#include <vtkm/List.h>
|
||||
|
||||
#include <vtkm/cont/CellSetListTag.h>
|
||||
#include <vtkm/cont/CellSetList.h>
|
||||
#include <vtkm/cont/CoordinateSystem.h>
|
||||
#include <vtkm/cont/DataSet.h>
|
||||
#include <vtkm/cont/DeviceAdapterListTag.h>
|
||||
#include <vtkm/cont/DeviceAdapterList.h>
|
||||
#include <vtkm/cont/DynamicCellSet.h>
|
||||
#include <vtkm/cont/Field.h>
|
||||
#include <vtkm/cont/StorageListTag.h>
|
||||
#include <vtkm/cont/StorageList.h>
|
||||
|
||||
#include <vtkm/filter/FilterTraits.h>
|
||||
|
||||
|
@ -20,7 +20,7 @@
|
||||
#include <vtkm/cont/ArrayHandleExtrudeCoords.h>
|
||||
#include <vtkm/cont/CellSetExtrude.h>
|
||||
|
||||
#include <vtkm/ListTag.h>
|
||||
#include <vtkm/List.h>
|
||||
#include <vtkm/filter/PolicyDefault.h>
|
||||
|
||||
namespace vtkm
|
||||
|
@ -308,8 +308,7 @@ private:
|
||||
public:
|
||||
MeshConnHandle() = default;
|
||||
|
||||
template <typename MeshConnType,
|
||||
typename DeviceAdapterList = VTKM_DEFAULT_DEVICE_ADAPTER_LIST_TAG>
|
||||
template <typename MeshConnType, typename DeviceAdapterList = VTKM_DEFAULT_DEVICE_ADAPTER_LIST>
|
||||
explicit MeshConnHandle(MeshConnType* meshConn,
|
||||
bool aquireOwnership = true,
|
||||
DeviceAdapterList devices = DeviceAdapterList())
|
||||
@ -318,7 +317,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
template <typename MeshConnType, typename DeviceAdapterList = VTKM_DEFAULT_DEVICE_ADAPTER_LIST_TAG>
|
||||
template <typename MeshConnType, typename DeviceAdapterList = VTKM_DEFAULT_DEVICE_ADAPTER_LIST>
|
||||
VTKM_CONT MeshConnHandle make_MeshConnHandle(MeshConnType&& func,
|
||||
DeviceAdapterList devices = DeviceAdapterList())
|
||||
{
|
||||
|
@ -11,13 +11,13 @@
|
||||
#define vtk_m_rendering_raytracing_RayTracingTypeDefs_h
|
||||
|
||||
#include <type_traits>
|
||||
#include <vtkm/ListTag.h>
|
||||
#include <vtkm/List.h>
|
||||
#include <vtkm/Math.h>
|
||||
#include <vtkm/cont/ArrayHandle.h>
|
||||
#include <vtkm/cont/ArrayHandleCartesianProduct.h>
|
||||
#include <vtkm/cont/ArrayHandleCompositeVector.h>
|
||||
#include <vtkm/cont/ArrayHandleUniformPointCoordinates.h>
|
||||
#include <vtkm/cont/DeviceAdapterListTag.h>
|
||||
#include <vtkm/cont/DeviceAdapterList.h>
|
||||
#include <vtkm/cont/TryExecute.h>
|
||||
#include <vtkm/cont/VariantArrayHandle.h>
|
||||
|
||||
|
@ -150,10 +150,10 @@ void TestLists()
|
||||
VTKM_TEST_ASSERT(vtkm::internal::IsList<vtkm::ListEmpty>::value);
|
||||
VTKM_TEST_ASSERT(vtkm::internal::IsList<vtkm::ListUniversal>::value);
|
||||
|
||||
std::cout << "ListTagEmpty" << std::endl;
|
||||
std::cout << "ListEmpty" << std::endl;
|
||||
CheckList(vtkm::List<>{}, vtkm::ListEmpty{});
|
||||
|
||||
std::cout << "ListTagAppend" << std::endl;
|
||||
std::cout << "ListAppend" << std::endl;
|
||||
CheckList(vtkm::List<TestClass<31>,
|
||||
TestClass<32>,
|
||||
TestClass<33>,
|
||||
@ -164,7 +164,7 @@ void TestLists()
|
||||
vtkm::List<TestClass<11>>,
|
||||
vtkm::List<TestClass<21>, TestClass<22>>>{});
|
||||
|
||||
std::cout << "ListTagIntersect" << std::endl;
|
||||
std::cout << "ListIntersect" << std::endl;
|
||||
CheckList(vtkm::List<TestClass<3>, TestClass<5>>{},
|
||||
vtkm::ListIntersect<
|
||||
vtkm::List<TestClass<1>, TestClass<2>, TestClass<3>, TestClass<4>, TestClass<5>>,
|
||||
|
@ -76,11 +76,11 @@ struct TestFunctor
|
||||
}
|
||||
};
|
||||
|
||||
template <typename ListTag>
|
||||
void TryList(const TypeSet& expected, ListTag)
|
||||
template <typename List>
|
||||
void TryList(const TypeSet& expected, List)
|
||||
{
|
||||
TestFunctor functor(expected);
|
||||
vtkm::ListForEach(functor, ListTag());
|
||||
vtkm::ListForEach(functor, List());
|
||||
functor.ExpectedTypes.CheckFound();
|
||||
}
|
||||
|
||||
|
@ -8,6 +8,8 @@
|
||||
// PURPOSE. See the above copyright notice for more information.
|
||||
//============================================================================
|
||||
|
||||
// This tests deprecated code until it is deleted.
|
||||
|
||||
#include <vtkm/TypeListTag.h>
|
||||
|
||||
#include <vtkm/Types.h>
|
||||
|
@ -20,7 +20,7 @@
|
||||
#include <vtkm/cont/ArrayHandlePermutation.h>
|
||||
#include <vtkm/cont/ArrayHandleTransform.h>
|
||||
#include <vtkm/cont/ArrayHandleUniformPointCoordinates.h>
|
||||
#include <vtkm/cont/CellSetListTag.h>
|
||||
#include <vtkm/cont/CellSetList.h>
|
||||
#include <vtkm/cont/CellSetStructured.h>
|
||||
#include <vtkm/cont/CoordinateSystem.h>
|
||||
#include <vtkm/cont/DynamicCellSet.h>
|
||||
|
@ -269,7 +269,7 @@ public:
|
||||
int maxOrder,
|
||||
vtkm::cont::DataSet& output) const
|
||||
{
|
||||
input.ResetCellSetList(vtkm::cont::CellSetListTagStructured())
|
||||
input.ResetCellSetList(vtkm::cont::CellSetListStructured())
|
||||
.CastAndCall(ResolveDynamicCellSet(), pixels, this->Spacing, this->Radius, maxOrder, output);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user