d1a4aecc59
We have made several improvements to adding data into an `ArrayHandle`. ## Moving data from an `std::vector` For numerous reasons, it is convenient to define data in a `std::vector` and then wrap that into an `ArrayHandle`. It is often the case that an `std::vector` is filled and then becomes unused once it is converted to an `ArrayHandle`. In this case, what we really want is to pass the data off to the `ArrayHandle` so that the `ArrayHandle` is now managing the data and not the `std::vector`. C++11 has a mechanism to do this: move semantics. You can now pass variables to functions as an "rvalue" (right-hand value). When something is passed as an rvalue, it can pull state out of that variable and move it somewhere else. `std::vector` implements this movement so that an rvalue can be moved to another `std::vector` without actually copying the data. `make_ArrayHandle` now also takes advantage of this feature to move rvalue `std::vector`s. There is a special form of `make_ArrayHandle` named `make_ArrayHandleMove` that takes an rvalue. There is also a special overload of `make_ArrayHandle` itself that handles an rvalue `vector`. (However, using the explicit move version is better if you want to make sure the data is actually moved.) ## Make `ArrayHandle` from initalizer list A common use case for using `std::vector` (particularly in our unit tests) is to quickly add an initalizer list into an `ArrayHandle`. Now you can by simply passing an initializer list to `make_ArrayHandle`. ## Deprecated `make_ArrayHandle` with default shallow copy For historical reasons, passing an `std::vector` or a pointer to `make_ArrayHandle` does a shallow copy (i.e. `CopyFlag` defaults to `Off`). Although more efficient, this mode is inherintly unsafe, and making it the default is asking for trouble. To combat this, calling `make_ArrayHandle` without a copy flag is deprecated. In this way, if you wish to do the faster but more unsafe creation of an `ArrayHandle` you should explicitly express that. This requried quite a few changes through the VTK-m source (particularly in the tests). ## Similar changes to `Field` `vtkm::cont::Field` has a `make_Field` helper function that is similar to `make_ArrayHandle`. It also features the ability to create fields from `std::vector`s and C arrays. It also likewise had the same unsafe behavior by default of not copying from the source of the arrays. That behavior has similarly been depreciated. You now have to specify a copy flag. The ability to construct a `Field` from an initializer list of values has also been added.
84 lines
2.8 KiB
C++
84 lines
2.8 KiB
C++
//============================================================================
|
|
// Copyright (c) Kitware, Inc.
|
|
// All rights reserved.
|
|
// See LICENSE.txt for details.
|
|
//
|
|
// This software is distributed WITHOUT ANY WARRANTY; without even
|
|
// the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
|
// PURPOSE. See the above copyright notice for more information.
|
|
//============================================================================
|
|
#include <vtkm/cont/ArrayHandle.h>
|
|
#include <vtkm/cont/ArrayHandleIndex.h>
|
|
#include <vtkm/cont/VariantArrayHandle.h>
|
|
|
|
#include <vtkm/worklet/DispatcherMapField.h>
|
|
#include <vtkm/worklet/WorkletMapField.h>
|
|
|
|
#include <vtkm/cont/testing/Testing.h>
|
|
|
|
class TestAtomicArrayWorklet : public vtkm::worklet::WorkletMapField
|
|
{
|
|
public:
|
|
using ControlSignature = void(FieldIn, AtomicArrayInOut);
|
|
using ExecutionSignature = void(WorkIndex, _2);
|
|
using InputDomain = _1;
|
|
|
|
template <typename AtomicArrayType>
|
|
VTKM_EXEC void operator()(const vtkm::Id& index, const AtomicArrayType& atomicArray) const
|
|
{
|
|
using ValueType = typename AtomicArrayType::ValueType;
|
|
atomicArray.Add(0, static_cast<ValueType>(index));
|
|
}
|
|
};
|
|
|
|
namespace map_whole_array
|
|
{
|
|
|
|
static constexpr vtkm::Id ARRAY_SIZE = 10;
|
|
|
|
struct DoTestAtomicArrayWorklet
|
|
{
|
|
using WorkletType = TestAtomicArrayWorklet;
|
|
|
|
// This just demonstrates that the WholeArray tags support dynamic arrays.
|
|
VTKM_CONT
|
|
void CallWorklet(const vtkm::cont::VariantArrayHandle& inOutArray) const
|
|
{
|
|
std::cout << "Create and run dispatcher." << std::endl;
|
|
vtkm::worklet::DispatcherMapField<WorkletType> dispatcher;
|
|
dispatcher.Invoke(vtkm::cont::ArrayHandleIndex(ARRAY_SIZE),
|
|
inOutArray.ResetTypes<vtkm::cont::AtomicArrayTypeList>());
|
|
}
|
|
|
|
template <typename T>
|
|
VTKM_CONT void operator()(T) const
|
|
{
|
|
std::cout << "Set up data." << std::endl;
|
|
vtkm::cont::ArrayHandle<T> inOutHandle = vtkm::cont::make_ArrayHandle<T>({ 0 });
|
|
|
|
this->CallWorklet(vtkm::cont::VariantArrayHandle(inOutHandle));
|
|
|
|
std::cout << "Check result." << std::endl;
|
|
T result = inOutHandle.ReadPortal().Get(0);
|
|
|
|
VTKM_TEST_ASSERT(result == (ARRAY_SIZE * (ARRAY_SIZE - 1)) / 2,
|
|
"Got wrong summation in atomic array.");
|
|
}
|
|
};
|
|
|
|
void TestWorkletMapFieldExecArgAtomic(vtkm::cont::DeviceAdapterId id)
|
|
{
|
|
std::cout << "Testing Worklet with AtomicWholeArray on device adapter: " << id.GetName()
|
|
<< std::endl;
|
|
vtkm::testing::Testing::TryTypes(map_whole_array::DoTestAtomicArrayWorklet(),
|
|
vtkm::cont::AtomicArrayTypeList());
|
|
}
|
|
|
|
} // anonymous namespace
|
|
|
|
int UnitTestWorkletMapFieldWholeArrayAtomic(int argc, char* argv[])
|
|
{
|
|
return vtkm::cont::testing::Testing::RunOnDevice(
|
|
map_whole_array::TestWorkletMapFieldExecArgAtomic, argc, argv);
|
|
}
|