Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-20 02:55:47 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity
53a8fa7259
vtk-m/vtkm/worklet/wavelets/WaveletDWT.h

2708 lines
93 KiB
C
Raw Normal View History

move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
//============================================================================
// 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.
//
Update copyright for Sandia Sandia National Laboratories recently changed management from the Sandia Corporation to the National Technology & Engineering Solutions of Sandia, LLC (NTESS). The copyright statements need to be updated accordingly.
2017-09-20 21:33:44 +00:00
// Copyright 2014 National Technology & Engineering Solutions of Sandia, LLC (NTESS).
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
// Copyright 2014 UT-Battelle, LLC.
// Copyright 2014 Los Alamos National Security.
//
Update copyright for Sandia Sandia National Laboratories recently changed management from the Sandia Corporation to the National Technology & Engineering Solutions of Sandia, LLC (NTESS). The copyright statements need to be updated accordingly.
2017-09-20 21:33:44 +00:00
// Under the terms of Contract DE-NA0003525 with NTESS,
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
// 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_worklet_wavelets_waveletdwt_h
#define vtk_m_worklet_wavelets_waveletdwt_h
#include <vtkm/worklet/wavelets/WaveletBase.h>
#include <vtkm/worklet/wavelets/WaveletTransforms.h>
#include <vtkm/cont/ArrayHandleConcatenate.h>
#include <vtkm/cont/ArrayHandleCounting.h>
#include <vtkm/cont/ArrayHandlePermutation.h>
#include <vtkm/Math.h>
performance tunes on IDWT worklet
2016-08-12 23:38:04 +00:00
#include <vtkm/cont/Timer.h>
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
namespace vtkm
{
namespace worklet
{
namespace wavelets
{
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
class WaveletDWT : public WaveletBase
{
public:
// Constructor
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
WaveletDWT(WaveletName name)
: WaveletBase(name)
{
}
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
assign zero plane, need to implement the function in Base
2017-02-16 06:54:38 +00:00
// Function: extend a cube in X direction
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
template <typename SigInArrayType, typename ExtensionArrayType>
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
vtkm::Id Extend3DLeftRight(const SigInArrayType& sigIn, // input
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
vtkm::Id sigDimX,
vtkm::Id sigDimY,
vtkm::Id sigDimZ,
vtkm::Id sigStartX,
vtkm::Id sigStartY,
vtkm::Id sigStartZ,
vtkm::Id sigPretendDimX,
vtkm::Id sigPretendDimY,
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
vtkm::Id sigPretendDimZ,
ExtensionArrayType& ext1, // output
ExtensionArrayType& ext2, // output
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
vtkm::Id addLen,
vtkm::worklet::wavelets::DWTMode ext1Method,
vtkm::worklet::wavelets::DWTMode ext2Method,
bool pretendSigPaddedZero,
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
bool padZeroAtExt2)
sync
2017-02-16 00:14:33 +00:00
{
assign zero plane, need to implement the function in Base
2017-02-16 06:54:38 +00:00
// pretendSigPaddedZero and padZeroAtExt2 cannot happen at the same time
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
VTKM_ASSERT(!pretendSigPaddedZero || !padZeroAtExt2);
sync
2017-02-16 00:14:33 +00:00
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (addLen == 0) // Haar kernel
assign zero plane, need to implement the function in Base
2017-02-16 06:54:38 +00:00
{
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
ext1.Allocate(0); // No extension on the left side
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (pretendSigPaddedZero || padZeroAtExt2) // plane of size 1*dimY*dimZ
assign zero plane, need to implement the function in Base
2017-02-16 06:54:38 +00:00
{
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
ext2.Allocate(sigPretendDimY * sigPretendDimZ);
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
WaveletBase::DeviceAssignZero3DPlaneX(ext2, 1, sigPretendDimY, sigPretendDimZ, 0);
assign zero plane, need to implement the function in Base
2017-02-16 06:54:38 +00:00
}
else
code style improvements
2017-05-18 17:51:35 +00:00
{
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
ext2.Allocate(0); // No extension on the right side
code style improvements
2017-05-18 17:51:35 +00:00
}
assign zero plane, need to implement the function in Base
2017-02-16 06:54:38 +00:00
return 0;
}
extension3D function finished; style fixes
2017-02-17 06:23:36 +00:00
vtkm prefers 'using' over typedef.
2018-02-22 13:29:13 +00:00
using ValueType = typename SigInArrayType::ValueType;
using ExtendArrayType = vtkm::cont::ArrayHandle<ValueType>;
using ExtensionWorklet = vtkm::worklet::wavelets::ExtensionWorklet3D;
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
using DispatcherType = typename vtkm::worklet::DispatcherMapField<ExtensionWorklet>;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
vtkm::Id extDimX, extDimY, extDimZ;
vtkm::worklet::wavelets::ExtensionDirection dir;
extension3D function finished; style fixes
2017-02-17 06:23:36 +00:00
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
{ // First work on left extension
dir = LEFT;
extDimX = addLen;
extDimY = sigPretendDimY;
extDimZ = sigPretendDimZ;
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
ext1.Allocate(extDimX * extDimY * extDimZ);
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
ExtensionWorklet worklet(extDimX,
extDimY,
extDimZ,
sigDimX,
sigDimY,
sigDimZ,
sigStartX,
sigStartY,
sigStartZ,
sigPretendDimX,
sigPretendDimY,
sigPretendDimZ,
ext1Method,
dir,
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
false); // not treating input signal as having zeros
DispatcherType dispatcher(worklet);
dispatcher.Invoke(ext1, sigIn);
extension3D function finished; style fixes
2017-02-17 06:23:36 +00:00
}
// Then work on right extension
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
dir = RIGHT;
extension3D function finished; style fixes
2017-02-17 06:23:36 +00:00
extDimY = sigPretendDimY;
extDimZ = sigPretendDimZ;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (!pretendSigPaddedZero && !padZeroAtExt2)
extension3D function finished; style fixes
2017-02-17 06:23:36 +00:00
{
extDimX = addLen;
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
ext2.Allocate(extDimX * extDimY * extDimZ);
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
ExtensionWorklet worklet(extDimX,
extDimY,
extDimZ,
sigDimX,
sigDimY,
sigDimZ,
sigStartX,
sigStartY,
sigStartZ,
sigPretendDimX,
sigPretendDimY,
sigPretendDimZ,
ext2Method,
dir,
false);
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
DispatcherType dispatcher(worklet);
dispatcher.Invoke(ext2, sigIn);
}
else if (!pretendSigPaddedZero && padZeroAtExt2)
{ // This case is not exactly padding a zero at the end of Ext2.
// Rather, it is to increase extension length by one and fill it
Misc. typos Found via `codespell -q 3` via downstream VTK
2018-01-30 00:24:31 +00:00
// to be whatever mirrored.
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
extDimX = addLen + 1;
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
ext2.Allocate(extDimX * extDimY * extDimZ);
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
ExtensionWorklet worklet(extDimX,
extDimY,
extDimZ,
sigDimX,
sigDimY,
sigDimZ,
sigStartX,
sigStartY,
sigStartZ,
sigPretendDimX,
sigPretendDimY,
sigPretendDimZ,
ext2Method,
dir,
false);
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
DispatcherType dispatcher(worklet);
dispatcher.Invoke(ext2, sigIn);
}
else // pretendSigPaddedZero
extension3D function finished; style fixes
2017-02-17 06:23:36 +00:00
{
ExtendArrayType ext2Temp;
extDimX = addLen;
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
ext2Temp.Allocate(extDimX * extDimY * extDimZ);
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
ExtensionWorklet worklet(extDimX,
extDimY,
extDimZ,
sigDimX,
sigDimY,
sigDimZ,
sigStartX,
sigStartY,
sigStartZ,
sigPretendDimX,
sigPretendDimY,
sigPretendDimZ,
ext2Method,
dir,
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
true); // pretend sig is padded a zero
DispatcherType dispatcher(worklet);
dispatcher.Invoke(ext2Temp, sigIn);
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
extension3D function finished; style fixes
2017-02-17 06:23:36 +00:00
// Give ext2 one layer thicker to hold the pretend zeros from signal.
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
ext2.Allocate((extDimX + 1) * extDimY * extDimZ);
WaveletBase::DeviceCubeCopyTo(
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
ext2Temp, extDimX, extDimY, extDimZ, ext2, extDimX + 1, extDimY, extDimZ, 1, 0, 0);
WaveletBase::DeviceAssignZero3DPlaneX(ext2, extDimX + 1, extDimY, extDimZ, 0);
extension3D function finished; style fixes
2017-02-17 06:23:36 +00:00
}
return 0;
assign zero plane, need to implement the function in Base
2017-02-16 06:54:38 +00:00
}
extension3D function finished; style fixes
2017-02-17 06:23:36 +00:00
// Function: extend a cube in Y direction
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
template <typename SigInArrayType, typename ExtensionArrayType>
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
vtkm::Id Extend3DTopDown(const SigInArrayType& sigIn, // input
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
vtkm::Id sigDimX,
vtkm::Id sigDimY,
vtkm::Id sigDimZ,
vtkm::Id sigStartX,
vtkm::Id sigStartY,
vtkm::Id sigStartZ,
vtkm::Id sigPretendDimX,
vtkm::Id sigPretendDimY,
vtkm::Id sigPretendDimZ,
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
ExtensionArrayType& ext1, // output
ExtensionArrayType& ext2, // output
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
vtkm::Id addLen,
vtkm::worklet::wavelets::DWTMode ext1Method,
vtkm::worklet::wavelets::DWTMode ext2Method,
bool pretendSigPaddedZero,
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
bool padZeroAtExt2)
extension3D function finished; style fixes
2017-02-17 06:23:36 +00:00
{
// pretendSigPaddedZero and padZeroAtExt2 cannot happen at the same time
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
VTKM_ASSERT(!pretendSigPaddedZero || !padZeroAtExt2);
extension3D function finished; style fixes
2017-02-17 06:23:36 +00:00
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (addLen == 0) // Haar kernel
extension3D function finished; style fixes
2017-02-17 06:23:36 +00:00
{
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
ext1.Allocate(0); // No extension on the top side
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (pretendSigPaddedZero || padZeroAtExt2) // plane of size dimX*dimZ
extension3D function finished; style fixes
2017-02-17 06:23:36 +00:00
{
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
ext2.Allocate(sigPretendDimX * 1 * sigPretendDimZ);
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
WaveletBase::DeviceAssignZero3DPlaneY(ext2, sigPretendDimX, 1, sigPretendDimZ, 0);
extension3D function finished; style fixes
2017-02-17 06:23:36 +00:00
}
else
code style improvements
2017-05-18 17:51:35 +00:00
{
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
ext2.Allocate(0); // No extension on the right side
code style improvements
2017-05-18 17:51:35 +00:00
}
extension3D function finished; style fixes
2017-02-17 06:23:36 +00:00
return 0;
}
vtkm prefers 'using' over typedef.
2018-02-22 13:29:13 +00:00
using ValueType = typename SigInArrayType::ValueType;
using ExtendArrayType = vtkm::cont::ArrayHandle<ValueType>;
using ExtensionWorklet = vtkm::worklet::wavelets::ExtensionWorklet3D;
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
using DispatcherType = typename vtkm::worklet::DispatcherMapField<ExtensionWorklet>;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
vtkm::Id extDimX, extDimY, extDimZ;
vtkm::worklet::wavelets::ExtensionDirection dir;
extension3D function finished; style fixes
2017-02-17 06:23:36 +00:00
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
{ // First work on top extension
dir = TOP;
extDimX = sigPretendDimX;
extDimY = addLen;
extDimZ = sigPretendDimZ;
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
ext1.Allocate(extDimX * extDimY * extDimZ);
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
ExtensionWorklet worklet(extDimX,
extDimY,
extDimZ,
sigDimX,
sigDimY,
sigDimZ,
sigStartX,
sigStartY,
sigStartZ,
sigPretendDimX,
sigPretendDimY,
sigPretendDimZ,
ext1Method,
dir,
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
false); // not treating input signal as having zeros
DispatcherType dispatcher(worklet);
dispatcher.Invoke(ext1, sigIn);
extension3D function finished; style fixes
2017-02-17 06:23:36 +00:00
}
// Then work on bottom extension
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
dir = BOTTOM;
extension3D function finished; style fixes
2017-02-17 06:23:36 +00:00
extDimX = sigPretendDimX;
extDimZ = sigPretendDimZ;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (!pretendSigPaddedZero && !padZeroAtExt2)
extension3D function finished; style fixes
2017-02-17 06:23:36 +00:00
{
extDimY = addLen;
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
ext2.Allocate(extDimX * extDimY * extDimZ);
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
ExtensionWorklet worklet(extDimX,
extDimY,
extDimZ,
sigDimX,
sigDimY,
sigDimZ,
sigStartX,
sigStartY,
sigStartZ,
sigPretendDimX,
sigPretendDimY,
sigPretendDimZ,
ext2Method,
dir,
false);
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
DispatcherType dispatcher(worklet);
dispatcher.Invoke(ext2, sigIn);
}
else if (!pretendSigPaddedZero && padZeroAtExt2)
{ // This case is not exactly padding a zero at the end of Ext2.
// Rather, it is to increase extension length by one and fill it
Misc. typos Found via `codespell -q 3` via downstream VTK
2018-01-30 00:24:31 +00:00
// to be whatever mirrored.
extension3D function finished; style fixes
2017-02-17 06:23:36 +00:00
extDimY = addLen + 1;
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
ext2.Allocate(extDimX * extDimY * extDimZ);
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
ExtensionWorklet worklet(extDimX,
extDimY,
extDimZ,
sigDimX,
sigDimY,
sigDimZ,
sigStartX,
sigStartY,
sigStartZ,
sigPretendDimX,
sigPretendDimY,
sigPretendDimZ,
ext2Method,
dir,
false);
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
DispatcherType dispatcher(worklet);
dispatcher.Invoke(ext2, sigIn);
}
else // pretendSigPaddedZero
extension3D function finished; style fixes
2017-02-17 06:23:36 +00:00
{
ExtendArrayType ext2Temp;
extDimY = addLen;
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
ext2Temp.Allocate(extDimX * extDimY * extDimZ);
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
ExtensionWorklet worklet(extDimX,
extDimY,
extDimZ,
sigDimX,
sigDimY,
sigDimZ,
sigStartX,
sigStartY,
sigStartZ,
sigPretendDimX,
sigPretendDimY,
sigPretendDimZ,
ext2Method,
dir,
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
true); // pretend sig is padded a zero
DispatcherType dispatcher(worklet);
dispatcher.Invoke(ext2Temp, sigIn);
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
extension3D function finished; style fixes
2017-02-17 06:23:36 +00:00
// Give ext2 one layer thicker to hold the pretend zeros from signal.
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
ext2.Allocate(extDimX * (extDimY + 1) * extDimZ);
WaveletBase::DeviceCubeCopyTo(
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
ext2Temp, extDimX, extDimY, extDimZ, ext2, extDimX, extDimY + 1, extDimZ, 0, 1, 0);
WaveletBase::DeviceAssignZero3DPlaneY(ext2, extDimX, extDimY + 1, extDimZ, 0);
extension3D function finished; style fixes
2017-02-17 06:23:36 +00:00
}
return 0;
}
// Function: extend a cube in Z direction
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
template <typename SigInArrayType, typename ExtensionArrayType>
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
vtkm::Id Extend3DFrontBack(const SigInArrayType& sigIn, // input
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
vtkm::Id sigDimX,
vtkm::Id sigDimY,
vtkm::Id sigDimZ,
vtkm::Id sigStartX,
vtkm::Id sigStartY,
vtkm::Id sigStartZ,
vtkm::Id sigPretendDimX,
vtkm::Id sigPretendDimY,
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
vtkm::Id sigPretendDimZ,
ExtensionArrayType& ext1, // output
ExtensionArrayType& ext2, // output
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
vtkm::Id addLen,
vtkm::worklet::wavelets::DWTMode ext1Method,
vtkm::worklet::wavelets::DWTMode ext2Method,
bool pretendSigPaddedZero,
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
bool padZeroAtExt2)
extension3D function finished; style fixes
2017-02-17 06:23:36 +00:00
{
// pretendSigPaddedZero and padZeroAtExt2 cannot happen at the same time
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
VTKM_ASSERT(!pretendSigPaddedZero || !padZeroAtExt2);
extension3D function finished; style fixes
2017-02-17 06:23:36 +00:00
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (addLen == 0) // Haar kernel
extension3D function finished; style fixes
2017-02-17 06:23:36 +00:00
{
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
ext1.Allocate(0); // No extension on the front side
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (pretendSigPaddedZero || padZeroAtExt2) // plane of size dimX * dimY
extension3D function finished; style fixes
2017-02-17 06:23:36 +00:00
{
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
ext2.Allocate(sigPretendDimX * sigPretendDimY * 1);
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
WaveletBase::DeviceAssignZero3DPlaneZ(ext2, sigPretendDimX, sigPretendDimY, 1, 0);
extension3D function finished; style fixes
2017-02-17 06:23:36 +00:00
}
else
code style improvements
2017-05-18 17:51:35 +00:00
{
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
ext2.Allocate(0); // No extension on the right side
code style improvements
2017-05-18 17:51:35 +00:00
}
extension3D function finished; style fixes
2017-02-17 06:23:36 +00:00
return 0;
}
vtkm prefers 'using' over typedef.
2018-02-22 13:29:13 +00:00
using ValueType = typename SigInArrayType::ValueType;
using ExtendArrayType = vtkm::cont::ArrayHandle<ValueType>;
using ExtensionWorklet = vtkm::worklet::wavelets::ExtensionWorklet3D;
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
using DispatcherType = typename vtkm::worklet::DispatcherMapField<ExtensionWorklet>;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
vtkm::Id extDimX, extDimY, extDimZ;
vtkm::worklet::wavelets::ExtensionDirection dir;
extension3D function finished; style fixes
2017-02-17 06:23:36 +00:00
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
{ // First work on front extension
dir = FRONT;
extDimX = sigPretendDimX;
extDimY = sigPretendDimY;
extDimZ = addLen;
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
ext1.Allocate(extDimX * extDimY * extDimZ);
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
ExtensionWorklet worklet(extDimX,
extDimY,
extDimZ,
sigDimX,
sigDimY,
sigDimZ,
sigStartX,
sigStartY,
sigStartZ,
sigPretendDimX,
sigPretendDimY,
sigPretendDimZ,
ext1Method,
dir,
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
false); // not treating input signal as having zeros
DispatcherType dispatcher(worklet);
dispatcher.Invoke(ext1, sigIn);
extension3D function finished; style fixes
2017-02-17 06:23:36 +00:00
}
// Then work on back extension
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
dir = BACK;
extension3D function finished; style fixes
2017-02-17 06:23:36 +00:00
extDimX = sigPretendDimX;
extDimY = sigPretendDimY;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (!pretendSigPaddedZero && !padZeroAtExt2)
extension3D function finished; style fixes
2017-02-17 06:23:36 +00:00
{
extDimZ = addLen;
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
ext2.Allocate(extDimX * extDimY * extDimZ);
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
ExtensionWorklet worklet(extDimX,
extDimY,
extDimZ,
sigDimX,
sigDimY,
sigDimZ,
sigStartX,
sigStartY,
sigStartZ,
sigPretendDimX,
sigPretendDimY,
sigPretendDimZ,
ext2Method,
dir,
false);
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
DispatcherType dispatcher(worklet);
dispatcher.Invoke(ext2, sigIn);
}
else if (!pretendSigPaddedZero && padZeroAtExt2)
{ // This case is not exactly padding a zero at the end of Ext2.
// Rather, it is to increase extension length by one and fill it
Misc. typos Found via `codespell -q 3` via downstream VTK
2018-01-30 00:24:31 +00:00
// to be whatever mirrored.
extension3D function finished; style fixes
2017-02-17 06:23:36 +00:00
extDimZ = addLen + 1;
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
ext2.Allocate(extDimX * extDimY * extDimZ);
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
ExtensionWorklet worklet(extDimX,
extDimY,
extDimZ,
sigDimX,
sigDimY,
sigDimZ,
sigStartX,
sigStartY,
sigStartZ,
sigPretendDimX,
sigPretendDimY,
sigPretendDimZ,
ext2Method,
dir,
false);
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
DispatcherType dispatcher(worklet);
dispatcher.Invoke(ext2, sigIn);
}
else // pretendSigPaddedZero
extension3D function finished; style fixes
2017-02-17 06:23:36 +00:00
{
ExtendArrayType ext2Temp;
extDimZ = addLen;
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
ext2Temp.Allocate(extDimX * extDimY * extDimZ);
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
ExtensionWorklet worklet(extDimX,
extDimY,
extDimZ,
sigDimX,
sigDimY,
sigDimZ,
sigStartX,
sigStartY,
sigStartZ,
sigPretendDimX,
sigPretendDimY,
sigPretendDimZ,
ext2Method,
dir,
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
true); // pretend sig is padded a zero
DispatcherType dispatcher(worklet);
dispatcher.Invoke(ext2Temp, sigIn);
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
extension3D function finished; style fixes
2017-02-17 06:23:36 +00:00
// Give ext2 one layer thicker to hold the pretend zeros from signal.
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
ext2.Allocate(extDimX * extDimY * (extDimZ + 1));
WaveletBase::DeviceCubeCopyTo(
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
ext2Temp, extDimX, extDimY, extDimZ, ext2, extDimX, extDimY, extDimZ + 1, 0, 0, 1);
WaveletBase::DeviceAssignZero3DPlaneZ(ext2, extDimX, extDimY, extDimZ + 1, 0);
extension3D function finished; style fixes
2017-02-17 06:23:36 +00:00
}
return 0;
}
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
// L[3] L[15]
// -----------------------
// / / /|
// L[5] / / / |
// / LLH / HLH / |
// / / / | L[16]
// ----------------------- |
// / / /| |
// L[2] / / / | /|
// / / / | / |
// /___L[0]___/___L[12]__/ | / | L[22]
// | | | |/ |
// L[1] | | | /HHH /
// | LLL | HLL | /| /
// | | | / | / L[23]
// |---------------------|/ | /
// | | | |/
// | | | /
// L[7] | LHL | HHL | /
// | | | / L[20]
// |__________|__________|/
// L[6] L[18]
finsih DWT3D
2017-02-17 22:27:30 +00:00
//
// Performs one level of 3D discrete wavelet transform on a small cube of input array
// The output has the same size as the small cube
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
template <typename ArrayInType, typename ArrayOutType>
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
vtkm::Float64 DWT3D(ArrayInType& sigIn,
vtkm::Id sigDimX,
vtkm::Id sigDimY,
vtkm::Id sigDimZ,
vtkm::Id sigStartX,
vtkm::Id sigStartY,
vtkm::Id sigStartZ,
vtkm::Id sigPretendDimX,
vtkm::Id sigPretendDimY,
vtkm::Id sigPretendDimZ,
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
ArrayOutType& coeffOut,
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
bool discardSigIn) // discard sigIn on devices
finsih DWT3D
2017-02-17 22:27:30 +00:00
{
finish multi-level implementation, need to test
2017-02-25 18:55:00 +00:00
std::vector<vtkm::Id> L(27, 0);
finsih DWT3D
2017-02-17 22:27:30 +00:00
// LLL
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
L[0] = WaveletBase::GetApproxLength(sigPretendDimX);
L[1] = WaveletBase::GetApproxLength(sigPretendDimY);
L[2] = WaveletBase::GetApproxLength(sigPretendDimZ);
finsih DWT3D
2017-02-17 22:27:30 +00:00
// LLH
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
L[3] = L[0];
L[4] = L[1];
L[5] = WaveletBase::GetDetailLength(sigPretendDimZ);
finsih DWT3D
2017-02-17 22:27:30 +00:00
// LHL
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
L[6] = L[0];
L[7] = WaveletBase::GetDetailLength(sigPretendDimY);
L[8] = L[2];
finsih DWT3D
2017-02-17 22:27:30 +00:00
// LHH
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
L[9] = L[0];
finsih DWT3D
2017-02-17 22:27:30 +00:00
L[10] = L[7];
L[11] = L[5];
// HLL
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
L[12] = WaveletBase::GetDetailLength(sigPretendDimX);
finsih DWT3D
2017-02-17 22:27:30 +00:00
L[13] = L[1];
L[14] = L[2];
// HLH
L[15] = L[12];
L[16] = L[1];
L[17] = L[5];
// HHL
L[18] = L[12];
L[19] = L[7];
L[20] = L[2];
// HHH
L[21] = L[12];
L[22] = L[7];
L[23] = L[5];
L[24] = sigPretendDimX;
L[25] = sigPretendDimY;
L[26] = sigPretendDimZ;
vtkm::Id filterLen = WaveletBase::filter.GetFilterLength();
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
bool oddLow = true;
if (filterLen % 2 != 0)
code style improvements
2017-05-18 17:51:35 +00:00
{
finsih DWT3D
2017-02-17 22:27:30 +00:00
oddLow = false;
code style improvements
2017-05-18 17:51:35 +00:00
}
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
vtkm::Id addLen = filterLen / 2;
finsih DWT3D
2017-02-17 22:27:30 +00:00
vtkm prefers 'using' over typedef.
2018-02-22 13:29:13 +00:00
using ValueType = typename ArrayInType::ValueType;
using ArrayType = vtkm::cont::ArrayHandle<ValueType>;
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
using LeftRightXFormType = vtkm::worklet::wavelets::ForwardTransform3DLeftRight;
using TopDownXFormType = vtkm::worklet::wavelets::ForwardTransform3DTopDown;
using FrontBackXFormType = vtkm::worklet::wavelets::ForwardTransform3DFrontBack;
using LeftRightDispatcherType = vtkm::worklet::DispatcherMapField<LeftRightXFormType>;
using TopDownDispatcherType = vtkm::worklet::DispatcherMapField<TopDownXFormType>;
using FrontBackDispatcherType = vtkm::worklet::DispatcherMapField<FrontBackXFormType>;
Introduce asynchronous and device independent timer The timer class now is asynchronous and device independent. it's using an similiar API as vtkOpenGLRenderTimer with Start(), Stop(), Reset(), Ready(), and GetElapsedTime() function. For convenience and backward compability, Each Start() function call will call Reset() internally and each GetElapsedTime() function call will call Stop() function if it hasn't been called yet for keeping backward compatibility purpose. Bascially it can be used in two modes: * Create a Timer without any device info. vtkm::cont::Timer time; * It would enable timers for all enabled devices on the machine. Users can get a specific elapsed time by passing a device id into the GetElapsedtime function. If no device is provided, it would pick the maximum of all timer results - the logic behind this decision is that if cuda is disabled, openmp, serial and tbb roughly give the same results; if cuda is enabled it's safe to return the maximum elapsed time since users are more interested in the device execution time rather than the kernal launch time. The Ready function can be handy here to query the status of the timer. * Create a Timer with a device id. vtkm::cont::Timer time((vtkm::cont::DeviceAdapterTagCuda())); * It works as the old timer that times for a specific device id.
2019-01-09 16:11:49 +00:00
vtkm::cont::Timer timer;
finsih DWT3D
2017-02-17 22:27:30 +00:00
vtkm::Float64 computationTime = 0.0;
// First transform in X direction
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
ArrayType afterX;
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
afterX.Allocate(sigPretendDimX * sigPretendDimY * sigPretendDimZ);
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
{
ArrayType leftExt, rightExt;
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
this->Extend3DLeftRight(sigIn,
sigDimX,
sigDimY,
sigDimZ,
sigStartX,
sigStartY,
sigStartZ,
sigPretendDimX,
sigPretendDimY,
sigPretendDimZ,
leftExt,
rightExt,
addLen,
WaveletBase::wmode,
WaveletBase::wmode,
false,
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
false);
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
LeftRightXFormType worklet(filterLen,
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
L[0],
oddLow,
addLen,
sigPretendDimY,
sigPretendDimZ,
sigDimX,
sigDimY,
sigDimZ,
sigStartX,
sigStartY,
sigStartZ,
sigPretendDimX,
sigPretendDimY,
sigPretendDimZ,
addLen,
sigPretendDimY,
sigPretendDimZ);
finsih DWT3D
2017-02-17 22:27:30 +00:00
LeftRightDispatcherType dispatcher(worklet);
Introduce asynchronous and device independent timer The timer class now is asynchronous and device independent. it's using an similiar API as vtkOpenGLRenderTimer with Start(), Stop(), Reset(), Ready(), and GetElapsedTime() function. For convenience and backward compability, Each Start() function call will call Reset() internally and each GetElapsedTime() function call will call Stop() function if it hasn't been called yet for keeping backward compatibility purpose. Bascially it can be used in two modes: * Create a Timer without any device info. vtkm::cont::Timer time; * It would enable timers for all enabled devices on the machine. Users can get a specific elapsed time by passing a device id into the GetElapsedtime function. If no device is provided, it would pick the maximum of all timer results - the logic behind this decision is that if cuda is disabled, openmp, serial and tbb roughly give the same results; if cuda is enabled it's safe to return the maximum elapsed time since users are more interested in the device execution time rather than the kernal launch time. The Ready function can be handy here to query the status of the timer. * Create a Timer with a device id. vtkm::cont::Timer time((vtkm::cont::DeviceAdapterTagCuda())); * It works as the old timer that times for a specific device id.
2019-01-09 16:11:49 +00:00
timer.Start();
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
dispatcher.Invoke(leftExt,
sigIn,
rightExt,
WaveletBase::filter.GetLowDecomposeFilter(),
WaveletBase::filter.GetHighDecomposeFilter(),
afterX);
finsih DWT3D
2017-02-17 22:27:30 +00:00
computationTime += timer.GetElapsedTime();
}
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (discardSigIn)
code style improvements
2017-05-18 17:51:35 +00:00
{
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
sigIn.ReleaseResourcesExecution();
code style improvements
2017-05-18 17:51:35 +00:00
}
add a flag to facilitate testing
2017-03-09 03:29:27 +00:00
finsih DWT3D
2017-02-17 22:27:30 +00:00
// Then do transform in Y direction
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
ArrayType afterY;
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
afterY.Allocate(sigPretendDimX * sigPretendDimY * sigPretendDimZ);
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
{
ArrayType topExt, bottomExt;
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
this->Extend3DTopDown(afterX,
sigPretendDimX,
sigPretendDimY,
sigPretendDimZ,
0,
0,
0,
sigPretendDimX,
sigPretendDimY,
sigPretendDimZ,
topExt,
bottomExt,
addLen,
WaveletBase::wmode,
WaveletBase::wmode,
false,
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
false);
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
TopDownXFormType worklet(filterLen,
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
L[1],
oddLow,
sigPretendDimX,
addLen,
sigPretendDimZ,
sigPretendDimX,
sigPretendDimY,
sigPretendDimZ,
0,
0,
0,
sigPretendDimX,
sigPretendDimY,
sigPretendDimZ,
sigPretendDimX,
addLen,
sigPretendDimZ);
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
TopDownDispatcherType dispatcher(worklet);
Introduce asynchronous and device independent timer The timer class now is asynchronous and device independent. it's using an similiar API as vtkOpenGLRenderTimer with Start(), Stop(), Reset(), Ready(), and GetElapsedTime() function. For convenience and backward compability, Each Start() function call will call Reset() internally and each GetElapsedTime() function call will call Stop() function if it hasn't been called yet for keeping backward compatibility purpose. Bascially it can be used in two modes: * Create a Timer without any device info. vtkm::cont::Timer time; * It would enable timers for all enabled devices on the machine. Users can get a specific elapsed time by passing a device id into the GetElapsedtime function. If no device is provided, it would pick the maximum of all timer results - the logic behind this decision is that if cuda is disabled, openmp, serial and tbb roughly give the same results; if cuda is enabled it's safe to return the maximum elapsed time since users are more interested in the device execution time rather than the kernal launch time. The Ready function can be handy here to query the status of the timer. * Create a Timer with a device id. vtkm::cont::Timer time((vtkm::cont::DeviceAdapterTagCuda())); * It works as the old timer that times for a specific device id.
2019-01-09 16:11:49 +00:00
timer.Start();
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
dispatcher.Invoke(topExt,
afterX,
bottomExt,
WaveletBase::filter.GetLowDecomposeFilter(),
WaveletBase::filter.GetHighDecomposeFilter(),
afterY);
finsih DWT3D
2017-02-17 22:27:30 +00:00
computationTime += timer.GetElapsedTime();
}
// Then do transform in Z direction
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
afterX.ReleaseResources(); // release afterX
{
ArrayType frontExt, backExt;
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
coeffOut.Allocate(sigPretendDimX * sigPretendDimY * sigPretendDimZ);
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
this->Extend3DFrontBack(afterY,
sigPretendDimX,
sigPretendDimY,
sigPretendDimZ,
0,
0,
0,
sigPretendDimX,
sigPretendDimY,
sigPretendDimZ,
frontExt,
backExt,
addLen,
WaveletBase::wmode,
WaveletBase::wmode,
false,
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
false);
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
FrontBackXFormType worklet(filterLen,
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
L[1],
oddLow,
sigPretendDimX,
sigPretendDimY,
addLen,
sigPretendDimX,
sigPretendDimY,
sigPretendDimZ,
0,
0,
0,
sigPretendDimX,
sigPretendDimY,
sigPretendDimZ,
sigPretendDimX,
sigPretendDimY,
addLen);
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
FrontBackDispatcherType dispatcher(worklet);
Introduce asynchronous and device independent timer The timer class now is asynchronous and device independent. it's using an similiar API as vtkOpenGLRenderTimer with Start(), Stop(), Reset(), Ready(), and GetElapsedTime() function. For convenience and backward compability, Each Start() function call will call Reset() internally and each GetElapsedTime() function call will call Stop() function if it hasn't been called yet for keeping backward compatibility purpose. Bascially it can be used in two modes: * Create a Timer without any device info. vtkm::cont::Timer time; * It would enable timers for all enabled devices on the machine. Users can get a specific elapsed time by passing a device id into the GetElapsedtime function. If no device is provided, it would pick the maximum of all timer results - the logic behind this decision is that if cuda is disabled, openmp, serial and tbb roughly give the same results; if cuda is enabled it's safe to return the maximum elapsed time since users are more interested in the device execution time rather than the kernal launch time. The Ready function can be handy here to query the status of the timer. * Create a Timer with a device id. vtkm::cont::Timer time((vtkm::cont::DeviceAdapterTagCuda())); * It works as the old timer that times for a specific device id.
2019-01-09 16:11:49 +00:00
timer.Start();
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
dispatcher.Invoke(frontExt,
afterY,
backExt,
WaveletBase::filter.GetLowDecomposeFilter(),
WaveletBase::filter.GetHighDecomposeFilter(),
coeffOut);
finsih DWT3D
2017-02-17 22:27:30 +00:00
computationTime += timer.GetElapsedTime();
}
return computationTime;
}
debug for 3D transforms
2017-02-21 23:56:57 +00:00
// Performs one level of IDWT on a small cube of a big cube
// The output array has the same dimensions as the small cube.
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
template <typename ArrayInType, typename ArrayOutType>
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
vtkm::Float64 IDWT3D(ArrayInType& coeffIn,
vtkm::Id inDimX,
vtkm::Id inDimY,
vtkm::Id inDimZ,
vtkm::Id inStartX,
vtkm::Id inStartY,
vtkm::Id inStartZ,
const std::vector<vtkm::Id>& L,
ArrayOutType& sigOut,
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
bool discardCoeffIn) // can we discard coeffIn?
debug for 3D transforms
2017-02-21 23:56:57 +00:00
{
get rid of some asserts used for debugging
2017-05-11 17:56:20 +00:00
//VTKM_ASSERT( L.size() == 27 );
//VTKM_ASSERT( inDimX * inDimY * inDimZ == coeffIn.GetNumberOfValues() );
debug for 3D transforms
2017-02-21 23:56:57 +00:00
vtkm::Id inPretendDimX = L[0] + L[12];
vtkm::Id inPretendDimY = L[1] + L[7];
vtkm::Id inPretendDimZ = L[2] + L[5];
vtkm::Id filterLen = WaveletBase::filter.GetFilterLength();
vtkm prefers 'using' over typedef.
2018-02-22 13:29:13 +00:00
using BasicArrayType = vtkm::cont::ArrayHandle<typename ArrayInType::ValueType>;
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
using LeftRightXFormType = vtkm::worklet::wavelets::InverseTransform3DLeftRight;
using TopDownXFormType = vtkm::worklet::wavelets::InverseTransform3DTopDown;
using FrontBackXFormType = vtkm::worklet::wavelets::InverseTransform3DFrontBack;
using LeftRightDispatcherType = vtkm::worklet::DispatcherMapField<LeftRightXFormType>;
using TopDownDispatcherType = vtkm::worklet::DispatcherMapField<TopDownXFormType>;
using FrontBackDispatcherType = vtkm::worklet::DispatcherMapField<FrontBackXFormType>;
Introduce asynchronous and device independent timer The timer class now is asynchronous and device independent. it's using an similiar API as vtkOpenGLRenderTimer with Start(), Stop(), Reset(), Ready(), and GetElapsedTime() function. For convenience and backward compability, Each Start() function call will call Reset() internally and each GetElapsedTime() function call will call Stop() function if it hasn't been called yet for keeping backward compatibility purpose. Bascially it can be used in two modes: * Create a Timer without any device info. vtkm::cont::Timer time; * It would enable timers for all enabled devices on the machine. Users can get a specific elapsed time by passing a device id into the GetElapsedtime function. If no device is provided, it would pick the maximum of all timer results - the logic behind this decision is that if cuda is disabled, openmp, serial and tbb roughly give the same results; if cuda is enabled it's safe to return the maximum elapsed time since users are more interested in the device execution time rather than the kernal launch time. The Ready function can be handy here to query the status of the timer. * Create a Timer with a device id. vtkm::cont::Timer time((vtkm::cont::DeviceAdapterTagCuda())); * It works as the old timer that times for a specific device id.
2019-01-09 16:11:49 +00:00
vtkm::cont::Timer timer;
add back all the timers
2017-02-26 02:49:12 +00:00
vtkm::Float64 computationTime = 0.0;
debug for 3D transforms
2017-02-21 23:56:57 +00:00
sync to debug
2017-04-14 23:15:17 +00:00
// First, inverse transform in Z direction
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
BasicArrayType afterZ;
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
afterZ.Allocate(inPretendDimX * inPretendDimY * inPretendDimZ);
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
{
BasicArrayType ext1, ext2, ext3, ext4;
vtkm::Id extDimX = inPretendDimX;
vtkm::Id extDimY = inPretendDimY;
Correct 'may be used uninitialized in this function' warnings in wavelets
2018-04-24 15:42:06 +00:00
vtkm::Id ext1DimZ = 0, ext2DimZ = 0, ext3DimZ = 0, ext4DimZ = 0;
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
this->IDWTHelper3DFrontBack(coeffIn,
inDimX,
inDimY,
inDimZ,
inStartX,
inStartY,
inStartZ,
inPretendDimX,
inPretendDimY,
inPretendDimZ,
L[2],
L[5],
ext1,
ext2,
ext3,
ext4,
ext1DimZ,
ext2DimZ,
ext3DimZ,
ext4DimZ,
filterLen,
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
wmode);
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
FrontBackXFormType worklet(filterLen,
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
extDimX,
extDimY,
ext1DimZ, // ext1
extDimX,
extDimY,
ext2DimZ, // ext2
extDimX,
extDimY,
ext3DimZ, // ext3
extDimX,
extDimY,
ext4DimZ, // ext4
inPretendDimX,
inPretendDimY,
L[2], // cA
inPretendDimX,
inPretendDimY,
L[5], // cD
inDimX,
inDimY,
inDimZ, // coeffIn
inStartX,
inStartY,
inStartZ); // coeffIn
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
FrontBackDispatcherType dispatcher(worklet);
Introduce asynchronous and device independent timer The timer class now is asynchronous and device independent. it's using an similiar API as vtkOpenGLRenderTimer with Start(), Stop(), Reset(), Ready(), and GetElapsedTime() function. For convenience and backward compability, Each Start() function call will call Reset() internally and each GetElapsedTime() function call will call Stop() function if it hasn't been called yet for keeping backward compatibility purpose. Bascially it can be used in two modes: * Create a Timer without any device info. vtkm::cont::Timer time; * It would enable timers for all enabled devices on the machine. Users can get a specific elapsed time by passing a device id into the GetElapsedtime function. If no device is provided, it would pick the maximum of all timer results - the logic behind this decision is that if cuda is disabled, openmp, serial and tbb roughly give the same results; if cuda is enabled it's safe to return the maximum elapsed time since users are more interested in the device execution time rather than the kernal launch time. The Ready function can be handy here to query the status of the timer. * Create a Timer with a device id. vtkm::cont::Timer time((vtkm::cont::DeviceAdapterTagCuda())); * It works as the old timer that times for a specific device id.
2019-01-09 16:11:49 +00:00
timer.Start();
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
dispatcher.Invoke(ext1,
ext2,
ext3,
ext4,
coeffIn,
WaveletBase::filter.GetLowReconstructFilter(),
WaveletBase::filter.GetHighReconstructFilter(),
afterZ);
add back all the timers
2017-02-26 02:49:12 +00:00
computationTime += timer.GetElapsedTime();
debug for 3D transforms
2017-02-21 23:56:57 +00:00
}
add a flag to facilitate testing
2017-03-09 03:29:27 +00:00
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (discardCoeffIn)
code style improvements
2017-05-18 17:51:35 +00:00
{
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
coeffIn.ReleaseResourcesExecution();
code style improvements
2017-05-18 17:51:35 +00:00
}
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
sync to debug
2017-04-14 23:15:17 +00:00
// Second, inverse transform in Y direction
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
BasicArrayType afterY;
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
afterY.Allocate(inPretendDimX * inPretendDimY * inPretendDimZ);
debug for 3D transforms
2017-02-21 23:56:57 +00:00
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
BasicArrayType ext1, ext2, ext3, ext4;
debug for 3D transforms
2017-02-21 23:56:57 +00:00
vtkm::Id extDimX = inPretendDimX;
vtkm::Id extDimZ = inPretendDimZ;
Correct 'may be used uninitialized in this function' warnings in wavelets
2018-04-24 15:42:06 +00:00
vtkm::Id ext1DimY = 0, ext2DimY = 0, ext3DimY = 0, ext4DimY = 0;
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
this->IDWTHelper3DTopDown(afterZ,
inPretendDimX,
inPretendDimY,
inPretendDimZ,
0,
0,
0,
inPretendDimX,
inPretendDimY,
inPretendDimZ,
L[1],
L[7],
ext1,
ext2,
ext3,
ext4,
ext1DimY,
ext2DimY,
ext3DimY,
ext4DimY,
filterLen,
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
wmode);
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
TopDownXFormType worklet(filterLen,
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
extDimX,
ext1DimY,
extDimZ, // ext1
extDimX,
ext2DimY,
extDimZ, // ext2
extDimX,
ext3DimY,
extDimZ, // ext3
extDimX,
ext4DimY,
extDimZ, // ext4
inPretendDimX,
L[1],
inPretendDimZ, // cA
inPretendDimX,
L[7],
inPretendDimZ, // cD
inPretendDimX,
inPretendDimY,
inPretendDimZ, // actual signal
0,
0,
0);
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
TopDownDispatcherType dispatcher(worklet);
Introduce asynchronous and device independent timer The timer class now is asynchronous and device independent. it's using an similiar API as vtkOpenGLRenderTimer with Start(), Stop(), Reset(), Ready(), and GetElapsedTime() function. For convenience and backward compability, Each Start() function call will call Reset() internally and each GetElapsedTime() function call will call Stop() function if it hasn't been called yet for keeping backward compatibility purpose. Bascially it can be used in two modes: * Create a Timer without any device info. vtkm::cont::Timer time; * It would enable timers for all enabled devices on the machine. Users can get a specific elapsed time by passing a device id into the GetElapsedtime function. If no device is provided, it would pick the maximum of all timer results - the logic behind this decision is that if cuda is disabled, openmp, serial and tbb roughly give the same results; if cuda is enabled it's safe to return the maximum elapsed time since users are more interested in the device execution time rather than the kernal launch time. The Ready function can be handy here to query the status of the timer. * Create a Timer with a device id. vtkm::cont::Timer time((vtkm::cont::DeviceAdapterTagCuda())); * It works as the old timer that times for a specific device id.
2019-01-09 16:11:49 +00:00
timer.Start();
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
dispatcher.Invoke(ext1,
ext2,
ext3,
ext4,
afterZ,
WaveletBase::filter.GetLowReconstructFilter(),
WaveletBase::filter.GetHighReconstructFilter(),
afterY);
add back all the timers
2017-02-26 02:49:12 +00:00
computationTime += timer.GetElapsedTime();
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
}
debug for 3D transforms
2017-02-21 23:56:57 +00:00
sync to debug
2017-04-14 23:15:17 +00:00
// Lastly, inverse transform in X direction
debug for 3D transforms
2017-02-21 23:56:57 +00:00
afterZ.ReleaseResources();
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
BasicArrayType ext1, ext2, ext3, ext4;
vtkm::Id extDimY = inPretendDimY;
vtkm::Id extDimZ = inPretendDimZ;
Correct 'may be used uninitialized in this function' warnings in wavelets
2018-04-24 15:42:06 +00:00
vtkm::Id ext1DimX = 0, ext2DimX = 0, ext3DimX = 0, ext4DimX = 0;
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
this->IDWTHelper3DLeftRight(afterY,
inPretendDimX,
inPretendDimY,
inPretendDimZ,
0,
0,
0,
inPretendDimX,
inPretendDimY,
inPretendDimZ,
L[0],
L[12],
ext1,
ext2,
ext3,
ext4,
ext1DimX,
ext2DimX,
ext3DimX,
ext4DimX,
filterLen,
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
wmode);
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
sigOut.Allocate(inPretendDimX * inPretendDimY * inPretendDimZ);
LeftRightXFormType worklet(filterLen,
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
ext1DimX,
extDimY,
extDimZ, // ext1
ext2DimX,
extDimY,
extDimZ, // ext2
ext3DimX,
extDimY,
extDimZ, // ext3
ext4DimX,
extDimY,
extDimZ, // ext4
L[0],
inPretendDimY,
inPretendDimZ, // cA
L[12],
inPretendDimY,
inPretendDimZ, // cD
inPretendDimX,
inPretendDimY,
inPretendDimZ, // actual signal
0,
0,
0);
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
LeftRightDispatcherType dispatcher(worklet);
Introduce asynchronous and device independent timer The timer class now is asynchronous and device independent. it's using an similiar API as vtkOpenGLRenderTimer with Start(), Stop(), Reset(), Ready(), and GetElapsedTime() function. For convenience and backward compability, Each Start() function call will call Reset() internally and each GetElapsedTime() function call will call Stop() function if it hasn't been called yet for keeping backward compatibility purpose. Bascially it can be used in two modes: * Create a Timer without any device info. vtkm::cont::Timer time; * It would enable timers for all enabled devices on the machine. Users can get a specific elapsed time by passing a device id into the GetElapsedtime function. If no device is provided, it would pick the maximum of all timer results - the logic behind this decision is that if cuda is disabled, openmp, serial and tbb roughly give the same results; if cuda is enabled it's safe to return the maximum elapsed time since users are more interested in the device execution time rather than the kernal launch time. The Ready function can be handy here to query the status of the timer. * Create a Timer with a device id. vtkm::cont::Timer time((vtkm::cont::DeviceAdapterTagCuda())); * It works as the old timer that times for a specific device id.
2019-01-09 16:11:49 +00:00
timer.Start();
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
dispatcher.Invoke(ext1,
ext2,
ext3,
ext4,
afterY,
WaveletBase::filter.GetLowReconstructFilter(),
WaveletBase::filter.GetHighReconstructFilter(),
sigOut);
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
computationTime += timer.GetElapsedTime();
debug for 3D transforms
2017-02-21 23:56:57 +00:00
}
add back all the timers
2017-02-26 02:49:12 +00:00
return computationTime;
debug for 3D transforms
2017-02-21 23:56:57 +00:00
}
//=============================================================================
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
template <typename SigInArrayType, typename ExtensionArrayType>
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
vtkm::Id Extend2D(const SigInArrayType& sigIn, // Input
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
vtkm::Id sigDimX,
vtkm::Id sigDimY,
vtkm::Id sigStartX,
vtkm::Id sigStartY,
vtkm::Id sigPretendDimX,
vtkm::Id sigPretendDimY,
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
ExtensionArrayType& ext1, // left/top extension
ExtensionArrayType& ext2, // right/bottom extension
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
vtkm::Id addLen,
vtkm::worklet::wavelets::DWTMode ext1Method,
vtkm::worklet::wavelets::DWTMode ext2Method,
bool pretendSigPaddedZero,
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
bool padZeroAtExt2,
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
bool modeLR) // true = left-right, false = top-down
forward transform now avoids data copy when performing multi-level transforms
2016-10-05 22:52:07 +00:00
{
// pretendSigPaddedZero and padZeroAtExt2 cannot happen at the same time
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
VTKM_ASSERT(!pretendSigPaddedZero || !padZeroAtExt2);
forward transform now avoids data copy when performing multi-level transforms
2016-10-05 22:52:07 +00:00
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (addLen == 0) // Haar kernel
forward transform now avoids data copy when performing multi-level transforms
2016-10-05 22:52:07 +00:00
{
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
ext1.Allocate(0); // no need to extend on left/top
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (pretendSigPaddedZero || padZeroAtExt2)
forward transform now avoids data copy when performing multi-level transforms
2016-10-05 22:52:07 +00:00
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (modeLR) // right extension
forward transform now avoids data copy when performing multi-level transforms
2016-10-05 22:52:07 +00:00
{
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
ext2.Allocate(sigPretendDimY);
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
WaveletBase::DeviceAssignZero2DColumn(ext2, 1, sigPretendDimY, 0);
forward transform now avoids data copy when performing multi-level transforms
2016-10-05 22:52:07 +00:00
}
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
else // bottom extension
forward transform now avoids data copy when performing multi-level transforms
2016-10-05 22:52:07 +00:00
{
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
ext2.Allocate(sigPretendDimX);
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
WaveletBase::DeviceAssignZero2DRow(ext2, sigPretendDimX, 1, 0);
forward transform now avoids data copy when performing multi-level transforms
2016-10-05 22:52:07 +00:00
}
}
else
code style improvements
2017-05-18 17:51:35 +00:00
{
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
ext2.Allocate(0);
code style improvements
2017-05-18 17:51:35 +00:00
}
forward transform now avoids data copy when performing multi-level transforms
2016-10-05 22:52:07 +00:00
return 0;
}
vtkm prefers 'using' over typedef.
2018-02-22 13:29:13 +00:00
using ValueType = typename SigInArrayType::ValueType;
using ExtendArrayType = vtkm::cont::ArrayHandle<ValueType>;
using ExtensionWorklet = vtkm::worklet::wavelets::ExtensionWorklet2D;
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
using DispatcherType = typename vtkm::worklet::DispatcherMapField<ExtensionWorklet>;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
vtkm::Id extDimX, extDimY;
vtkm::worklet::wavelets::ExtensionDirection dir;
forward transform now avoids data copy when performing multi-level transforms
2016-10-05 22:52:07 +00:00
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
{ // Work on left/top extension
if (modeLR)
{
dir = LEFT;
extDimX = addLen;
extDimY = sigPretendDimY;
}
else
{
dir = TOP;
extDimX = sigPretendDimX;
extDimY = addLen;
}
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
ext1.Allocate(extDimX * extDimY);
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
ExtensionWorklet worklet(extDimX,
extDimY,
sigDimX,
sigDimY,
sigStartX,
sigStartY,
sigPretendDimX,
sigPretendDimY, // use this area
ext1Method,
dir,
false); // not treating sigIn as having zeros
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
DispatcherType dispatcher(worklet);
dispatcher.Invoke(ext1, sigIn);
forward transform now avoids data copy when performing multi-level transforms
2016-10-05 22:52:07 +00:00
}
// Work on right/bottom extension
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (!pretendSigPaddedZero && !padZeroAtExt2)
forward transform now avoids data copy when performing multi-level transforms
2016-10-05 22:52:07 +00:00
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (modeLR)
forward transform now avoids data copy when performing multi-level transforms
2016-10-05 22:52:07 +00:00
{
dir = RIGHT;
extDimX = addLen;
extDimY = sigPretendDimY;
}
else
{
dir = BOTTOM;
extDimX = sigPretendDimX;
extDimY = addLen;
}
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
ext2.Allocate(extDimX * extDimY);
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
ExtensionWorklet worklet(extDimX,
extDimY,
sigDimX,
sigDimY,
sigStartX,
sigStartY,
sigPretendDimX,
sigPretendDimY, // use this area
ext2Method,
dir,
false);
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
DispatcherType dispatcher(worklet);
dispatcher.Invoke(ext2, sigIn);
forward transform now avoids data copy when performing multi-level transforms
2016-10-05 22:52:07 +00:00
}
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
else if (!pretendSigPaddedZero && padZeroAtExt2)
forward transform now avoids data copy when performing multi-level transforms
2016-10-05 22:52:07 +00:00
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (modeLR)
forward transform now avoids data copy when performing multi-level transforms
2016-10-05 22:52:07 +00:00
{
dir = RIGHT;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
extDimX = addLen + 1;
forward transform now avoids data copy when performing multi-level transforms
2016-10-05 22:52:07 +00:00
extDimY = sigPretendDimY;
}
else
{
dir = BOTTOM;
extDimX = sigPretendDimX;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
extDimY = addLen + 1;
}
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
ext2.Allocate(extDimX * extDimY);
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
ExtensionWorklet worklet(extDimX,
extDimY,
sigDimX,
sigDimY,
sigStartX,
sigStartY,
sigPretendDimX,
sigPretendDimY,
ext2Method,
dir,
false);
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
DispatcherType dispatcher(worklet);
dispatcher.Invoke(ext2, sigIn);
update 2D idwt to not assign zero to the last element of cDTemp
2016-10-25 02:11:05 +00:00
/* Pad a zero at the end of cDTemp, when cDTemp is forced to have the same
length as cATemp. For example, with odd length signal, cA is 1 element
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
longer than cD.
update 2D idwt to not assign zero to the last element of cDTemp
2016-10-25 02:11:05 +00:00
*/
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
/* Update 10/24/2016: the extra element of cD shouldn't be zero, just be
update 2D idwt to not assign zero to the last element of cDTemp
2016-10-25 02:11:05 +00:00
* whatever it extends to be.
* if( modeLR )
* WaveletBase::DeviceAssignZero2DColumn( ext2, extDimX, extDimY,
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
* extDimX-1 );
update 2D idwt to not assign zero to the last element of cDTemp
2016-10-25 02:11:05 +00:00
* else
* WaveletBase::DeviceAssignZero2DRow( ext2, extDimX, extDimY,
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
* extDimY-1 );
update 2D idwt to not assign zero to the last element of cDTemp
2016-10-25 02:11:05 +00:00
*/
forward transform now avoids data copy when performing multi-level transforms
2016-10-05 22:52:07 +00:00
}
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
else // pretendSigPaddedZero
forward transform now avoids data copy when performing multi-level transforms
2016-10-05 22:52:07 +00:00
{
ExtendArrayType ext2Temp;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (modeLR)
forward transform now avoids data copy when performing multi-level transforms
2016-10-05 22:52:07 +00:00
{
dir = RIGHT;
extDimX = addLen;
extDimY = sigPretendDimY;
}
else
{
dir = BOTTOM;
extDimX = sigPretendDimX;
extDimY = addLen;
}
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
ext2Temp.Allocate(extDimX * extDimY);
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
ExtensionWorklet worklet(extDimX,
extDimY,
sigDimX,
sigDimY,
sigStartX,
sigStartY,
sigPretendDimX,
sigPretendDimY,
ext2Method,
dir,
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
true); // pretend sig is padded a zero
DispatcherType dispatcher(worklet);
dispatcher.Invoke(ext2Temp, sigIn);
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (modeLR)
forward transform now avoids data copy when performing multi-level transforms
2016-10-05 22:52:07 +00:00
{
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
ext2.Allocate((extDimX + 1) * extDimY);
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
WaveletBase::DeviceRectangleCopyTo(
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
ext2Temp, extDimX, extDimY, ext2, extDimX + 1, extDimY, 1, 0);
WaveletBase::DeviceAssignZero2DColumn(ext2, extDimX + 1, extDimY, 0);
forward transform now avoids data copy when performing multi-level transforms
2016-10-05 22:52:07 +00:00
}
else
{
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
ext2.Allocate(extDimX * (extDimY + 1));
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
WaveletBase::DeviceRectangleCopyTo(
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
ext2Temp, extDimX, extDimY, ext2, extDimX, extDimY + 1, 0, 1);
WaveletBase::DeviceAssignZero2DRow(ext2, extDimX, extDimY + 1, 0);
forward transform now avoids data copy when performing multi-level transforms
2016-10-05 22:52:07 +00:00
}
}
return 0;
}
move to linux to debug
2016-09-11 22:14:01 +00:00
2D wavelet compressor ready for Rob to review
2016-10-10 04:52:02 +00:00
// Extend 1D signal
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
template <typename SigInArrayType, typename SigExtendedArrayType>
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
vtkm::Id Extend1D(const SigInArrayType& sigIn, // Input
SigExtendedArrayType& sigOut, // Output
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
vtkm::Id addLen,
vtkm::worklet::wavelets::DWTMode leftExtMethod,
vtkm::worklet::wavelets::DWTMode rightExtMethod,
bool attachZeroRightLeft,
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
bool attachZeroRightRight)
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
{
half done even length filters implementation
2016-08-15 19:46:35 +00:00
// "right extension" can be attached a zero on either end, but not both ends.
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
VTKM_ASSERT(!attachZeroRightRight || !attachZeroRightLeft);
two new wavelet filters, HAAR and CDF8/4 supported now
2016-08-16 21:20:19 +00:00
vtkm prefers 'using' over typedef.
2018-02-22 13:29:13 +00:00
using ValueType = typename SigInArrayType::ValueType;
using ExtensionArrayType = vtkm::cont::ArrayHandle<ValueType>;
using ArrayConcat = vtkm::cont::ArrayHandleConcatenate<ExtensionArrayType, SigInArrayType>;
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
ExtensionArrayType leftExtend, rightExtend;
two new wavelet filters, HAAR and CDF8/4 supported now
2016-08-16 21:20:19 +00:00
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (addLen == 0) // Haar kernel
fix a cuda memory bug
2016-09-07 23:43:10 +00:00
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (attachZeroRightLeft || attachZeroRightRight)
fix a cuda memory bug
2016-09-07 23:43:10 +00:00
{
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
leftExtend.Allocate(0);
rightExtend.Allocate(1);
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
WaveletBase::DeviceAssignZero(rightExtend, 0);
fix a cuda memory bug
2016-09-07 23:43:10 +00:00
}
else
{
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
leftExtend.Allocate(0);
rightExtend.Allocate(0);
fix a cuda memory bug
2016-09-07 23:43:10 +00:00
}
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
ArrayConcat leftOn(leftExtend, sigIn);
sigOut = vtkm::cont::make_ArrayHandleConcatenate(leftOn, rightExtend);
fix a cuda memory bug
2016-09-07 23:43:10 +00:00
return 0;
}
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
leftExtend.Allocate(addLen);
use a worklet to perform array extension
2016-08-03 20:34:02 +00:00
vtkm::Id sigInLen = sigIn.GetNumberOfValues();
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
vtkm prefers 'using' over typedef.
2018-02-22 13:29:13 +00:00
using LeftSYMH = vtkm::worklet::wavelets::LeftSYMHExtentionWorklet;
using LeftSYMW = vtkm::worklet::wavelets::LeftSYMWExtentionWorklet;
using RightSYMH = vtkm::worklet::wavelets::RightSYMHExtentionWorklet;
using RightSYMW = vtkm::worklet::wavelets::RightSYMWExtentionWorklet;
using LeftASYMH = vtkm::worklet::wavelets::LeftASYMHExtentionWorklet;
using LeftASYMW = vtkm::worklet::wavelets::LeftASYMWExtentionWorklet;
using RightASYMH = vtkm::worklet::wavelets::RightASYMHExtentionWorklet;
using RightASYMW = vtkm::worklet::wavelets::RightASYMWExtentionWorklet;
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
switch (leftExtMethod)
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
{
working on even length filters; need ASYM* support in Extend1D()
2016-08-15 23:54:15 +00:00
case SYMH:
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
LeftSYMH worklet(addLen);
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
vtkm::worklet::DispatcherMapField<LeftSYMH> dispatcher(worklet);
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
dispatcher.Invoke(leftExtend, sigIn);
break;
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
}
working on even length filters; need ASYM* support in Extend1D()
2016-08-15 23:54:15 +00:00
case SYMW:
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
LeftSYMW worklet(addLen);
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
vtkm::worklet::DispatcherMapField<LeftSYMW> dispatcher(worklet);
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
dispatcher.Invoke(leftExtend, sigIn);
break;
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
}
two new wavelet filters, HAAR and CDF8/4 supported now
2016-08-16 21:20:19 +00:00
case ASYMH:
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
LeftASYMH worklet(addLen);
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
vtkm::worklet::DispatcherMapField<LeftASYMH> dispatcher(worklet);
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
dispatcher.Invoke(leftExtend, sigIn);
break;
two new wavelet filters, HAAR and CDF8/4 supported now
2016-08-16 21:20:19 +00:00
}
case ASYMW:
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
LeftASYMW worklet(addLen);
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
vtkm::worklet::DispatcherMapField<LeftASYMW> dispatcher(worklet);
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
dispatcher.Invoke(leftExtend, sigIn);
break;
two new wavelet filters, HAAR and CDF8/4 supported now
2016-08-16 21:20:19 +00:00
}
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
default:
{
Simplify exception hierarchy. Remove the ErrorControl class such that all subclasses now inherit from error. Renamed all exception classes via s/ErrorControl/Error/. See issue #57.
2017-01-09 21:15:32 +00:00
vtkm::cont::ErrorInternal("Left extension mode not supported!");
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
return 1;
}
}
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (!attachZeroRightLeft) // no attach zero, or only attach on RightRight
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
{
two new wavelet filters, HAAR and CDF8/4 supported now
2016-08-16 21:20:19 +00:00
// Allocate memory
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (attachZeroRightRight)
code style improvements
2017-05-18 17:51:35 +00:00
{
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
rightExtend.Allocate(addLen + 1);
code style improvements
2017-05-18 17:51:35 +00:00
}
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
else
code style improvements
2017-05-18 17:51:35 +00:00
{
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
rightExtend.Allocate(addLen);
code style improvements
2017-05-18 17:51:35 +00:00
}
two new wavelet filters, HAAR and CDF8/4 supported now
2016-08-16 21:20:19 +00:00
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
switch (rightExtMethod)
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
{
two new wavelet filters, HAAR and CDF8/4 supported now
2016-08-16 21:20:19 +00:00
case SYMH:
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
RightSYMH worklet(sigInLen);
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
vtkm::worklet::DispatcherMapField<RightSYMH> dispatcher(worklet);
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
dispatcher.Invoke(rightExtend, sigIn);
break;
two new wavelet filters, HAAR and CDF8/4 supported now
2016-08-16 21:20:19 +00:00
}
case SYMW:
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
RightSYMW worklet(sigInLen);
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
vtkm::worklet::DispatcherMapField<RightSYMW> dispatcher(worklet);
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
dispatcher.Invoke(rightExtend, sigIn);
break;
two new wavelet filters, HAAR and CDF8/4 supported now
2016-08-16 21:20:19 +00:00
}
case ASYMH:
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
RightASYMH worklet(sigInLen);
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
vtkm::worklet::DispatcherMapField<RightASYMH> dispatcher(worklet);
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
dispatcher.Invoke(rightExtend, sigIn);
break;
two new wavelet filters, HAAR and CDF8/4 supported now
2016-08-16 21:20:19 +00:00
}
case ASYMW:
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
RightASYMW worklet(sigInLen);
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
vtkm::worklet::DispatcherMapField<RightASYMW> dispatcher(worklet);
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
dispatcher.Invoke(rightExtend, sigIn);
break;
two new wavelet filters, HAAR and CDF8/4 supported now
2016-08-16 21:20:19 +00:00
}
default:
{
Simplify exception hierarchy. Remove the ErrorControl class such that all subclasses now inherit from error. Renamed all exception classes via s/ErrorControl/Error/. See issue #57.
2017-01-09 21:15:32 +00:00
vtkm::cont::ErrorInternal("Right extension mode not supported!");
two new wavelet filters, HAAR and CDF8/4 supported now
2016-08-16 21:20:19 +00:00
return 1;
}
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
}
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (attachZeroRightRight)
code style improvements
2017-05-18 17:51:35 +00:00
{
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
WaveletBase::DeviceAssignZero(rightExtend, addLen);
code style improvements
2017-05-18 17:51:35 +00:00
}
two new wavelet filters, HAAR and CDF8/4 supported now
2016-08-16 21:20:19 +00:00
}
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
else // attachZeroRightLeft mode
two new wavelet filters, HAAR and CDF8/4 supported now
2016-08-16 21:20:19 +00:00
{
vtkm prefers 'using' over typedef.
2018-02-22 13:29:13 +00:00
using ConcatArray = vtkm::cont::ArrayHandleConcatenate<SigInArrayType, ExtensionArrayType>;
two new wavelet filters, HAAR and CDF8/4 supported now
2016-08-16 21:20:19 +00:00
// attach a zero at the end of sigIn
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
ExtensionArrayType singleValArray;
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
singleValArray.Allocate(1);
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
WaveletBase::DeviceAssignZero(singleValArray, 0);
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
ConcatArray sigInPlusOne(sigIn, singleValArray);
two new wavelet filters, HAAR and CDF8/4 supported now
2016-08-16 21:20:19 +00:00
// allocate memory for extension
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
rightExtend.Allocate(addLen);
two new wavelet filters, HAAR and CDF8/4 supported now
2016-08-16 21:20:19 +00:00
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
switch (rightExtMethod)
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
{
two new wavelet filters, HAAR and CDF8/4 supported now
2016-08-16 21:20:19 +00:00
case SYMH:
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
RightSYMH worklet(sigInLen + 1);
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
vtkm::worklet::DispatcherMapField<RightSYMH> dispatcher(worklet);
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
dispatcher.Invoke(rightExtend, sigInPlusOne);
break;
two new wavelet filters, HAAR and CDF8/4 supported now
2016-08-16 21:20:19 +00:00
}
case SYMW:
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
RightSYMW worklet(sigInLen + 1);
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
vtkm::worklet::DispatcherMapField<RightSYMW> dispatcher(worklet);
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
dispatcher.Invoke(rightExtend, sigInPlusOne);
break;
two new wavelet filters, HAAR and CDF8/4 supported now
2016-08-16 21:20:19 +00:00
}
case ASYMH:
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
RightASYMH worklet(sigInLen + 1);
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
vtkm::worklet::DispatcherMapField<RightASYMH> dispatcher(worklet);
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
dispatcher.Invoke(rightExtend, sigInPlusOne);
break;
two new wavelet filters, HAAR and CDF8/4 supported now
2016-08-16 21:20:19 +00:00
}
case ASYMW:
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
RightASYMW worklet(sigInLen + 1);
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
vtkm::worklet::DispatcherMapField<RightASYMW> dispatcher(worklet);
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
dispatcher.Invoke(rightExtend, sigInPlusOne);
break;
two new wavelet filters, HAAR and CDF8/4 supported now
2016-08-16 21:20:19 +00:00
}
default:
{
Simplify exception hierarchy. Remove the ErrorControl class such that all subclasses now inherit from error. Renamed all exception classes via s/ErrorControl/Error/. See issue #57.
2017-01-09 21:15:32 +00:00
vtkm::cont::ErrorInternal("Right extension mode not supported!");
two new wavelet filters, HAAR and CDF8/4 supported now
2016-08-16 21:20:19 +00:00
return 1;
}
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
}
two new wavelet filters, HAAR and CDF8/4 supported now
2016-08-16 21:20:19 +00:00
// make a copy of rightExtend with a zero attached to the left
half done even length filters implementation
2016-08-15 19:46:35 +00:00
ExtensionArrayType rightExtendPlusOne;
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
rightExtendPlusOne.Allocate(addLen + 1);
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
WaveletBase::DeviceCopyStartX(rightExtend, rightExtendPlusOne, 1);
WaveletBase::DeviceAssignZero(rightExtendPlusOne, 0);
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
rightExtend = rightExtendPlusOne;
use a worklet to perform array extension
2016-08-03 20:34:02 +00:00
}
extend1D returns ArrayHandlePermut
2016-08-03 03:41:46 +00:00
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
ArrayConcat leftOn(leftExtend, sigIn);
sigOut = vtkm::cont::make_ArrayHandleConcatenate(leftOn, rightExtend);
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
return 0;
}
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
// Performs one level of 1D discrete wavelet transform
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
// It takes care of boundary conditions, etc.
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
template <typename SignalArrayType, typename CoeffArrayType>
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
vtkm::Float64 DWT1D(const SignalArrayType& sigIn, // Input
CoeffArrayType& coeffOut, // Output: cA followed by cD
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
std::vector<vtkm::Id>& L) // Output: how many cA and cD.
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
{
vtkm::Id sigInLen = sigIn.GetNumberOfValues();
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (GetWaveletMaxLevel(sigInLen) < 1)
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
vtkm::cont::ErrorInternal("Signal is too short to perform DWT!");
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
return -1;
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
}
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
get rid of some asserts used for debugging
2017-05-11 17:56:20 +00:00
//VTKM_ASSERT( L.size() == 3 );
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
L[0] = WaveletBase::GetApproxLength(sigInLen);
L[1] = WaveletBase::GetDetailLength(sigInLen);
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
L[2] = sigInLen;
get rid of some asserts used for debugging
2017-05-11 17:56:20 +00:00
//VTKM_ASSERT( L[0] + L[1] == L[2] );
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
Change on class signatures of Filter and Base
2016-08-10 23:24:22 +00:00
vtkm::Id filterLen = WaveletBase::filter.GetFilterLength();
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
bool doSymConv = false;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (WaveletBase::filter.isSymmetric())
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if ((WaveletBase::wmode == SYMW && (filterLen % 2 != 0)) ||
(WaveletBase::wmode == SYMH && (filterLen % 2 == 0)))
code style improvements
2017-05-18 17:51:35 +00:00
{
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
doSymConv = true;
code style improvements
2017-05-18 17:51:35 +00:00
}
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
}
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
vtkm::Id sigConvolvedLen = L[0] + L[1]; // approx + detail coeffs
vtkm::Id addLen; // for extension
bool oddLow = true;
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
bool oddHigh = true;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (filterLen % 2 != 0)
code style improvements
2017-05-18 17:51:35 +00:00
{
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
oddLow = false;
code style improvements
2017-05-18 17:51:35 +00:00
}
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (doSymConv)
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
{
addLen = filterLen / 2;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (sigInLen % 2 != 0)
code style improvements
2017-05-18 17:51:35 +00:00
{
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
sigConvolvedLen += 1;
code style improvements
2017-05-18 17:51:35 +00:00
}
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
}
else
code style improvements
2017-05-18 17:51:35 +00:00
{
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
addLen = filterLen - 1;
code style improvements
2017-05-18 17:51:35 +00:00
}
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
vtkm::Id sigExtendedLen = sigInLen + 2 * addLen;
vtkm prefers 'using' over typedef.
2018-02-22 13:29:13 +00:00
using SigInValueType = typename SignalArrayType::ValueType;
using SigInBasic = vtkm::cont::ArrayHandle<SigInValueType>;
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
vtkm prefers 'using' over typedef.
2018-02-22 13:29:13 +00:00
using ConcatType1 = vtkm::cont::ArrayHandleConcatenate<SigInBasic, SignalArrayType>;
using ConcatType2 = vtkm::cont::ArrayHandleConcatenate<ConcatType1, SigInBasic>;
extend1D returns ArrayHandlePermut
2016-08-03 03:41:46 +00:00
ConcatType2 sigInExtended;
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
this->Extend1D(
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
sigIn, sigInExtended, addLen, WaveletBase::wmode, WaveletBase::wmode, false, false);
get rid of some asserts used for debugging
2017-05-11 17:56:20 +00:00
//VTKM_ASSERT( sigInExtended.GetNumberOfValues() == sigExtendedLen );
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
half done even length filters implementation
2016-08-15 19:46:35 +00:00
// initialize a worklet for forward transform
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
vtkm::worklet::wavelets::ForwardTransform forwardTransform(
filterLen, L[0], L[1], oddLow, oddHigh);
coeffOut.Allocate(sigExtendedLen);
vtkm::worklet::DispatcherMapField<vtkm::worklet::wavelets::ForwardTransform> dispatcher(
forwardTransform);
add timers to report worklet computation time
2016-08-23 23:52:40 +00:00
// put a timer
Introduce asynchronous and device independent timer The timer class now is asynchronous and device independent. it's using an similiar API as vtkOpenGLRenderTimer with Start(), Stop(), Reset(), Ready(), and GetElapsedTime() function. For convenience and backward compability, Each Start() function call will call Reset() internally and each GetElapsedTime() function call will call Stop() function if it hasn't been called yet for keeping backward compatibility purpose. Bascially it can be used in two modes: * Create a Timer without any device info. vtkm::cont::Timer time; * It would enable timers for all enabled devices on the machine. Users can get a specific elapsed time by passing a device id into the GetElapsedtime function. If no device is provided, it would pick the maximum of all timer results - the logic behind this decision is that if cuda is disabled, openmp, serial and tbb roughly give the same results; if cuda is enabled it's safe to return the maximum elapsed time since users are more interested in the device execution time rather than the kernal launch time. The Ready function can be handy here to query the status of the timer. * Create a Timer with a device id. vtkm::cont::Timer time((vtkm::cont::DeviceAdapterTagCuda())); * It works as the old timer that times for a specific device id.
2019-01-09 16:11:49 +00:00
vtkm::cont::Timer timer;
timer.Start();
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
dispatcher.Invoke(sigInExtended,
WaveletBase::filter.GetLowDecomposeFilter(),
WaveletBase::filter.GetHighDecomposeFilter(),
coeffOut);
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
vtkm::Float64 elapsedTime = timer.GetElapsedTime();
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
get rid of some asserts used for debugging
2017-05-11 17:56:20 +00:00
//VTKM_ASSERT( L[0] + L[1] <= coeffOut.GetNumberOfValues() );
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
coeffOut.Shrink(L[0] + L[1]);
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
return elapsedTime;
}
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
// Performs one level of inverse wavelet transform
// It takes care of boundary conditions, etc.
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
template <typename CoeffArrayType, typename SignalArrayType>
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
vtkm::Float64 IDWT1D(const CoeffArrayType& coeffIn, // Input, cA followed by cD
std::vector<vtkm::Id>& L, // Input, how many cA and cD
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
SignalArrayType& sigOut) // Output
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
{
Change on class signatures of Filter and Base
2016-08-10 23:24:22 +00:00
vtkm::Id filterLen = WaveletBase::filter.GetFilterLength();
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
bool doSymConv = false;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
vtkm::worklet::wavelets::DWTMode cALeftMode = WaveletBase::wmode;
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
vtkm::worklet::wavelets::DWTMode cARightMode = WaveletBase::wmode;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
vtkm::worklet::wavelets::DWTMode cDLeftMode = WaveletBase::wmode;
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
vtkm::worklet::wavelets::DWTMode cDRightMode = WaveletBase::wmode;
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (WaveletBase::filter.isSymmetric()) // this is always true with the 1st 4 filters.
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if ((WaveletBase::wmode == SYMW && (filterLen % 2 != 0)) ||
(WaveletBase::wmode == SYMH && (filterLen % 2 == 0)))
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
doSymConv = true; // doSymConv is always true with the 1st 4 filters.
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (WaveletBase::wmode == SYMH)
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
{
cDLeftMode = ASYMH;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (L[2] % 2 != 0)
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
{
cARightMode = SYMW;
cDRightMode = ASYMW;
}
else
code style improvements
2017-05-18 17:51:35 +00:00
{
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
cDRightMode = ASYMH;
code style improvements
2017-05-18 17:51:35 +00:00
}
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
}
else
{
cDLeftMode = SYMH;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (L[2] % 2 != 0)
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
{
cARightMode = SYMW;
cDRightMode = SYMH;
}
else
code style improvements
2017-05-18 17:51:35 +00:00
{
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
cARightMode = SYMH;
code style improvements
2017-05-18 17:51:35 +00:00
}
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
}
}
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
}
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
vtkm::Id cATempLen, cDTempLen; //, reconTempLen;
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
vtkm::Id addLen = 0;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
vtkm::Id cDPadLen = 0;
if (doSymConv) // extend cA and cD
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
addLen = filterLen / 4; // addLen == 0 for Haar kernel
if ((L[0] > L[1]) && (WaveletBase::wmode == SYMH))
code style improvements
2017-05-18 17:51:35 +00:00
{
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
cDPadLen = L[0];
code style improvements
2017-05-18 17:51:35 +00:00
}
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
cATempLen = L[0] + 2 * addLen;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
cDTempLen = cATempLen; // same length
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
}
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
else // not extend cA and cD
{ // (biorthogonal kernels won't come into this case)
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
cATempLen = L[0];
cDTempLen = L[1];
}
vtkm prefers 'using' over typedef.
2018-02-22 13:29:13 +00:00
using IdArrayType = vtkm::cont::ArrayHandleCounting<vtkm::Id>;
using PermutArrayType = vtkm::cont::ArrayHandlePermutation<IdArrayType, CoeffArrayType>;
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
// Separate cA and cD
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
IdArrayType approxIndices(0, 1, L[0]);
IdArrayType detailIndices(L[0], 1, L[1]);
PermutArrayType cA(approxIndices, coeffIn);
PermutArrayType cD(detailIndices, coeffIn);
vtkm prefers 'using' over typedef.
2018-02-22 13:29:13 +00:00
using CoeffValueType = typename CoeffArrayType::ValueType;
using ExtensionArrayType = vtkm::cont::ArrayHandle<CoeffValueType>;
using Concat1 = vtkm::cont::ArrayHandleConcatenate<ExtensionArrayType, PermutArrayType>;
using Concat2 = vtkm::cont::ArrayHandleConcatenate<Concat1, ExtensionArrayType>;
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
extend1D returns ArrayHandlePermut
2016-08-03 03:41:46 +00:00
Concat2 cATemp, cDTemp;
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (doSymConv) // Actually extend cA and cD
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
{
half done even length filters implementation
2016-08-15 19:46:35 +00:00
// first extend cA to be cATemp
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
this->Extend1D(cA, cATemp, addLen, cALeftMode, cARightMode, false, false);
two new wavelet filters, HAAR and CDF8/4 supported now
2016-08-16 21:20:19 +00:00
// Then extend cD based on extension needs
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (cDPadLen > 0)
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
{
two new wavelet filters, HAAR and CDF8/4 supported now
2016-08-16 21:20:19 +00:00
// Add back the missing final cD, 0.0, before doing extension
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
this->Extend1D(cD, cDTemp, addLen, cDLeftMode, cDRightMode, true, false);
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
}
else
{
half done even length filters implementation
2016-08-15 19:46:35 +00:00
vtkm::Id cDTempLenWouldBe = L[1] + 2 * addLen;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (cDTempLenWouldBe == cDTempLen)
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
{
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
this->Extend1D(cD, cDTemp, addLen, cDLeftMode, cDRightMode, false, false);
working on even length filters; need ASYM* support in Extend1D()
2016-08-15 23:54:15 +00:00
}
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
else if (cDTempLenWouldBe == cDTempLen - 1)
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
{
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
this->Extend1D(cD, cDTemp, addLen, cDLeftMode, cDRightMode, false, true);
working on even length filters; need ASYM* support in Extend1D()
2016-08-15 23:54:15 +00:00
}
extend1D returns ArrayHandlePermut
2016-08-03 03:41:46 +00:00
else
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
{
Simplify exception hierarchy. Remove the ErrorControl class such that all subclasses now inherit from error. Renamed all exception classes via s/ErrorControl/Error/. See issue #57.
2017-01-09 21:15:32 +00:00
vtkm::cont::ErrorInternal("cDTemp Length not match!");
extend1D returns ArrayHandlePermut
2016-08-03 03:41:46 +00:00
return 1;
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
}
}
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
}
else
{
half done even length filters implementation
2016-08-15 19:46:35 +00:00
// make cATemp
ExtensionArrayType dummyArray;
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
dummyArray.Allocate(0);
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
Concat1 cALeftOn(dummyArray, cA);
cATemp =
vtkm::cont::make_ArrayHandleConcatenate<Concat1, ExtensionArrayType>(cALeftOn, dummyArray);
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
half done even length filters implementation
2016-08-15 19:46:35 +00:00
// make cDTemp
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
Concat1 cDLeftOn(dummyArray, cD);
cDTemp =
vtkm::cont::make_ArrayHandleConcatenate<Concat1, ExtensionArrayType>(cDLeftOn, dummyArray);
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
}
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
vtkm::cont::ArrayHandleConcatenate<Concat2, Concat2> coeffInExtended(cATemp, cDTemp);
extend2D finally works well
2016-09-05 22:53:44 +00:00
working on even length filters; need ASYM* support in Extend1D()
2016-08-15 23:54:15 +00:00
// Allocate memory for sigOut
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
sigOut.Allocate(cATempLen + cDTempLen);
fixed a memory bug, now I believe it's ready for merge
2016-08-06 07:08:29 +00:00
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
vtkm::Float64 elapsedTime = 0;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (filterLen % 2 != 0)
{
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
vtkm::worklet::wavelets::InverseTransformOdd inverseXformOdd(filterLen, L[0], cATempLen);
vtkm::worklet::DispatcherMapField<vtkm::worklet::wavelets::InverseTransformOdd> dispatcher(
inverseXformOdd);
add timers to report worklet computation time
2016-08-23 23:52:40 +00:00
// use a timer
Introduce asynchronous and device independent timer The timer class now is asynchronous and device independent. it's using an similiar API as vtkOpenGLRenderTimer with Start(), Stop(), Reset(), Ready(), and GetElapsedTime() function. For convenience and backward compability, Each Start() function call will call Reset() internally and each GetElapsedTime() function call will call Stop() function if it hasn't been called yet for keeping backward compatibility purpose. Bascially it can be used in two modes: * Create a Timer without any device info. vtkm::cont::Timer time; * It would enable timers for all enabled devices on the machine. Users can get a specific elapsed time by passing a device id into the GetElapsedtime function. If no device is provided, it would pick the maximum of all timer results - the logic behind this decision is that if cuda is disabled, openmp, serial and tbb roughly give the same results; if cuda is enabled it's safe to return the maximum elapsed time since users are more interested in the device execution time rather than the kernal launch time. The Ready function can be handy here to query the status of the timer. * Create a Timer with a device id. vtkm::cont::Timer time((vtkm::cont::DeviceAdapterTagCuda())); * It works as the old timer that times for a specific device id.
2019-01-09 16:11:49 +00:00
vtkm::cont::Timer timer;
timer.Start();
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
dispatcher.Invoke(coeffInExtended,
WaveletBase::filter.GetLowReconstructFilter(),
WaveletBase::filter.GetHighReconstructFilter(),
sigOut);
add timers to report worklet computation time
2016-08-23 23:52:40 +00:00
elapsedTime = timer.GetElapsedTime();
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
}
else
{
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
vtkm::worklet::wavelets::InverseTransformEven inverseXformEven(
filterLen, L[0], cATempLen, !doSymConv);
vtkm::worklet::DispatcherMapField<vtkm::worklet::wavelets::InverseTransformEven> dispatcher(
inverseXformEven);
add timers to report worklet computation time
2016-08-23 23:52:40 +00:00
// use a timer
Introduce asynchronous and device independent timer The timer class now is asynchronous and device independent. it's using an similiar API as vtkOpenGLRenderTimer with Start(), Stop(), Reset(), Ready(), and GetElapsedTime() function. For convenience and backward compability, Each Start() function call will call Reset() internally and each GetElapsedTime() function call will call Stop() function if it hasn't been called yet for keeping backward compatibility purpose. Bascially it can be used in two modes: * Create a Timer without any device info. vtkm::cont::Timer time; * It would enable timers for all enabled devices on the machine. Users can get a specific elapsed time by passing a device id into the GetElapsedtime function. If no device is provided, it would pick the maximum of all timer results - the logic behind this decision is that if cuda is disabled, openmp, serial and tbb roughly give the same results; if cuda is enabled it's safe to return the maximum elapsed time since users are more interested in the device execution time rather than the kernal launch time. The Ready function can be handy here to query the status of the timer. * Create a Timer with a device id. vtkm::cont::Timer time((vtkm::cont::DeviceAdapterTagCuda())); * It works as the old timer that times for a specific device id.
2019-01-09 16:11:49 +00:00
vtkm::cont::Timer timer;
timer.Start();
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
dispatcher.Invoke(coeffInExtended,
WaveletBase::filter.GetLowReconstructFilter(),
WaveletBase::filter.GetHighReconstructFilter(),
sigOut);
add timers to report worklet computation time
2016-08-23 23:52:40 +00:00
elapsedTime = timer.GetElapsedTime();
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
}
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
sigOut.Shrink(L[2]);
working on even length filters; need ASYM* support in Extend1D()
2016-08-15 23:54:15 +00:00
add timers to report worklet computation time
2016-08-23 23:52:40 +00:00
return elapsedTime;
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
}
// Performs one level of 2D discrete wavelet transform
new branch on 2D wavelets
2016-08-09 23:32:13 +00:00
// It takes care of boundary conditions, etc.
// N.B.
// L[0] == L[2]
// L[1] == L[5]
// L[3] == L[7]
// L[4] == L[6]
//
// ____L[0]_______L[4]____
// | | |
// L[1] | cA | cDv | L[5]
// | (LL) | (HL) |
// | | |
// |---------------------|
// | | |
// | cDh | cDd | L[7]
// L[3] | (LH) | (HH) |
// | | |
// |__________|__________|
// L[2] L[6]
//
forward transform now avoids data copy when performing multi-level transforms
2016-10-05 22:52:07 +00:00
// Performs one level of 2D discrete wavelet transform on a small rectangle of input array
// The output has the same size as the small rectangle
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
template <typename ArrayInType, typename ArrayOutType>
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
vtkm::Float64 DWT2D(const ArrayInType& sigIn,
vtkm::Id sigDimX,
vtkm::Id sigDimY,
vtkm::Id sigStartX,
vtkm::Id sigStartY,
vtkm::Id sigPretendDimX,
vtkm::Id sigPretendDimY,
ArrayOutType& coeffOut,
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
std::vector<vtkm::Id>& L)
forward transform now avoids data copy when performing multi-level transforms
2016-10-05 22:52:07 +00:00
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
L[0] = WaveletBase::GetApproxLength(sigPretendDimX);
L[2] = L[0];
L[1] = WaveletBase::GetApproxLength(sigPretendDimY);
L[5] = L[1];
L[3] = WaveletBase::GetDetailLength(sigPretendDimY);
L[7] = L[3];
L[4] = WaveletBase::GetDetailLength(sigPretendDimX);
L[6] = L[4];
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
L[8] = sigPretendDimX;
forward transform now avoids data copy when performing multi-level transforms
2016-10-05 22:52:07 +00:00
L[9] = sigPretendDimY;
vtkm::Id filterLen = WaveletBase::filter.GetFilterLength();
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
bool oddLow = true;
if (filterLen % 2 != 0)
code style improvements
2017-05-18 17:51:35 +00:00
{
forward transform now avoids data copy when performing multi-level transforms
2016-10-05 22:52:07 +00:00
oddLow = false;
code style improvements
2017-05-18 17:51:35 +00:00
}
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
vtkm::Id addLen = filterLen / 2;
forward transform now avoids data copy when performing multi-level transforms
2016-10-05 22:52:07 +00:00
vtkm prefers 'using' over typedef.
2018-02-22 13:29:13 +00:00
using ValueType = typename ArrayInType::ValueType;
using ArrayType = vtkm::cont::ArrayHandle<ValueType>;
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
using ForwardXForm = vtkm::worklet::wavelets::ForwardTransform2D;
using DispatcherType = typename vtkm::worklet::DispatcherMapField<ForwardXForm>;
forward transform now avoids data copy when performing multi-level transforms
2016-10-05 22:52:07 +00:00
Introduce asynchronous and device independent timer The timer class now is asynchronous and device independent. it's using an similiar API as vtkOpenGLRenderTimer with Start(), Stop(), Reset(), Ready(), and GetElapsedTime() function. For convenience and backward compability, Each Start() function call will call Reset() internally and each GetElapsedTime() function call will call Stop() function if it hasn't been called yet for keeping backward compatibility purpose. Bascially it can be used in two modes: * Create a Timer without any device info. vtkm::cont::Timer time; * It would enable timers for all enabled devices on the machine. Users can get a specific elapsed time by passing a device id into the GetElapsedtime function. If no device is provided, it would pick the maximum of all timer results - the logic behind this decision is that if cuda is disabled, openmp, serial and tbb roughly give the same results; if cuda is enabled it's safe to return the maximum elapsed time since users are more interested in the device execution time rather than the kernal launch time. The Ready function can be handy here to query the status of the timer. * Create a Timer with a device id. vtkm::cont::Timer time((vtkm::cont::DeviceAdapterTagCuda())); * It works as the old timer that times for a specific device id.
2019-01-09 16:11:49 +00:00
vtkm::cont::Timer timer;
forward transform now avoids data copy when performing multi-level transforms
2016-10-05 22:52:07 +00:00
vtkm::Float64 computationTime = 0.0;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
ArrayType afterX;
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
afterX.Allocate(sigPretendDimX * sigPretendDimY);
forward transform now avoids data copy when performing multi-level transforms
2016-10-05 22:52:07 +00:00
// First transform on rows
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
ArrayType leftExt, rightExt;
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
this->Extend2D(sigIn,
sigDimX,
sigDimY,
sigStartX,
sigStartY,
sigPretendDimX,
sigPretendDimY,
leftExt,
rightExt,
addLen,
WaveletBase::wmode,
WaveletBase::wmode,
false,
false,
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
true); // Extend in left-right direction
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
ForwardXForm worklet(filterLen,
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
L[0],
oddLow,
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
true, // left-right
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
addLen,
sigPretendDimY,
sigDimX,
sigDimY,
sigStartX,
sigStartY,
sigPretendDimX,
sigPretendDimY,
addLen,
sigPretendDimY);
forward transform now avoids data copy when performing multi-level transforms
2016-10-05 22:52:07 +00:00
DispatcherType dispatcher(worklet);
Introduce asynchronous and device independent timer The timer class now is asynchronous and device independent. it's using an similiar API as vtkOpenGLRenderTimer with Start(), Stop(), Reset(), Ready(), and GetElapsedTime() function. For convenience and backward compability, Each Start() function call will call Reset() internally and each GetElapsedTime() function call will call Stop() function if it hasn't been called yet for keeping backward compatibility purpose. Bascially it can be used in two modes: * Create a Timer without any device info. vtkm::cont::Timer time; * It would enable timers for all enabled devices on the machine. Users can get a specific elapsed time by passing a device id into the GetElapsedtime function. If no device is provided, it would pick the maximum of all timer results - the logic behind this decision is that if cuda is disabled, openmp, serial and tbb roughly give the same results; if cuda is enabled it's safe to return the maximum elapsed time since users are more interested in the device execution time rather than the kernal launch time. The Ready function can be handy here to query the status of the timer. * Create a Timer with a device id. vtkm::cont::Timer time((vtkm::cont::DeviceAdapterTagCuda())); * It works as the old timer that times for a specific device id.
2019-01-09 16:11:49 +00:00
timer.Start();
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
dispatcher.Invoke(leftExt,
sigIn,
rightExt,
WaveletBase::filter.GetLowDecomposeFilter(),
WaveletBase::filter.GetHighDecomposeFilter(),
afterX);
forward transform now avoids data copy when performing multi-level transforms
2016-10-05 22:52:07 +00:00
computationTime += timer.GetElapsedTime();
}
// Then do transform in Y direction
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
ArrayType topExt, bottomExt;
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
coeffOut.Allocate(sigPretendDimX * sigPretendDimY);
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
this->Extend2D(afterX,
sigPretendDimX,
sigPretendDimY,
0,
0,
sigPretendDimX,
sigPretendDimY,
topExt,
bottomExt,
addLen,
WaveletBase::wmode,
WaveletBase::wmode,
false,
false,
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
false); // Extend in top-down direction
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
ForwardXForm worklet(filterLen,
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
L[1],
oddLow,
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
false, // top-down
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
sigPretendDimX,
addLen,
sigPretendDimX,
sigPretendDimY,
0,
0,
sigPretendDimX,
sigPretendDimY,
sigPretendDimX,
addLen);
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
DispatcherType dispatcher(worklet);
Introduce asynchronous and device independent timer The timer class now is asynchronous and device independent. it's using an similiar API as vtkOpenGLRenderTimer with Start(), Stop(), Reset(), Ready(), and GetElapsedTime() function. For convenience and backward compability, Each Start() function call will call Reset() internally and each GetElapsedTime() function call will call Stop() function if it hasn't been called yet for keeping backward compatibility purpose. Bascially it can be used in two modes: * Create a Timer without any device info. vtkm::cont::Timer time; * It would enable timers for all enabled devices on the machine. Users can get a specific elapsed time by passing a device id into the GetElapsedtime function. If no device is provided, it would pick the maximum of all timer results - the logic behind this decision is that if cuda is disabled, openmp, serial and tbb roughly give the same results; if cuda is enabled it's safe to return the maximum elapsed time since users are more interested in the device execution time rather than the kernal launch time. The Ready function can be handy here to query the status of the timer. * Create a Timer with a device id. vtkm::cont::Timer time((vtkm::cont::DeviceAdapterTagCuda())); * It works as the old timer that times for a specific device id.
2019-01-09 16:11:49 +00:00
timer.Start();
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
dispatcher.Invoke(topExt,
afterX,
bottomExt,
WaveletBase::filter.GetLowDecomposeFilter(),
WaveletBase::filter.GetHighDecomposeFilter(),
coeffOut);
forward transform now avoids data copy when performing multi-level transforms
2016-10-05 22:52:07 +00:00
computationTime += timer.GetElapsedTime();
}
return computationTime;
}
sync to use gdb
2016-09-13 19:10:38 +00:00
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
// Performs one level of IDWT.
2D wavelet compressor ready for Rob to review
2016-10-10 04:52:02 +00:00
// The output array has the same dimensions as the small rectangle.
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
template <typename ArrayInType, typename ArrayOutType>
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
vtkm::Float64 IDWT2D(const ArrayInType& coeffIn,
vtkm::Id inDimX,
vtkm::Id inDimY,
vtkm::Id inStartX,
vtkm::Id inStartY,
const std::vector<vtkm::Id>& L,
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
ArrayOutType& sigOut)
almost pass all tests, move to Alaska to debug one more case
2016-09-17 01:20:53 +00:00
{
2D wavelet compressor ready for Rob to review
2016-10-10 04:52:02 +00:00
vtkm::Id inPretendDimX = L[0] + L[4];
vtkm::Id inPretendDimY = L[1] + L[3];
almost pass all tests, move to Alaska to debug one more case
2016-09-17 01:20:53 +00:00
vtkm::Id filterLen = WaveletBase::filter.GetFilterLength();
vtkm prefers 'using' over typedef.
2018-02-22 13:29:13 +00:00
using BasicArrayType = vtkm::cont::ArrayHandle<typename ArrayInType::ValueType>;
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
using IDWT2DWorklet = vtkm::worklet::wavelets::InverseTransform2D;
using Dispatcher = vtkm::worklet::DispatcherMapField<IDWT2DWorklet>;
Introduce asynchronous and device independent timer The timer class now is asynchronous and device independent. it's using an similiar API as vtkOpenGLRenderTimer with Start(), Stop(), Reset(), Ready(), and GetElapsedTime() function. For convenience and backward compability, Each Start() function call will call Reset() internally and each GetElapsedTime() function call will call Stop() function if it hasn't been called yet for keeping backward compatibility purpose. Bascially it can be used in two modes: * Create a Timer without any device info. vtkm::cont::Timer time; * It would enable timers for all enabled devices on the machine. Users can get a specific elapsed time by passing a device id into the GetElapsedtime function. If no device is provided, it would pick the maximum of all timer results - the logic behind this decision is that if cuda is disabled, openmp, serial and tbb roughly give the same results; if cuda is enabled it's safe to return the maximum elapsed time since users are more interested in the device execution time rather than the kernal launch time. The Ready function can be handy here to query the status of the timer. * Create a Timer with a device id. vtkm::cont::Timer time((vtkm::cont::DeviceAdapterTagCuda())); * It works as the old timer that times for a specific device id.
2019-01-09 16:11:49 +00:00
vtkm::cont::Timer timer;
sync to laptop
2016-09-22 03:25:56 +00:00
vtkm::Float64 computationTime = 0.0;
almost pass all tests, move to Alaska to debug one more case
2016-09-17 01:20:53 +00:00
// First inverse transform on columns
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
BasicArrayType afterY;
{
BasicArrayType ext1, ext2, ext3, ext4;
vtkm::Id extDimX = inPretendDimX;
Correct 'may be used uninitialized in this function' warnings in wavelets
2018-04-24 15:42:06 +00:00
vtkm::Id ext1DimY = 0, ext2DimY = 0, ext3DimY = 0, ext4DimY = 0;
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
this->IDWTHelper2DTopDown(coeffIn,
inDimX,
inDimY,
inStartX,
inStartY,
inPretendDimX,
inPretendDimY,
L[1],
L[3],
ext1,
ext2,
ext3,
ext4,
ext1DimY,
ext2DimY,
ext3DimY,
ext4DimY,
filterLen,
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
wmode);
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
afterY.Allocate(inPretendDimX * inPretendDimY);
IDWT2DWorklet worklet(filterLen,
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
extDimX,
ext1DimY, // ext1
inPretendDimX,
L[1], // cA
extDimX,
ext2DimY, // ext2
extDimX,
ext3DimY, // ext3
inPretendDimX,
L[3], // cD
extDimX,
ext4DimY, // ext4
inDimX,
inDimY, // coeffIn
inStartX,
inStartY, // coeffIn
false); // top-down
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
Dispatcher dispatcher(worklet);
Introduce asynchronous and device independent timer The timer class now is asynchronous and device independent. it's using an similiar API as vtkOpenGLRenderTimer with Start(), Stop(), Reset(), Ready(), and GetElapsedTime() function. For convenience and backward compability, Each Start() function call will call Reset() internally and each GetElapsedTime() function call will call Stop() function if it hasn't been called yet for keeping backward compatibility purpose. Bascially it can be used in two modes: * Create a Timer without any device info. vtkm::cont::Timer time; * It would enable timers for all enabled devices on the machine. Users can get a specific elapsed time by passing a device id into the GetElapsedtime function. If no device is provided, it would pick the maximum of all timer results - the logic behind this decision is that if cuda is disabled, openmp, serial and tbb roughly give the same results; if cuda is enabled it's safe to return the maximum elapsed time since users are more interested in the device execution time rather than the kernal launch time. The Ready function can be handy here to query the status of the timer. * Create a Timer with a device id. vtkm::cont::Timer time((vtkm::cont::DeviceAdapterTagCuda())); * It works as the old timer that times for a specific device id.
2019-01-09 16:11:49 +00:00
timer.Start();
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
dispatcher.Invoke(ext1,
ext2,
ext3,
ext4,
coeffIn,
WaveletBase::filter.GetLowReconstructFilter(),
WaveletBase::filter.GetHighReconstructFilter(),
afterY);
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
computationTime += timer.GetElapsedTime();
sync to use gdb
2016-09-13 19:10:38 +00:00
}
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
almost pass all tests, move to Alaska to debug one more case
2016-09-17 01:20:53 +00:00
// Then inverse transform on rows
1 level DWT/IDWT pass all my tests
2016-09-17 02:39:42 +00:00
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
BasicArrayType ext1, ext2, ext3, ext4;
vtkm::Id extDimY = inPretendDimY;
Correct 'may be used uninitialized in this function' warnings in wavelets
2018-04-24 15:42:06 +00:00
vtkm::Id ext1DimX = 0, ext2DimX = 0, ext3DimX = 0, ext4DimX = 0;
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
this->IDWTHelper2DLeftRight(afterY,
inPretendDimX,
inPretendDimY,
0,
0,
inPretendDimX,
inPretendDimY,
L[0],
L[4],
ext1,
ext2,
ext3,
ext4,
ext1DimX,
ext2DimX,
ext3DimX,
ext4DimX,
filterLen,
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
wmode);
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
sigOut.Allocate(inPretendDimX * inPretendDimY);
IDWT2DWorklet worklet(filterLen,
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
ext1DimX,
extDimY, // ext1
L[0],
inPretendDimY, // cA
ext2DimX,
extDimY, // ext2
ext3DimX,
extDimY, // ext3
L[4],
inPretendDimY, // cA
ext4DimX,
extDimY, // ext4
inPretendDimX,
inPretendDimY,
0,
0,
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
true); // left-right
Dispatcher dispatcher(worklet);
Introduce asynchronous and device independent timer The timer class now is asynchronous and device independent. it's using an similiar API as vtkOpenGLRenderTimer with Start(), Stop(), Reset(), Ready(), and GetElapsedTime() function. For convenience and backward compability, Each Start() function call will call Reset() internally and each GetElapsedTime() function call will call Stop() function if it hasn't been called yet for keeping backward compatibility purpose. Bascially it can be used in two modes: * Create a Timer without any device info. vtkm::cont::Timer time; * It would enable timers for all enabled devices on the machine. Users can get a specific elapsed time by passing a device id into the GetElapsedtime function. If no device is provided, it would pick the maximum of all timer results - the logic behind this decision is that if cuda is disabled, openmp, serial and tbb roughly give the same results; if cuda is enabled it's safe to return the maximum elapsed time since users are more interested in the device execution time rather than the kernal launch time. The Ready function can be handy here to query the status of the timer. * Create a Timer with a device id. vtkm::cont::Timer time((vtkm::cont::DeviceAdapterTagCuda())); * It works as the old timer that times for a specific device id.
2019-01-09 16:11:49 +00:00
timer.Start();
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
dispatcher.Invoke(ext1,
ext2,
ext3,
ext4,
afterY,
WaveletBase::filter.GetLowReconstructFilter(),
WaveletBase::filter.GetHighReconstructFilter(),
sigOut);
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
computationTime += timer.GetElapsedTime();
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
}
new implementation of 2D transforms pass test
2016-10-10 00:07:49 +00:00
return computationTime;
}
sync to use gdb
2016-09-13 19:10:38 +00:00
almost pass all tests, move to Alaska to debug one more case
2016-09-17 01:20:53 +00:00
// decides the correct extension modes for cA and cD separately,
style optimization
2017-02-19 04:14:20 +00:00
// and fill the extensions (2D matrices)
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
template <typename ArrayInType, typename ArrayOutType>
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
void IDWTHelper2DLeftRight(const ArrayInType& coeffIn,
vtkm::Id inDimX,
vtkm::Id inDimY,
vtkm::Id inStartX,
vtkm::Id inStartY,
vtkm::Id inPretendDimX,
vtkm::Id inPretendDimY,
vtkm::Id cADimX,
vtkm::Id cDDimX,
ArrayOutType& ext1,
ArrayOutType& ext2, // output
ArrayOutType& ext3,
ArrayOutType& ext4, // output
vtkm::Id& ext1DimX,
vtkm::Id& ext2DimX, // output
vtkm::Id& ext3DimX,
vtkm::Id& ext4DimX, // output
vtkm::Id filterLen,
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
DWTMode mode)
new implementation of 2D transforms pass test
2016-10-10 00:07:49 +00:00
{
Enable highest level of warnings(W4) under MSVC This will make VTK-m warning level match the one used by VTK. This commit also resolves the first round of warnings that W4 exposes.
2017-09-21 14:33:17 +00:00
VTKM_ASSERT(inPretendDimX == (cADimX + cDDimX));
new implementation of 2D transforms pass test
2016-10-10 00:07:49 +00:00
// determine extension modes
DWTMode cALeft, cARight, cDLeft, cDRight;
cALeft = cARight = cDLeft = cDRight = mode;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (mode == SYMH)
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
{
new implementation of 2D transforms pass test
2016-10-10 00:07:49 +00:00
cDLeft = ASYMH;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (inPretendDimX % 2 != 0)
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
{
new implementation of 2D transforms pass test
2016-10-10 00:07:49 +00:00
cARight = SYMW;
cDRight = ASYMW;
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
}
new implementation of 2D transforms pass test
2016-10-10 00:07:49 +00:00
else
code style improvements
2017-05-18 17:51:35 +00:00
{
new implementation of 2D transforms pass test
2016-10-10 00:07:49 +00:00
cDRight = ASYMH;
code style improvements
2017-05-18 17:51:35 +00:00
}
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
}
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
else // mode == SYMW
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
{
new implementation of 2D transforms pass test
2016-10-10 00:07:49 +00:00
cDLeft = SYMH;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (inPretendDimX % 2 != 0)
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
{
new implementation of 2D transforms pass test
2016-10-10 00:07:49 +00:00
cARight = SYMW;
cDRight = SYMH;
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
}
new implementation of 2D transforms pass test
2016-10-10 00:07:49 +00:00
else
code style improvements
2017-05-18 17:51:35 +00:00
{
new implementation of 2D transforms pass test
2016-10-10 00:07:49 +00:00
cARight = SYMH;
code style improvements
2017-05-18 17:51:35 +00:00
}
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
}
new implementation of 2D transforms pass test
2016-10-10 00:07:49 +00:00
// determine length after extension
vtkm::Id cAExtendedDimX, cDExtendedDimX;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
vtkm::Id cDPadLen = 0;
vtkm::Id addLen = filterLen / 4; // addLen == 0 for Haar kernel
if ((cADimX > cDDimX) && (mode == SYMH))
code style improvements
2017-05-18 17:51:35 +00:00
{
new implementation of 2D transforms pass test
2016-10-10 00:07:49 +00:00
cDPadLen = cADimX;
code style improvements
2017-05-18 17:51:35 +00:00
}
new implementation of 2D transforms pass test
2016-10-10 00:07:49 +00:00
cAExtendedDimX = cADimX + 2 * addLen;
cDExtendedDimX = cAExtendedDimX;
// extend cA
vtkm::Id cADimY = inPretendDimY;
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
this->Extend2D(coeffIn,
inDimX,
inDimY,
inStartX,
inStartY,
cADimX,
cADimY,
ext1,
ext2,
addLen,
cALeft,
cARight,
false,
false,
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
true);
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
new implementation of 2D transforms pass test
2016-10-10 00:07:49 +00:00
ext1DimX = ext2DimX = addLen;
// extend cD
vtkm::Id cDDimY = inPretendDimY;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (cDPadLen > 0)
new implementation of 2D transforms pass test
2016-10-10 00:07:49 +00:00
{
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
this->Extend2D(coeffIn,
inDimX,
inDimY,
inStartX + cADimX,
inStartY,
cDDimX,
cDDimY,
ext3,
ext4,
addLen,
cDLeft,
cDRight,
true,
false,
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
true);
new implementation of 2D transforms pass test
2016-10-10 00:07:49 +00:00
ext3DimX = addLen;
ext4DimX = addLen + 1;
}
else
{
vtkm::Id cDExtendedWouldBe = cDDimX + 2 * addLen;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (cDExtendedWouldBe == cDExtendedDimX)
new implementation of 2D transforms pass test
2016-10-10 00:07:49 +00:00
{
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
this->Extend2D(coeffIn,
inDimX,
inDimY,
inStartX + cADimX,
inStartY,
cDDimX,
cDDimY,
ext3,
ext4,
addLen,
cDLeft,
cDRight,
false,
false,
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
true);
new implementation of 2D transforms pass test
2016-10-10 00:07:49 +00:00
ext3DimX = ext4DimX = addLen;
}
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
else if (cDExtendedWouldBe == cDExtendedDimX - 1)
new implementation of 2D transforms pass test
2016-10-10 00:07:49 +00:00
{
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
this->Extend2D(coeffIn,
inDimX,
inDimY,
inStartX + cADimX,
inStartY,
cDDimX,
cDDimY,
ext3,
ext4,
addLen,
cDLeft,
cDRight,
false,
true,
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
true);
new implementation of 2D transforms pass test
2016-10-10 00:07:49 +00:00
ext3DimX = addLen;
ext4DimX = addLen + 1;
}
else
code style improvements
2017-05-18 17:51:35 +00:00
{
Simplify exception hierarchy. Remove the ErrorControl class such that all subclasses now inherit from error. Renamed all exception classes via s/ErrorControl/Error/. See issue #57.
2017-01-09 21:15:32 +00:00
vtkm::cont::ErrorInternal("cDTemp Length not match!");
code style improvements
2017-05-18 17:51:35 +00:00
}
new implementation of 2D transforms pass test
2016-10-10 00:07:49 +00:00
}
}
almost pass all tests, move to Alaska to debug one more case
2016-09-17 01:20:53 +00:00
// decides the correct extension modes for cA and cD separately,
style optimization
2017-02-19 04:14:20 +00:00
// and fill the extensions (2D matrices)
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
template <typename ArrayInType, typename ArrayOutType>
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
void IDWTHelper2DTopDown(const ArrayInType& coeffIn,
vtkm::Id inDimX,
vtkm::Id inDimY,
vtkm::Id inStartX,
vtkm::Id inStartY,
vtkm::Id inPretendDimX,
vtkm::Id inPretendDimY,
vtkm::Id cADimY,
vtkm::Id cDDimY,
ArrayOutType& ext1,
ArrayOutType& ext2, // output
ArrayOutType& ext3,
ArrayOutType& ext4, // output
vtkm::Id& ext1DimY,
vtkm::Id& ext2DimY, // output
vtkm::Id& ext3DimY,
vtkm::Id& ext4DimY, // output
vtkm::Id filterLen,
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
DWTMode mode)
new implementation of 2D transforms pass test
2016-10-10 00:07:49 +00:00
{
Enable highest level of warnings(W4) under MSVC This will make VTK-m warning level match the one used by VTK. This commit also resolves the first round of warnings that W4 exposes.
2017-09-21 14:33:17 +00:00
VTKM_ASSERT(inPretendDimY == (cADimY + cDDimY));
new implementation of 2D transforms pass test
2016-10-10 00:07:49 +00:00
// determine extension modes
debug for 3D transforms
2017-02-21 23:56:57 +00:00
DWTMode cATopMode, cADownMode, cDTopMode, cDDownMode;
cATopMode = cADownMode = cDTopMode = cDDownMode = mode;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (mode == SYMH)
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
{
debug for 3D transforms
2017-02-21 23:56:57 +00:00
cDTopMode = ASYMH;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (inPretendDimY % 2 != 0)
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
{
debug for 3D transforms
2017-02-21 23:56:57 +00:00
cADownMode = SYMW;
cDDownMode = ASYMW;
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
}
new implementation of 2D transforms pass test
2016-10-10 00:07:49 +00:00
else
code style improvements
2017-05-18 17:51:35 +00:00
{
debug for 3D transforms
2017-02-21 23:56:57 +00:00
cDDownMode = ASYMH;
code style improvements
2017-05-18 17:51:35 +00:00
}
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
}
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
else // mode == SYMW
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
{
debug for 3D transforms
2017-02-21 23:56:57 +00:00
cDTopMode = SYMH;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (inPretendDimY % 2 != 0)
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
{
debug for 3D transforms
2017-02-21 23:56:57 +00:00
cADownMode = SYMW;
cDDownMode = SYMH;
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
}
new implementation of 2D transforms pass test
2016-10-10 00:07:49 +00:00
else
code style improvements
2017-05-18 17:51:35 +00:00
{
debug for 3D transforms
2017-02-21 23:56:57 +00:00
cADownMode = SYMH;
code style improvements
2017-05-18 17:51:35 +00:00
}
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
}
new implementation of 2D transforms pass test
2016-10-10 00:07:49 +00:00
// determine length after extension
vtkm::Id cAExtendedDimY, cDExtendedDimY;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
vtkm::Id cDPadLen = 0;
vtkm::Id addLen = filterLen / 4; // addLen == 0 for Haar kernel
if ((cADimY > cDDimY) && (mode == SYMH))
new implementation of 2D transforms pass test
2016-10-10 00:07:49 +00:00
cDPadLen = cADimY;
cAExtendedDimY = cADimY + 2 * addLen;
cDExtendedDimY = cAExtendedDimY;
// extend cA
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
vtkm::Id cADimX = inPretendDimX;
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
this->Extend2D(coeffIn,
inDimX,
inDimY,
inStartX,
inStartY,
cADimX,
cADimY,
ext1,
ext2,
addLen,
cATopMode,
cADownMode,
false,
false,
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
false);
new implementation of 2D transforms pass test
2016-10-10 00:07:49 +00:00
ext1DimY = ext2DimY = addLen;
// extend cD
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
vtkm::Id cDDimX = inPretendDimX;
if (cDPadLen > 0)
new implementation of 2D transforms pass test
2016-10-10 00:07:49 +00:00
{
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
this->Extend2D(coeffIn,
inDimX,
inDimY,
inStartX,
inStartY + cADimY,
cDDimX,
cDDimY,
ext3,
ext4,
addLen,
cDTopMode,
cDDownMode,
true,
false,
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
false);
new implementation of 2D transforms pass test
2016-10-10 00:07:49 +00:00
ext3DimY = addLen;
ext4DimY = addLen + 1;
}
else
{
vtkm::Id cDExtendedWouldBe = cDDimY + 2 * addLen;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (cDExtendedWouldBe == cDExtendedDimY)
new implementation of 2D transforms pass test
2016-10-10 00:07:49 +00:00
{
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
this->Extend2D(coeffIn,
inDimX,
inDimY,
inStartX,
inStartY + cADimY,
cDDimX,
cDDimY,
ext3,
ext4,
addLen,
cDTopMode,
cDDownMode,
false,
false,
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
false);
new implementation of 2D transforms pass test
2016-10-10 00:07:49 +00:00
ext3DimY = ext4DimY = addLen;
}
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
else if (cDExtendedWouldBe == cDExtendedDimY - 1)
new implementation of 2D transforms pass test
2016-10-10 00:07:49 +00:00
{
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
this->Extend2D(coeffIn,
inDimX,
inDimY,
inStartX,
inStartY + cADimY,
cDDimX,
cDDimY,
ext3,
ext4,
addLen,
cDTopMode,
cDDownMode,
false,
true,
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
false);
new implementation of 2D transforms pass test
2016-10-10 00:07:49 +00:00
ext3DimY = addLen;
ext4DimY = addLen + 1;
}
else
code style improvements
2017-05-18 17:51:35 +00:00
{
Simplify exception hierarchy. Remove the ErrorControl class such that all subclasses now inherit from error. Renamed all exception classes via s/ErrorControl/Error/. See issue #57.
2017-01-09 21:15:32 +00:00
vtkm::cont::ErrorInternal("cDTemp Length not match!");
code style improvements
2017-05-18 17:51:35 +00:00
}
new implementation of 2D transforms pass test
2016-10-10 00:07:49 +00:00
}
}
debug for 3D transforms
2017-02-21 23:56:57 +00:00
// decides the correct extension modes for cA and cD separately,
// and fill the extensions (3D cubes)
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
template <typename ArrayInType, typename ArrayOutType>
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
void IDWTHelper3DLeftRight(const ArrayInType& coeffIn,
vtkm::Id inDimX,
vtkm::Id inDimY,
vtkm::Id inDimZ,
vtkm::Id inStartX,
vtkm::Id inStartY,
vtkm::Id inStartZ,
vtkm::Id inPretendDimX,
vtkm::Id inPretendDimY,
vtkm::Id inPretendDimZ,
vtkm::Id cADimX,
vtkm::Id cDDimX,
ArrayOutType& ext1,
ArrayOutType& ext2, // output
ArrayOutType& ext3,
ArrayOutType& ext4, // output
vtkm::Id& ext1DimX,
vtkm::Id& ext2DimX, // output
vtkm::Id& ext3DimX,
vtkm::Id& ext4DimX, // output
vtkm::Id filterLen,
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
DWTMode mode)
debug for 3D transforms
2017-02-21 23:56:57 +00:00
{
Enable highest level of warnings(W4) under MSVC This will make VTK-m warning level match the one used by VTK. This commit also resolves the first round of warnings that W4 exposes.
2017-09-21 14:33:17 +00:00
VTKM_ASSERT(inPretendDimX == (cADimX + cDDimX));
debug for 3D transforms
2017-02-21 23:56:57 +00:00
// determine extension modes
DWTMode cALeftMode, cARightMode, cDLeftMode, cDRightMode;
cALeftMode = cARightMode = cDLeftMode = cDRightMode = mode;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (mode == SYMH)
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
{
debug for 3D transforms
2017-02-21 23:56:57 +00:00
cDLeftMode = ASYMH;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (inPretendDimX % 2 != 0)
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
{
debug for 3D transforms
2017-02-21 23:56:57 +00:00
cARightMode = SYMW;
cDRightMode = ASYMW;
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
}
debug for 3D transforms
2017-02-21 23:56:57 +00:00
else
code style improvements
2017-05-18 17:51:35 +00:00
{
debug for 3D transforms
2017-02-21 23:56:57 +00:00
cDRightMode = ASYMH;
code style improvements
2017-05-18 17:51:35 +00:00
}
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
}
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
else // mode == SYMW
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
{
debug for 3D transforms
2017-02-21 23:56:57 +00:00
cDLeftMode = SYMH;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (inPretendDimX % 2 != 0)
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
{
debug for 3D transforms
2017-02-21 23:56:57 +00:00
cARightMode = SYMW;
cDRightMode = SYMH;
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
}
debug for 3D transforms
2017-02-21 23:56:57 +00:00
else
code style improvements
2017-05-18 17:51:35 +00:00
{
debug for 3D transforms
2017-02-21 23:56:57 +00:00
cARightMode = SYMH;
code style improvements
2017-05-18 17:51:35 +00:00
}
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
}
debug for 3D transforms
2017-02-21 23:56:57 +00:00
// determine length after extension
vtkm::Id cAExtendedDimX, cDExtendedDimX;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
vtkm::Id cDPadLen = 0;
vtkm::Id addLen = filterLen / 4; // addLen == 0 for Haar kernel
if ((cADimX > cDDimX) && (mode == SYMH))
code style improvements
2017-05-18 17:51:35 +00:00
{
debug for 3D transforms
2017-02-21 23:56:57 +00:00
cDPadLen = cADimX;
code style improvements
2017-05-18 17:51:35 +00:00
}
debug for 3D transforms
2017-02-21 23:56:57 +00:00
cAExtendedDimX = cADimX + 2 * addLen;
cDExtendedDimX = cAExtendedDimX;
// extend cA
vtkm::Id cADimY = inPretendDimY;
vtkm::Id cADimZ = inPretendDimZ;
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
this->Extend3DLeftRight(coeffIn,
inDimX,
inDimY,
inDimZ,
inStartX,
inStartY,
inStartZ,
cADimX,
cADimY,
cADimZ,
ext1,
ext2,
addLen,
cALeftMode,
cARightMode,
false,
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
false);
debug for 3D transforms
2017-02-21 23:56:57 +00:00
ext1DimX = ext2DimX = addLen;
// extend cD
vtkm::Id cDDimY = inPretendDimY;
vtkm::Id cDDimZ = inPretendDimZ;
bool pretendSigPaddedZero, padZeroAtExt2;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (cDPadLen > 0)
debug for 3D transforms
2017-02-21 23:56:57 +00:00
{
ext3DimX = addLen;
ext4DimX = addLen + 1;
pretendSigPaddedZero = true;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
padZeroAtExt2 = false;
debug for 3D transforms
2017-02-21 23:56:57 +00:00
}
else
{
vtkm::Id cDExtendedWouldBe = cDDimX + 2 * addLen;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (cDExtendedWouldBe == cDExtendedDimX)
debug for 3D transforms
2017-02-21 23:56:57 +00:00
{
ext3DimX = ext4DimX = addLen;
pretendSigPaddedZero = false;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
padZeroAtExt2 = false;
debug for 3D transforms
2017-02-21 23:56:57 +00:00
}
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
else if (cDExtendedWouldBe == cDExtendedDimX - 1)
debug for 3D transforms
2017-02-21 23:56:57 +00:00
{
ext3DimX = addLen;
ext4DimX = addLen + 1;
pretendSigPaddedZero = false;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
padZeroAtExt2 = true;
debug for 3D transforms
2017-02-21 23:56:57 +00:00
}
else
1024 cube 1 level of transform pass test
2017-02-24 18:56:24 +00:00
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
pretendSigPaddedZero = padZeroAtExt2 = false; // so the compiler doesn't complain
change new error handling
2017-04-14 20:14:09 +00:00
vtkm::cont::ErrorInternal("cDTemp Length not match!");
1024 cube 1 level of transform pass test
2017-02-24 18:56:24 +00:00
}
debug for 3D transforms
2017-02-21 23:56:57 +00:00
}
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
this->Extend3DLeftRight(coeffIn,
inDimX,
inDimY,
inDimZ,
inStartX + cADimX,
inStartY,
inStartZ,
cDDimX,
cDDimY,
cDDimZ,
ext3,
ext4,
addLen,
cDLeftMode,
cDRightMode,
pretendSigPaddedZero,
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
padZeroAtExt2);
debug for 3D transforms
2017-02-21 23:56:57 +00:00
}
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
template <typename ArrayInType, typename ArrayOutType>
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
void IDWTHelper3DTopDown(const ArrayInType& coeffIn,
vtkm::Id inDimX,
vtkm::Id inDimY,
vtkm::Id inDimZ,
vtkm::Id inStartX,
vtkm::Id inStartY,
vtkm::Id inStartZ,
vtkm::Id inPretendDimX,
vtkm::Id inPretendDimY,
vtkm::Id inPretendDimZ,
vtkm::Id cADimY,
vtkm::Id cDDimY,
ArrayOutType& ext1,
ArrayOutType& ext2, // output
ArrayOutType& ext3,
ArrayOutType& ext4, // output
vtkm::Id& ext1DimY,
vtkm::Id& ext2DimY, // output
vtkm::Id& ext3DimY,
vtkm::Id& ext4DimY, // output
vtkm::Id filterLen,
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
DWTMode mode)
debug for 3D transforms
2017-02-21 23:56:57 +00:00
{
Enable highest level of warnings(W4) under MSVC This will make VTK-m warning level match the one used by VTK. This commit also resolves the first round of warnings that W4 exposes.
2017-09-21 14:33:17 +00:00
VTKM_ASSERT(inPretendDimY == (cADimY + cDDimY));
debug for 3D transforms
2017-02-21 23:56:57 +00:00
// determine extension modes
DWTMode cATopMode, cADownMode, cDTopMode, cDDownMode;
cATopMode = cADownMode = cDTopMode = cDDownMode = mode;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (mode == SYMH)
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
{
debug for 3D transforms
2017-02-21 23:56:57 +00:00
cDTopMode = ASYMH;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (inPretendDimY % 2 != 0)
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
{
debug for 3D transforms
2017-02-21 23:56:57 +00:00
cADownMode = SYMW;
cDDownMode = ASYMW;
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
}
debug for 3D transforms
2017-02-21 23:56:57 +00:00
else
code style improvements
2017-05-18 17:51:35 +00:00
{
debug for 3D transforms
2017-02-21 23:56:57 +00:00
cDDownMode = ASYMH;
code style improvements
2017-05-18 17:51:35 +00:00
}
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
}
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
else // mode == SYMW
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
{
debug for 3D transforms
2017-02-21 23:56:57 +00:00
cDTopMode = SYMH;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (inPretendDimY % 2 != 0)
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
{
debug for 3D transforms
2017-02-21 23:56:57 +00:00
cADownMode = SYMW;
cDDownMode = SYMH;
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
}
debug for 3D transforms
2017-02-21 23:56:57 +00:00
else
code style improvements
2017-05-18 17:51:35 +00:00
{
debug for 3D transforms
2017-02-21 23:56:57 +00:00
cADownMode = SYMH;
code style improvements
2017-05-18 17:51:35 +00:00
}
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
}
debug for 3D transforms
2017-02-21 23:56:57 +00:00
// determine length after extension
vtkm::Id cAExtendedDimY, cDExtendedDimY;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
vtkm::Id cDPadLen = 0;
vtkm::Id addLen = filterLen / 4; // addLen == 0 for Haar kernel
if ((cADimY > cDDimY) && (mode == SYMH))
code style improvements
2017-05-18 17:51:35 +00:00
{
debug for 3D transforms
2017-02-21 23:56:57 +00:00
cDPadLen = cADimY;
code style improvements
2017-05-18 17:51:35 +00:00
}
debug for 3D transforms
2017-02-21 23:56:57 +00:00
cAExtendedDimY = cADimY + 2 * addLen;
cDExtendedDimY = cAExtendedDimY;
// extend cA
vtkm::Id cADimX = inPretendDimX;
vtkm::Id cADimZ = inPretendDimZ;
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
this->Extend3DTopDown(coeffIn,
inDimX,
inDimY,
inDimZ,
inStartX,
inStartY,
inStartZ,
cADimX,
cADimY,
cADimZ,
ext1,
ext2,
addLen,
cATopMode,
cADownMode,
false,
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
false);
debug for 3D transforms
2017-02-21 23:56:57 +00:00
ext1DimY = ext2DimY = addLen;
// extend cD
vtkm::Id cDDimX = inPretendDimX;
vtkm::Id cDDimZ = inPretendDimZ;
bool pretendSigPaddedZero, padZeroAtExt2;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (cDPadLen > 0)
debug for 3D transforms
2017-02-21 23:56:57 +00:00
{
ext3DimY = addLen;
ext4DimY = addLen + 1;
pretendSigPaddedZero = true;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
padZeroAtExt2 = false;
debug for 3D transforms
2017-02-21 23:56:57 +00:00
}
else
{
vtkm::Id cDExtendedWouldBe = cDDimY + 2 * addLen;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (cDExtendedWouldBe == cDExtendedDimY)
debug for 3D transforms
2017-02-21 23:56:57 +00:00
{
ext3DimY = ext4DimY = addLen;
pretendSigPaddedZero = false;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
padZeroAtExt2 = false;
debug for 3D transforms
2017-02-21 23:56:57 +00:00
}
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
else if (cDExtendedWouldBe == cDExtendedDimY - 1)
debug for 3D transforms
2017-02-21 23:56:57 +00:00
{
ext3DimY = addLen;
ext4DimY = addLen + 1;
pretendSigPaddedZero = false;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
padZeroAtExt2 = true;
debug for 3D transforms
2017-02-21 23:56:57 +00:00
}
else
1024 cube 1 level of transform pass test
2017-02-24 18:56:24 +00:00
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
pretendSigPaddedZero = padZeroAtExt2 = false; // so the compiler doesn't complain
change new error handling
2017-04-14 20:14:09 +00:00
vtkm::cont::ErrorInternal("cDTemp Length not match!");
1024 cube 1 level of transform pass test
2017-02-24 18:56:24 +00:00
}
debug for 3D transforms
2017-02-21 23:56:57 +00:00
}
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
this->Extend3DTopDown(coeffIn,
inDimX,
inDimY,
inDimZ,
inStartX,
inStartY + cADimY,
inStartZ,
cDDimX,
cDDimY,
cDDimZ,
ext3,
ext4,
addLen,
cDTopMode,
cDDownMode,
pretendSigPaddedZero,
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
padZeroAtExt2);
debug for 3D transforms
2017-02-21 23:56:57 +00:00
}
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
template <typename ArrayInType, typename ArrayOutType>
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
void IDWTHelper3DFrontBack(const ArrayInType& coeffIn,
vtkm::Id inDimX,
vtkm::Id inDimY,
vtkm::Id inDimZ,
vtkm::Id inStartX,
vtkm::Id inStartY,
vtkm::Id inStartZ,
vtkm::Id inPretendDimX,
vtkm::Id inPretendDimY,
vtkm::Id inPretendDimZ,
vtkm::Id cADimZ,
vtkm::Id cDDimZ,
ArrayOutType& ext1,
ArrayOutType& ext2, // output
ArrayOutType& ext3,
ArrayOutType& ext4, // output
vtkm::Id& ext1DimZ,
vtkm::Id& ext2DimZ, // output
vtkm::Id& ext3DimZ,
vtkm::Id& ext4DimZ, // output
vtkm::Id filterLen,
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
DWTMode mode)
debug for 3D transforms
2017-02-21 23:56:57 +00:00
{
Enable highest level of warnings(W4) under MSVC This will make VTK-m warning level match the one used by VTK. This commit also resolves the first round of warnings that W4 exposes.
2017-09-21 14:33:17 +00:00
VTKM_ASSERT(inPretendDimZ == (cADimZ + cDDimZ));
debug for 3D transforms
2017-02-21 23:56:57 +00:00
// determine extension modes
DWTMode cAFrontMode, cABackMode, cDFrontMode, cDBackMode;
cAFrontMode = cABackMode = cDFrontMode = cDBackMode = mode;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (mode == SYMH)
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
{
debug for 3D transforms
2017-02-21 23:56:57 +00:00
cDFrontMode = ASYMH;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (inPretendDimZ % 2 != 0)
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
{
debug for 3D transforms
2017-02-21 23:56:57 +00:00
cABackMode = SYMW;
cDBackMode = ASYMW;
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
}
debug for 3D transforms
2017-02-21 23:56:57 +00:00
else
code style improvements
2017-05-18 17:51:35 +00:00
{
debug for 3D transforms
2017-02-21 23:56:57 +00:00
cDBackMode = ASYMH;
code style improvements
2017-05-18 17:51:35 +00:00
}
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
}
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
else // mode == SYMW
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
{
debug for 3D transforms
2017-02-21 23:56:57 +00:00
cDFrontMode = SYMH;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (inPretendDimZ % 2 != 0)
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
{
debug for 3D transforms
2017-02-21 23:56:57 +00:00
cABackMode = SYMW;
cDBackMode = SYMH;
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
}
debug for 3D transforms
2017-02-21 23:56:57 +00:00
else
code style improvements
2017-05-18 17:51:35 +00:00
{
debug for 3D transforms
2017-02-21 23:56:57 +00:00
cABackMode = SYMH;
code style improvements
2017-05-18 17:51:35 +00:00
}
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
}
debug for 3D transforms
2017-02-21 23:56:57 +00:00
// determine length after extension
vtkm::Id cAExtendedDimZ, cDExtendedDimZ;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
vtkm::Id cDPadLen = 0;
vtkm::Id addLen = filterLen / 4; // addLen == 0 for Haar kernel
if ((cADimZ > cDDimZ) && (mode == SYMH))
code style improvements
2017-05-18 17:51:35 +00:00
{
debug for 3D transforms
2017-02-21 23:56:57 +00:00
cDPadLen = cADimZ;
code style improvements
2017-05-18 17:51:35 +00:00
}
debug for 3D transforms
2017-02-21 23:56:57 +00:00
cAExtendedDimZ = cADimZ + 2 * addLen;
cDExtendedDimZ = cAExtendedDimZ;
// extend cA
vtkm::Id cADimX = inPretendDimX;
vtkm::Id cADimY = inPretendDimY;
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
this->Extend3DFrontBack(coeffIn,
inDimX,
inDimY,
inDimZ,
inStartX,
inStartY,
inStartZ,
cADimX,
cADimY,
cADimZ,
ext1,
ext2,
addLen,
cAFrontMode,
cABackMode,
false,
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
false);
debug for 3D transforms
2017-02-21 23:56:57 +00:00
ext1DimZ = ext2DimZ = addLen;
// extend cD
vtkm::Id cDDimX = inPretendDimX;
vtkm::Id cDDimY = inPretendDimY;
bool pretendSigPaddedZero, padZeroAtExt2;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (cDPadLen > 0)
debug for 3D transforms
2017-02-21 23:56:57 +00:00
{
ext3DimZ = addLen;
ext4DimZ = addLen + 1;
pretendSigPaddedZero = true;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
padZeroAtExt2 = false;
debug for 3D transforms
2017-02-21 23:56:57 +00:00
}
else
{
vtkm::Id cDExtendedWouldBe = cDDimZ + 2 * addLen;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
if (cDExtendedWouldBe == cDExtendedDimZ)
debug for 3D transforms
2017-02-21 23:56:57 +00:00
{
ext3DimZ = ext4DimZ = addLen;
pretendSigPaddedZero = false;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
padZeroAtExt2 = false;
debug for 3D transforms
2017-02-21 23:56:57 +00:00
}
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
else if (cDExtendedWouldBe == cDExtendedDimZ - 1)
debug for 3D transforms
2017-02-21 23:56:57 +00:00
{
ext3DimZ = addLen;
ext4DimZ = addLen + 1;
pretendSigPaddedZero = false;
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
padZeroAtExt2 = true;
debug for 3D transforms
2017-02-21 23:56:57 +00:00
}
else
1024 cube 1 level of transform pass test
2017-02-24 18:56:24 +00:00
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
pretendSigPaddedZero = padZeroAtExt2 = false; // so the compiler doesn't complain
change new error handling
2017-04-14 20:14:09 +00:00
vtkm::cont::ErrorInternal("cDTemp Length not match!");
1024 cube 1 level of transform pass test
2017-02-24 18:56:24 +00:00
}
debug for 3D transforms
2017-02-21 23:56:57 +00:00
}
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
this->Extend3DFrontBack(coeffIn,
inDimX,
inDimY,
inDimZ,
inStartX,
inStartY,
inStartZ + cADimZ,
cDDimX,
cDDimY,
cDDimZ,
ext3,
ext4,
addLen,
cDFrontMode,
cDBackMode,
pretendSigPaddedZero,
Merge worklet testing executables into a device dependent shared library VTK-m has been updated to replace old per device worklet testing executables with a device dependent shared library so that it's able to accept a device adapter at runtime. Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run function would call ForceDevice when needed and if users need the device adapter info at runtime, RunOnDevice function would pass the adapter into the functor. Optional Parser is bumped from 1.3 to 1.7.
2018-10-17 19:17:29 +00:00
padZeroAtExt2);
debug for 3D transforms
2017-02-21 23:56:57 +00:00
}
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
};
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
} // namespace wavelets
} // namespace worklet
} // namespace vtkm
move wavelet stuff back to worklet folder
2016-07-27 20:28:38 +00:00
worklet/wavelet: fix whitespace issues
2017-05-22 20:47:13 +00:00
#endif
Reference in New Issue Copy Permalink