Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-07-31 03:00:57 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Remove instances of ListTag in favor of List

Browse Source
This commit is contained in:
Kenneth Moreland 2019-12-06 21:32:36 -07:00
parent 92db376236
commit d5fe4046c5
28 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
benchmarking/BenchmarkFilters.cxx
View File

@ -10,7 +10,6 @@
#include "Benchmarker.h"
#include <vtkm/ListTag.h>
#include <vtkm/Math.h>
#include <vtkm/Range.h>
#include <vtkm/VecTraits.h>

1
benchmarking/Benchmarker.h
View File

@ -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>

1
vtkm/cont/ArrayHandleMultiplexer.h
View File

@ -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
{

2
vtkm/cont/BitField.h
View File

@ -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>

8
vtkm/cont/DynamicCellSet.h
View File

@ -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.
///

4
vtkm/cont/RuntimeDeviceInformation.cxx
View File

@ -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

4
vtkm/cont/Timer.h
View File

@ -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>

4
vtkm/cont/TryExecute.h
View File

@ -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>

4
vtkm/cont/VariantArrayHandle.h
View File

@ -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

2
vtkm/cont/VirtualObjectHandle.h
View File

@ -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>

2
vtkm/cont/VirtualObjectHandle.hxx
View File

@ -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>

2
vtkm/cont/arg/TypeCheckTagArray.h
View File

@ -12,7 +12,7 @@
#include <vtkm/cont/arg/TypeCheck.h>
#include <vtkm/ListTag.h>
#include <vtkm/List.h>
#include <vtkm/cont/ArrayHandle.h>

2
vtkm/cont/internal/DeviceAdapterListHelpers.h
View File

@ -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>

2
vtkm/cont/testing/TestingImplicitFunction.h
View File

@ -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>

6
vtkm/cont/testing/UnitTestStorageList.cxx
View File

@ -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);
}

2
vtkm/cont/testing/UnitTestStorageListTag.cxx
View File

@ -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>

2
vtkm/cont/testing/UnitTestTimer.cxx
View File

@ -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>

2
vtkm/exec/AtomicArrayExecutionObject.h
View File

@ -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>

2
vtkm/filter/FilterTraits.h
View File

@ -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...>);
//}

6
vtkm/filter/PolicyBase.h
View File

@ -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>

2
vtkm/filter/PolicyExtrude.h
View File

@ -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

5
vtkm/rendering/raytracing/MeshConnectivityBase.h
View File

@ -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())
{

4
vtkm/rendering/raytracing/RayTracingTypeDefs.h
View File

@ -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>

6
vtkm/testing/UnitTestList.cxx
View File

@ -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>>,

6
vtkm/testing/UnitTestTypeList.cxx
View File

@ -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();
}

2
vtkm/testing/UnitTestTypeListTag.cxx
View File

@ -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>

2
vtkm/worklet/ExtractStructured.h
View File

@ -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>

2
vtkm/worklet/moments/ComputeMoments.h
View File

@ -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);
}