Remove TransportTagReducedValuesIn
Now that the transport takes the input range as one of its arguments, this functionality can be implemented by the more general TransportTagArrayIn.
This commit is contained in:
parent
dc192b793d
commit
d68b211346
@ -31,7 +31,6 @@ set(headers
|
||||
TransportTagKeyedValuesInOut.h
|
||||
TransportTagKeyedValuesOut.h
|
||||
TransportTagKeysIn.h
|
||||
TransportTagReducedValuesIn.h
|
||||
TransportTagTopologyFieldIn.h
|
||||
TransportTagWholeArrayIn.h
|
||||
TransportTagWholeArrayInOut.h
|
||||
|
@ -1,45 +0,0 @@
|
||||
//============================================================================
|
||||
// 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.
|
||||
//
|
||||
// Copyright 2016 Sandia Corporation.
|
||||
// Copyright 2016 UT-Battelle, LLC.
|
||||
// Copyright 2016 Los Alamos National Security.
|
||||
//
|
||||
// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
|
||||
// the U.S. Government retains certain rights in this software.
|
||||
//
|
||||
// Under the terms of Contract DE-AC52-06NA25396 with Los Alamos National
|
||||
// Laboratory (LANL), the U.S. Government retains certain rights in
|
||||
// this software.
|
||||
//============================================================================
|
||||
#ifndef vtk_m_cont_arg_TransportTagReducedValuesIn_h
|
||||
#define vtk_m_cont_arg_TransportTagReducedValuesIn_h
|
||||
|
||||
#include <vtkm/cont/arg/Transport.h>
|
||||
|
||||
namespace vtkm {
|
||||
namespace cont {
|
||||
namespace arg {
|
||||
|
||||
/// \brief \c Transport tag for input values in a reduce by key.
|
||||
///
|
||||
/// \c TransportTagReducedValuesIn is a tag used with the \c Transport class to
|
||||
/// transport \c ArrayHandle objects for input values that correspond to arrays
|
||||
/// of reduced values. The values are passed 1-to-1 to the worklet invocations.
|
||||
///
|
||||
struct TransportTagReducedValuesIn { };
|
||||
|
||||
// Specialization of Transport class for TransportTagReducedValuesIn is
|
||||
// implemented in vtkm/worklet/Keys.h. That class is not accessible from here
|
||||
// due to VTK-m package dependencies.
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#endif //vtk_m_cont_arg_TransportTagReducedValuesIn_h
|
@ -34,7 +34,6 @@
|
||||
#include <vtkm/cont/arg/TransportTagKeyedValuesInOut.h>
|
||||
#include <vtkm/cont/arg/TransportTagKeyedValuesOut.h>
|
||||
#include <vtkm/cont/arg/TransportTagKeysIn.h>
|
||||
#include <vtkm/cont/arg/TransportTagReducedValuesIn.h>
|
||||
#include <vtkm/cont/arg/TypeCheckTagKeys.h>
|
||||
|
||||
#include <vtkm/BinaryOperators.h>
|
||||
@ -370,35 +369,6 @@ struct Transport<
|
||||
}
|
||||
};
|
||||
|
||||
template<typename ContObjectType, typename Device>
|
||||
struct Transport<
|
||||
vtkm::cont::arg::TransportTagReducedValuesIn, ContObjectType, Device>
|
||||
{
|
||||
VTKM_IS_ARRAY_HANDLE(ContObjectType);
|
||||
|
||||
typedef typename ContObjectType::template ExecutionTypes<Device>::PortalConst
|
||||
ExecObjectType;
|
||||
|
||||
template<typename KeyType>
|
||||
VTKM_CONT
|
||||
ExecObjectType operator()(const ContObjectType &object,
|
||||
const vtkm::worklet::Keys<KeyType> &inputDomain,
|
||||
vtkm::Id inputRange,
|
||||
vtkm::Id) const
|
||||
{
|
||||
VTKM_ASSERT(inputDomain.GetInputRange() == inputRange);
|
||||
(void)inputDomain; // Shut up compiler
|
||||
|
||||
if (object.GetNumberOfValues() != inputRange)
|
||||
{
|
||||
throw vtkm::cont::ErrorBadValue(
|
||||
"Input array to worklet invocation the wrong size.");
|
||||
}
|
||||
|
||||
return object.PrepareForInput(Device());
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
} // namespace vtkm::cont::arg
|
||||
|
@ -29,7 +29,6 @@
|
||||
#include <vtkm/cont/arg/TransportTagKeyedValuesInOut.h>
|
||||
#include <vtkm/cont/arg/TransportTagKeyedValuesOut.h>
|
||||
#include <vtkm/cont/arg/TransportTagKeysIn.h>
|
||||
#include <vtkm/cont/arg/TransportTagReducedValuesIn.h>
|
||||
#include <vtkm/cont/arg/TypeCheckTagArray.h>
|
||||
#include <vtkm/cont/arg/TypeCheckTagKeys.h>
|
||||
|
||||
@ -127,7 +126,7 @@ public:
|
||||
struct ReducedValuesIn : vtkm::cont::arg::ControlSignatureTagBase
|
||||
{
|
||||
using TypeCheckTag = vtkm::cont::arg::TypeCheckTagArray<TypeList>;
|
||||
using TransportTag = vtkm::cont::arg::TransportTagReducedValuesIn;
|
||||
using TransportTag = vtkm::cont::arg::TransportTagArrayIn;
|
||||
using FetchTag = vtkm::exec::arg::FetchTagArrayDirectIn;
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user