Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Sudhanshu Sane
VTK-m
Commits
7eb1e31b
Commit
7eb1e31b
authored
Dec 11, 2018
by
Robert Maynard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove vtkm::cont::DynamicArrayHandle.
parent
0a40c620
Changes
12
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
26 additions
and
652 deletions
+26
-652
vtkm/cont/CMakeLists.txt
vtkm/cont/CMakeLists.txt
+0
-2
vtkm/cont/DynamicArrayHandle.cxx
vtkm/cont/DynamicArrayHandle.cxx
+0
-53
vtkm/cont/DynamicArrayHandle.h
vtkm/cont/DynamicArrayHandle.h
+0
-579
vtkm/cont/internal/testing/UnitTestDynamicTransform.cxx
vtkm/cont/internal/testing/UnitTestDynamicTransform.cxx
+25
-10
vtkm/cont/testing/UnitTestSerializationArrayHandle.cxx
vtkm/cont/testing/UnitTestSerializationArrayHandle.cxx
+1
-1
vtkm/filter/ZFPCompressor1D.hxx
vtkm/filter/ZFPCompressor1D.hxx
+0
-1
vtkm/filter/ZFPCompressor2D.hxx
vtkm/filter/ZFPCompressor2D.hxx
+0
-1
vtkm/filter/ZFPCompressor3D.hxx
vtkm/filter/ZFPCompressor3D.hxx
+0
-1
vtkm/filter/ZFPDecompressor1D.hxx
vtkm/filter/ZFPDecompressor1D.hxx
+0
-1
vtkm/filter/ZFPDecompressor2D.hxx
vtkm/filter/ZFPDecompressor2D.hxx
+0
-1
vtkm/filter/ZFPDecompressor3D.hxx
vtkm/filter/ZFPDecompressor3D.hxx
+0
-1
vtkm/filter/testing/UnitTestZFP.cxx
vtkm/filter/testing/UnitTestZFP.cxx
+0
-1
No files found.
vtkm/cont/CMakeLists.txt
View file @
7eb1e31b
...
...
@@ -74,7 +74,6 @@ set(headers
DeviceAdapter.h
DeviceAdapterAlgorithm.h
DeviceAdapterListTag.h
DynamicArrayHandle.h
DynamicCellSet.h
EnvironmentTracker.h
Error.h
...
...
@@ -139,7 +138,6 @@ set(sources
DataSetBuilderExplicit.cxx
DataSetBuilderRectilinear.cxx
DataSetBuilderUniform.cxx
DynamicArrayHandle.cxx
EnvironmentTracker.cxx
ErrorBadDevice.cxx
ErrorBadType.cxx
...
...
vtkm/cont/DynamicArrayHandle.cxx
deleted
100644 → 0
View file @
0a40c620
//============================================================================
// Copyright (c) Kitware, Inc.
// All rights reserved.
// See LICENSE.txt for details.
// This software is distributed WITHOUT ANY WARRANTY; without even
// the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
// PURPOSE. See the above copyright notice for more information.
//
// Copyright 2015 National Technology & Engineering Solutions of Sandia, LLC (NTESS).
// Copyright 2015 UT-Battelle, LLC.
// Copyright 2015 Los Alamos National Security.
//
// Under the terms of Contract DE-NA0003525 with NTESS,
// 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.
//============================================================================
#include <sstream>
#include <typeindex>
#include <vtkm/cont/DynamicArrayHandle.h>
namespace
vtkm
{
namespace
cont
{
namespace
detail
{
PolymorphicArrayHandleContainerBase
::
PolymorphicArrayHandleContainerBase
()
{
}
PolymorphicArrayHandleContainerBase
::~
PolymorphicArrayHandleContainerBase
()
{
}
void
ThrowCastAndCallException
(
PolymorphicArrayHandleContainerBase
*
ptr
,
const
std
::
type_info
*
type
,
const
std
::
type_info
*
storage
)
{
std
::
ostringstream
out
;
out
<<
"Could not find appropriate cast for array in CastAndCall1.
\n
"
"Array: "
;
ptr
->
PrintSummary
(
out
);
out
<<
"TypeList: "
<<
type
->
name
()
<<
"
\n
StorageList: "
<<
storage
->
name
()
<<
"
\n
"
;
throw
vtkm
::
cont
::
ErrorBadValue
(
out
.
str
());
}
}
}
}
// namespace vtkm::cont::detail
vtkm/cont/DynamicArrayHandle.h
deleted
100644 → 0
View file @
0a40c620
This diff is collapsed.
Click to expand it.
vtkm/cont/internal/testing/UnitTestDynamicTransform.cxx
View file @
7eb1e31b
...
...
@@ -21,8 +21,8 @@
#include "vtkm/cont/internal/DynamicTransform.h"
#include "vtkm/cont/ArrayHandle.h"
#include "vtkm/cont/DynamicArrayHandle.h"
#include "vtkm/cont/DynamicCellSet.h"
#include "vtkm/cont/VariantArrayHandle.h"
#include "vtkm/internal/FunctionInterface.h"
...
...
@@ -31,7 +31,7 @@
namespace
vtkm
{
//
Dynamic
ArrayHandle requires its value type to have a defined VecTraits
//
Variant
ArrayHandle requires its value type to have a defined VecTraits
// class. One of the tests is to use an "unusual" array of std::string
// (which is pretty pointless but might tease out some assumptions).
// Make an implementation here. Because I am lazy, this is only a partial
...
...
@@ -71,10 +71,15 @@ struct ScalarFunctor
struct
ArrayHandleScalarFunctor
{
template
<
typename
T
>
void
operator
()(
const
vtkm
::
cont
::
ArrayHandle
<
T
>&
)
const
void
operator
()(
const
vtkm
::
cont
::
ArrayHandle
Virtual
<
T
>&
)
const
{
VTKM_TEST_FAIL
(
"Called wrong form of functor operator."
);
}
void
operator
()(
const
vtkm
::
cont
::
ArrayHandleVirtual
<
vtkm
::
FloatDefault
>&
)
const
{
std
::
cout
<<
" In ArrayHandleVirtual<Scalar> functor."
<<
std
::
endl
;
g_FunctionCalls
++
;
}
void
operator
()(
const
vtkm
::
cont
::
ArrayHandle
<
vtkm
::
FloatDefault
>&
)
const
{
std
::
cout
<<
" In ArrayHandle<Scalar> functor."
<<
std
::
endl
;
...
...
@@ -84,9 +89,9 @@ struct ArrayHandleScalarFunctor
struct
ArrayHandleStringFunctor
{
void
operator
()(
const
vtkm
::
cont
::
ArrayHandle
<
std
::
string
>&
)
const
void
operator
()(
const
vtkm
::
cont
::
ArrayHandle
Virtual
<
std
::
string
>&
)
const
{
std
::
cout
<<
" In ArrayHandle<string> functor."
<<
std
::
endl
;
std
::
cout
<<
" In ArrayHandle
Virtual
<string> functor."
<<
std
::
endl
;
g_FunctionCalls
++
;
}
};
...
...
@@ -121,6 +126,16 @@ struct FunctionInterfaceFunctor
std
::
cout
<<
" In FunctionInterface<...> functor."
<<
std
::
endl
;
g_FunctionCalls
++
;
}
void
operator
()(
const
vtkm
::
internal
::
FunctionInterface
<
void
(
vtkm
::
cont
::
ArrayHandle
<
vtkm
::
FloatDefault
>
,
vtkm
::
cont
::
ArrayHandleVirtual
<
vtkm
::
FloatDefault
>
,
vtkm
::
cont
::
ArrayHandleVirtual
<
std
::
string
>
,
vtkm
::
cont
::
CellSetStructured
<
3
>
)
>&
)
const
{
std
::
cout
<<
" In FunctionInterface<...> functor."
<<
std
::
endl
;
g_FunctionCalls
++
;
}
};
void
TestBasicTransform
()
...
...
@@ -138,13 +153,13 @@ void TestBasicTransform()
TRY_TRANSFORM
(
transform
(
concreteArray
,
ArrayHandleScalarFunctor
(),
indexTag
));
std
::
cout
<<
" Trying scalar dynamic array."
<<
std
::
endl
;
vtkm
::
cont
::
Dynamic
ArrayHandle
dynamicArray
=
concreteArray
;
vtkm
::
cont
::
Variant
ArrayHandle
dynamicArray
=
concreteArray
;
TRY_TRANSFORM
(
transform
(
dynamicArray
,
ArrayHandleScalarFunctor
(),
indexTag
));
std
::
cout
<<
" Trying with unusual (string) dynamic array."
<<
std
::
endl
;
dynamicArray
=
vtkm
::
cont
::
ArrayHandle
<
std
::
string
>
();
TRY_TRANSFORM
(
transform
(
dynamicArray
.
ResetType
List
(
TypeListTagString
()),
ArrayHandleStringFunctor
(),
indexTag
));
TRY_TRANSFORM
(
transform
(
dynamicArray
.
ResetType
s
(
TypeListTagString
()),
ArrayHandleStringFunctor
(),
indexTag
));
std
::
cout
<<
" Trying with structured cell set."
<<
std
::
endl
;
vtkm
::
cont
::
CellSetStructured
<
3
>
concreteCellSet
;
...
...
@@ -171,8 +186,8 @@ void TestFunctionTransform()
TRY_TRANSFORM
(
vtkm
::
internal
::
make_FunctionInterface
<
void
>
(
scalarArray
,
vtkm
::
cont
::
Dynamic
ArrayHandle
(
scalarArray
),
vtkm
::
cont
::
Dynamic
ArrayHandle
(
stringArray
).
ResetType
List
(
TypeListTagString
()),
vtkm
::
cont
::
Variant
ArrayHandle
(
scalarArray
),
vtkm
::
cont
::
Variant
ArrayHandle
(
stringArray
).
ResetType
s
(
TypeListTagString
()),
vtkm
::
cont
::
DynamicCellSet
(
structuredCellSet
))
.
DynamicTransformCont
(
vtkm
::
cont
::
internal
::
DynamicTransform
(),
FunctionInterfaceFunctor
()));
}
...
...
vtkm/cont/testing/UnitTestSerializationArrayHandle.cxx
View file @
7eb1e31b
...
...
@@ -236,7 +236,7 @@ struct TestArrayHandleGroupVecVariable
vtkm
::
cont
::
make_ArrayHandle
(
comps
));
RunTest
(
array
);
// cannot make a
Dynamic
ArrayHandle containing ArrayHandleGroupVecVariable
// cannot make a
Variant
ArrayHandle containing ArrayHandleGroupVecVariable
// because of the variable number of components of its values.
// RunTest(MakeTestVariantArrayHandle(array));
}
...
...
vtkm/filter/ZFPCompressor1D.hxx
View file @
7eb1e31b
...
...
@@ -21,7 +21,6 @@
#include <vtkm/cont/ArrayHandleIndex.h>
#include <vtkm/cont/CellSetSingleType.h>
#include <vtkm/cont/CellSetStructured.h>
#include <vtkm/cont/DynamicArrayHandle.h>
#include <vtkm/cont/DynamicCellSet.h>
#include <vtkm/cont/ErrorFilterExecution.h>
...
...
vtkm/filter/ZFPCompressor2D.hxx
View file @
7eb1e31b
...
...
@@ -21,7 +21,6 @@
#include <vtkm/cont/ArrayHandleIndex.h>
#include <vtkm/cont/CellSetSingleType.h>
#include <vtkm/cont/CellSetStructured.h>
#include <vtkm/cont/DynamicArrayHandle.h>
#include <vtkm/cont/DynamicCellSet.h>
#include <vtkm/cont/ErrorFilterExecution.h>
...
...
vtkm/filter/ZFPCompressor3D.hxx
View file @
7eb1e31b
...
...
@@ -21,7 +21,6 @@
#include <vtkm/cont/ArrayHandleIndex.h>
#include <vtkm/cont/CellSetSingleType.h>
#include <vtkm/cont/CellSetStructured.h>
#include <vtkm/cont/DynamicArrayHandle.h>
#include <vtkm/cont/DynamicCellSet.h>
#include <vtkm/cont/ErrorFilterExecution.h>
...
...
vtkm/filter/ZFPDecompressor1D.hxx
View file @
7eb1e31b
...
...
@@ -21,7 +21,6 @@
#include <vtkm/cont/ArrayHandleIndex.h>
#include <vtkm/cont/CellSetSingleType.h>
#include <vtkm/cont/CellSetStructured.h>
#include <vtkm/cont/DynamicArrayHandle.h>
#include <vtkm/cont/DynamicCellSet.h>
#include <vtkm/cont/ErrorFilterExecution.h>
...
...
vtkm/filter/ZFPDecompressor2D.hxx
View file @
7eb1e31b
...
...
@@ -21,7 +21,6 @@
#include <vtkm/cont/ArrayHandleIndex.h>
#include <vtkm/cont/CellSetSingleType.h>
#include <vtkm/cont/CellSetStructured.h>
#include <vtkm/cont/DynamicArrayHandle.h>
#include <vtkm/cont/DynamicCellSet.h>
#include <vtkm/cont/ErrorFilterExecution.h>
...
...
vtkm/filter/ZFPDecompressor3D.hxx
View file @
7eb1e31b
...
...
@@ -21,7 +21,6 @@
#include <vtkm/cont/ArrayHandleIndex.h>
#include <vtkm/cont/CellSetSingleType.h>
#include <vtkm/cont/CellSetStructured.h>
#include <vtkm/cont/DynamicArrayHandle.h>
#include <vtkm/cont/DynamicCellSet.h>
#include <vtkm/cont/ErrorFilterExecution.h>
...
...
vtkm/filter/testing/UnitTestZFP.cxx
View file @
7eb1e31b
...
...
@@ -24,7 +24,6 @@
#include <vtkm/cont/DataSet.h>
#include <vtkm/cont/DataSetBuilderUniform.h>
#include <vtkm/cont/DataSetFieldAdd.h>
#include <vtkm/cont/DynamicArrayHandle.h>
#include <vtkm/cont/testing/Testing.h>
#include <vtkm/filter/CleanGrid.h>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment