Commit Graph

4272 Commits

Author SHA1 Message Date
ayenpure
2b4801239e Moving ClipTables
moving ClipTables from vtkm/worklet/internal to vtkm/worklet/clip
2018-12-18 09:57:00 +05:30
Mark Kim
6f86d21e35 clang is my nemesis. 2018-12-17 23:04:34 -05:00
Mark Kim
ce00cc6e6e straggling function variables. 2018-12-17 21:40:12 -05:00
Mark Kim
3dae0b08fd CUDA can still be finicky. 2018-12-17 19:48:57 -05:00
Mark Kim
e7c1151c74 So many warnings. 2018-12-17 17:54:26 -05:00
Mark Kim
f5ca28f5c7 More compiler warnings. 2018-12-17 17:14:42 -05:00
Mark Kim
59b1efaf44 Testing output. 2018-12-17 17:07:50 -05:00
Mark Kim
d52928c9f2 edited wrong MakeTest. Fixed. 2018-12-17 10:43:07 -05:00
Mark Kim
3fed771265 added copyright. 2018-12-17 10:22:23 -05:00
Mark Kim
a08fe42d0b Missing a header file. 2018-12-17 10:21:47 -05:00
Mark Kim
30be47ee78 Mismatched types from MakeTest. 2018-12-16 23:23:33 -05:00
Mark Kim
03fc341e5b uint is not a supported type with VC++. 2018-12-14 23:04:26 -05:00
Mark Kim
08f8bbd7f1 Visual Studio doesn't support this initialization. 2018-12-14 23:03:12 -05:00
Mark Kim
3de1944dbf Remove warnings. 2018-12-13 14:49:38 -05:00
Mark Kim
51d19d9bef cleanup debug prints 2018-12-13 14:49:38 -05:00
Mark Kim
ba60650706 little late finding this is invalid for CUDA. 2018-12-13 14:49:38 -05:00
Mark Kim
da73dfaff5 more warnings cleanup. 2018-12-13 14:49:38 -05:00
Mark Kim
20328534b5 clean up warnings. 2018-12-13 14:49:38 -05:00
Mark Kim
9c86727225 3d zfp decompress filter. 2018-12-13 14:49:38 -05:00
Mark Kim
7655797321 3d zfp compressor filter. 2018-12-13 14:49:38 -05:00
Mark Kim
a6bcf8a0ab something's not quite right. 2018-12-13 14:49:38 -05:00
Mark Kim
ce44a4d183 better tests. 2018-12-13 14:49:38 -05:00
Mark Kim
e033fe8eea fix new 1d data generator. 2018-12-13 14:49:38 -05:00
Mark Kim
8a9bfcba1b zfp 1d worklet. 2018-12-13 14:49:38 -05:00
Mark Kim
ece5913869 good to use the actual 1D compressor. 2018-12-13 14:49:38 -05:00
Mark Kim
aad7498387 1d compressor filter 2018-12-13 14:49:37 -05:00
Mark Kim
c08a0bf3f8 visual check of compression/decompression 2018-12-13 14:49:37 -05:00
Mark Kim
851c424a16 fix some bugs. 2018-12-13 14:49:37 -05:00
Mark Kim
cb8a5fd9c8 update 2d zfp filter to new 2d encode/decode worklets. 2018-12-13 14:49:37 -05:00
Mark Kim
95636ff2cd decode/encode 2d. 2018-12-13 14:49:37 -05:00
Mark Kim
d06190fdc2 how will we pass the original type? 2018-12-13 14:49:37 -05:00
Mark Kim
b41b89312c 2d zfp compress/decompress and tests. 2018-12-13 14:49:37 -05:00
Mark Kim
7118139b93 add filter testing for zfp 1d. 2018-12-13 14:49:37 -05:00
Mark Kim
2026eba609 forgot stuff. 2018-12-13 14:49:37 -05:00
Mark Kim
3b99722f6e Prototyping zfp 1d filter. 2018-12-13 14:49:37 -05:00
mclarsen
aa891c58a7 fixed decompression porting bugs 2018-12-13 14:49:37 -05:00
mclarsen
37cba9e99f adding path for decompress 2018-12-13 14:49:37 -05:00
mclarsen
0c788b92a2 fixed error with integer types 2018-12-13 14:49:37 -05:00
mclarsen
584b36d64e adding partial gather3 2018-12-13 14:49:37 -05:00
mclarsen
4650881f58 something 2018-12-13 14:49:37 -05:00
mclarsen
1020cb43e6 more missing files 2018-12-13 14:49:37 -05:00
mclarsen
cf3d24d1aa more missing files 2018-12-13 14:49:37 -05:00
mclarsen
baa0ad77c7 adding missing file 2018-12-13 14:49:36 -05:00
mclarsen
bcd0150e9e save point 2018-12-13 14:49:36 -05:00
mclarsen
1c45e48fac compression working and benchmarked 2018-12-13 14:49:36 -05:00
mclarsen
c01e1b7349 debugging cuda failure 2018-12-13 14:49:36 -05:00
mclarsen
8cd7c5db32 fixed the gather 2018-12-13 14:49:36 -05:00
mclarsen
ea9bef19da init zfp 2018-12-13 14:49:36 -05:00
Allison Vacanti
f3536e44f8 Merge topic '320-vtkm_init'
cdb1f5680 Add vtkm::cont::Initialize.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Acked-by: Haocheng LIU <haocheng.liu@kitware.com>
Merge-request: !1475
2018-12-13 12:01:57 -05:00
Allison Vacanti
cdb1f5680a Add vtkm::cont::Initialize.
Also
- Renamed vtkm::cont::make_DeviceAdapterIdFromName to just overload
  make_DeviceAdapterId.
- Refactored CMake logic for unit tests
  - Since we're now querying the device tracker for the names, they
    cannot be all caps.
- Updated usages of InitLogging to use Initialize instead.
- Added changelog.
2018-12-13 10:15:44 -05:00
Kenneth Moreland
81a22ff64f Change ConvertNumComponentsToOffsets to use DeviceAdapterId
The vtkm::cont::ConvertNumComponentsToOffsets method was originally
created before vtkm::cont::DeviceAdapterId and the dynamic
vtkm::cont::Algorithm classes were created. Thus, it contained its own
version of TryExecute and did not support the direct selection of a
device at runtime. Change the function to use the new dynamic device
adapter id, which makes this more consistent with the rest of VTK-m and
cleans up the implementation quite a bit.
2018-12-12 08:18:47 -07:00
Robert Maynard
4994190064 UnitTestMoveConstructors will now compile with gcc 4.9 and Intel < 17. 2018-12-11 09:29:08 -05:00
Robert Maynard
0da7830d9a Make sure important vtkm::cont classes have noexcept move ops.
This is important so they can be stored efficiently inside
containers such as std::vector that require strong move guarantees.
2018-12-10 10:33:18 -05:00
ayenpure
d1d495d435 Fixing warnings 2018-12-08 14:41:59 +05:30
ayenpure
e340cdf88c Fixing warnings 2018-12-08 14:17:28 +05:30
ayenpure
d0cf80bddd Updating tests for the new Clip tables 2018-12-08 11:57:34 +05:30
ayenpure
831914f318 Fising warnings 2018-12-08 08:14:05 +05:30
ayenpure
1ca02af988 Removing whitespaces 2018-12-07 23:33:08 +05:30
ayenpure
f72299c948 Resolving warnings from last iteration 2018-12-07 23:28:31 +05:30
Robert Maynard
6520ca1ff9 Merge topic 'improve_array_handle_basic_serialization_perf'
fee6ef591 Improve serialization performance of ArrayHandle with BasicStorage

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1474
2018-12-07 10:22:41 -05:00
ayenpure
cab80e8e3f Adding Clip files 2018-12-07 20:39:21 +05:30
Robert Maynard
dd0cbc3689 Merge topic 'disable_cuda_optimizations_for_UnitTestBoundingIntervalHierarchy'
a9c151188 Disable ptxas for CUDA 8 && 9 for UnitTestBoundingIntervalHierarchy.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1465
2018-12-07 08:28:04 -05:00
Robert Maynard
fee6ef591b Improve serialization performance of ArrayHandle with BasicStorage 2018-12-06 09:21:06 -05:00
Kenneth Moreland
1766f213ea Merge topic 'dynamic-neighborhood-size'
82536092c Rename boundary classes
e008aff27 Change neighborhood parameter from layer to radius
7f627380b Fix Marching Cubes regression test
01a9e8541 Change WorkletPointNeighborhood to specify neighborhood at runtime

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1457
2018-12-04 16:02:46 -05:00
Sujin Philip
6d81bc8b06 Implement extents support
Adds a variable `GlobalPointIndexStart` to `CellSetStructured`.
Adding this to the cell-set, instead of the coordinate system, enables this
feature for different types of datasets like uniform grid, rectilinear, etc.,
with this one change.
The extents can be computed using `GlobalPointIndexStart` and `PointDimensions`.
2018-12-03 15:56:45 -05:00
Kenneth Moreland
82536092cc Rename boundary classes
Did a bit of renaming of the support classes used for
WorkletPointNeighborhood. First, the OnBoundary tag is changed to
Boundary to match other tags and reflect some changes in the resulting
methods. Also moved the BoundaryState and Neighborhood classes from
vtkm::exec::arg to vtkm::exec to be more accessible. Finally, the
Neighborhood class name was changed to FieldNeighborhood to be more
specific on what role this class plays with neighborhood.
2018-12-03 12:45:23 -07:00
Kenneth Moreland
e008aff27b Change neighborhood parameter from layer to radius
It was determined that the word "radius" more clearly described how the
size of the neighborhood is determined.
2018-12-03 12:45:23 -07:00
Kenneth Moreland
7f627380b6 Fix Marching Cubes regression test
Turns out there was a bug in the way Marching Cubes computed gradients
on a structured grid. A recent change to Boundary also had a similar bug
that ended in the same behavior. The recent changes to BoundaryState
fixed the problem, but caused the Marching Cubes test to fail because it
was comparing against bad gradient values.

This change fixes the array of gradient values. I'm pretty sure these
are correct since I generated them with ParaView (using a completely
separate implementation).
2018-12-03 12:45:23 -07:00
Kenneth Moreland
01a9e85416 Change WorkletPointNeighborhood to specify neighborhood at runtime
Previously, WorkletPointNeighborhood had a template argument to select
the size of the neighborhood. This change removes that template
argument. Instead, the vtkm::exec::arg::BoundaryState methods now take
in a size parameter when determining when it overlaps the boundary.

If in the future we want to add the ability to select the neighborhood
size at compile-time (for performance reasons), I suggest adding this
template argument to the OnBoundary tag for ExecutionSignature.
2018-12-03 12:45:23 -07:00
ayenpure
7eb0de5b74 Merge branch 'code_sprint_locator_fixes' of gitlab.kitware.com:ayenpure/vtk-m into code_sprint_locator_fixes 2018-12-03 08:07:07 -08:00
ayenpure
866b0798d4 Resolving type warnings 2018-12-03 08:03:36 -08:00
ayenpure
c062f2e26c Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into code_sprint_locator_fixes 2018-12-03 07:44:31 -08:00
larsen30@llnl.gov
361c5695bc adjusing ray start 2018-12-02 19:14:27 -08:00
Haocheng LIU
deeb9c4183 Remove a mis-added autossave file 2018-11-30 08:40:10 -05:00
Haocheng LIU
0d39806f4f Rename worklet testing executable
Now it's in accordance with vtkm testing name convension as
UnitTests_vtkm_worklet_testing.
2018-11-29 15:51:41 -05:00
Robert Maynard
a9c1511888 Disable ptxas for CUDA 8 && 9 for UnitTestBoundingIntervalHierarchy. 2018-11-28 11:14:59 -05:00
Kenneth Moreland
0725bd4578 Merge topic 'average-by-key-warning'
6ebc3ea76 Fix potential warning in AverageByKey

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1463
2018-11-27 17:53:20 -05:00
Haocheng LIU
9bd30571f5 Fix link errors for vtkm_cont when logging is enabled 2018-11-27 11:37:51 -05:00
Kenneth Moreland
6ebc3ea761 Fix potential warning in AverageByKey
To get the average, we (of course) divide the sum by the amount of
values, which is returned from valuesIn.GetNumberOfComponents(). To do
this, we need to cast the number of components (returned as a
vtkm::IdComponent) to a FieldType. This is a little more complex than it
first seems because FieldType might be a Vec type. If you just try a
static_cast<FieldType>(), it will use the constructor to FieldType which
might be a Vec constructor expecting the type of the component. This in
turn could cause a warning because the vtkm::IdComponent is implicitly
converted to the Vec's component type.

Get around this problem by first casting to the component type of the
field and then constructing a field value from that.
2018-11-27 09:31:23 -07:00
Haocheng LIU
8859636672 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-11-23 10:13:56 -05:00
Haocheng LIU
88bcd06964 Bump Mean C++ Option Parser
This MR bumps the version from 1.3 to 1.7 to absorb MSC compiler
fixes and const-correctness.
2018-11-23 10:13:56 -05:00
Robert Maynard
b922851bf2 Correct rendering warning of a 64bit to 32bit conversion 2018-11-19 14:20:45 -05:00
Kenneth Moreland
6002b1c1b5 Merge topic 'more-precise-boundary-state'
3e3baad6f Add better queries to vtkm::exec::arg::BoundaryState

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1456
2018-11-14 18:17:36 -05:00
Kenneth Moreland
33db6655fc Make the building of static color table presets is thread safe
If multiple threads call a function with a static function
simultaneously for the first time, C++ does not guarantee that the
static member will be constructed correctly. Make sure that it happens
correctly.
2018-11-14 09:19:07 -06:00
Kenneth Moreland
3e3baad6f8 Add better queries to vtkm::exec::arg::BoundaryState
Previously, vtkm::exec::arg::BoundaryState only provided methods that
said whether or not the neighborhood extened past the boundary of a
mesh. That is fine for a 3x3x3 neighborhood, which can only extend over
the boundary by one. However, that is problematic for larger
neighborhoods where you may need to know how far neighborhood extends
over the boundary.

This changes allows you to query how far the neighborhood extends within
the constrains of the boundary.
2018-11-13 22:45:06 -06:00
Kenneth Moreland
8984e74e8c Hold preset information in simple struct
Creating all the presets as vtkm::cont::ColorTable objects and passing
them back was problematic. It caused state to be shared and caused
issues when deallocating after the device deallocation methods were
finalized. Instead, make a simple struct and build new color tables on
the fly.
2018-11-11 17:30:11 -07:00
Kenneth Moreland
70e10459c7 Update presets for ColorTable
The ParaView project went through a rigourous selection process
for a short list of color tables. Let's replicate that for our
presets.
2018-11-09 09:02:10 -07:00
Dave Pugmire
1e9c7b3c2a Add tests for rectilinear and explicit datasets. Remove a commented-out line. 2018-11-06 16:39:56 -05:00
Robert Maynard
dadfeab00a Simplify vtkm::cont::Field by using delegating constructors. 2018-11-02 14:18:09 -04:00
Haocheng LIU
e178b8c4cd Merge topic 'change-RuntimeDeviceInformation-template-independent'
bb0671780 Make RuntimeDeviceInformation class template independent

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1446
2018-11-02 10:20:36 -04:00
Kenneth Moreland
67c9af91a9 Merge topic 'policies-for-auxiliary-fields'
86a747a11 Add ability to customize filter policy to auxiliary input fields

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1442
2018-11-01 20:04:01 -04:00
Haocheng LIU
bb06717803 Make RuntimeDeviceInformation class template independent
By making RuntimeDeviceInformation class template independent, vtkm is
able to detect
device info at runtime with a runtime specified deviceId. In the past
it's impossible
because the CRTP pattern does not allow function overloading(compiler
would complain
that DeviceAdapterRuntimeDetector does not have Exists() function
defined).
2018-11-01 14:55:33 -04:00
mclarsen
2d782ff7d0 removing some entries from test build exclusion (colors) 2018-11-01 09:45:57 -07:00
mclarsen
2addf93938 removing color conversion files from test build 2018-11-01 09:36:19 -07:00
mclarsen
e5d03852b1 add subdirectory for colorconversion 2018-11-01 09:25:10 -07:00
Kenneth Moreland
86a747a117 Add ability to customize filter policy to auxiliary input fields
The field infrastructure has a "trait" that specifies the valid types
for the default active scalar field. Most filters have at most one input
field. The majority of the remaining filters use the same types for
inputs. There are some examples, however, where some auxiliary fields
use different types. This change adds a second template parameter to
FieldTraits to customize the valid types of the input scalar field to
different fields.

These changes are in anticipation of the removal of list specifier tags
on worklet ControlSignature arguments.
2018-10-31 23:51:36 +01:00
Robert Maynard
154b65f47a Install vtkm/cont/ColorTable.hxx so users can use color tables 2018-10-31 17:02:12 -04:00
Matt Larsen
27d7162b1e Merge topic 'partial_composites'
fd4ff8c1f adding files patch forgot
e03703578 removing unused variable
5a1685d8a updates to the connectivity tracer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1447
2018-10-31 11:40:29 -04:00
Robert Maynard
458fc974b5 Merge topic 'rework_colortable_for_separable_compilation'
169ca722b Redesign vtkm::cont::ColorTable to work with separable compilation.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !1445
2018-10-31 11:24:43 -04:00
Robert Maynard
169ca722b3 Redesign vtkm::cont::ColorTable to work with separable compilation. 2018-10-31 08:18:08 -04:00
Matt Larsen
fd4ff8c1f3 adding files patch forgot 2018-10-30 08:18:56 -07:00
Matt Larsen
e037035780 removing unused variable 2018-10-30 08:09:11 -07:00
Matt Larsen
5a1685d8aa updates to the connectivity tracer 2018-10-30 07:46:42 -07:00
Robert Maynard
8237db209e Merge topic 'noexcept_move_constructors'
c66a6e480 Provided vtkm::cont::Storage with move schematics
1f86878f7 Make the ArrayHandle move constructors noexcept.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1439
2018-10-29 10:24:48 -04:00
Robert Maynard
e549cea8eb Merge topic 'openmp_rendering_tests'
184bdf9d6 Test rendering with OpenMP

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1441
2018-10-25 08:29:31 -04:00
Robert Maynard
c66a6e480d Provided vtkm::cont::Storage with move schematics 2018-10-24 15:45:55 -04:00
Robert Maynard
184bdf9d60 Test rendering with OpenMP 2018-10-24 15:39:54 -04:00
Matthew Letter
5426ae0ed3 added runtime device tracker force
added `vtkm::cont::GetGlobalRuntimeDeviceTracker().ForceDevice(VTKM_DEFAULT_DEVICE_ADAPTER_TAG());`
2018-10-24 11:19:52 -06:00
Matthew Letter
cb03238804 removed device from run function for AverageByKey
I also cleaned up the unit test to no longer pass the device
2018-10-24 10:28:12 -06:00
Robert Maynard
1f86878f78 Make the ArrayHandle move constructors noexcept.
std::containers only activate fast emplace operations if the
T types move operators are noexcept
2018-10-23 16:21:05 -04:00
Robert Maynard
8a739ee1b6 Merge topic 'correct_vtkm_warnings'
9403bac1f VTK-m device side math functions need to use the vtkm:: wrappers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1436
2018-10-22 08:36:42 -04:00
Robert Maynard
9403bac1f6 VTK-m device side math functions need to use the vtkm:: wrappers 2018-10-18 13:57:53 -04:00
Robert Maynard
cd6367646c ParticeAdvection for cuda <= 9 now built without ptxas optimizations
The ParticleAdvection code would always cause cuda 9's ptxas phase
to crash, so we disable optimization to work around this issue
2018-10-18 11:19:23 -04:00
Robert Maynard
57236e0f6e particleadvection was missing ::template causing VS2015 failures 2018-10-17 10:53:19 -04:00
Kenneth Moreland
f4f5dcb74c Fix warnings about using template outside of a template
Previously, UnitTestProbe used a struct templated on the device adapter,
and that necessitated the use of the template keyword when using an
ambiguous type. These recent changes remove that template argument and
thus can cause a warning about using the template keyword in a non-
ambiguous type.
2018-10-16 22:41:19 -06:00
Kenneth Moreland
bcbad61002 Fix warnings about uninitalized value
In some functors within Algorithm.h, the functor did not have a
default constructor that initialized its fields. This could in turn
lead to a warning about using it unitialized.
2018-10-16 17:19:49 -06:00
Kenneth Moreland
bddad9b386 Remove TryExecute from filters
Now that the dispatcher does its own TryExecute, filters do not need to
do that. This change requires all worklets called by filters to be able
to execute without knowing the device a priori.
2018-10-16 15:59:53 -06:00
Robert Maynard
03e2e721ec Merge topic 'correct_ppp2_compile_failures'
a423cf056 TestBuild header paths are shorter to make windows happy.
e49e21aea Cleanup more of contourtree_augmented to make windows builders happy

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1424
2018-10-16 16:16:47 -04:00
Robert Maynard
a423cf056c TestBuild header paths are shorter to make windows happy.
ContourTreeAugumneted paths became too long and caused msvc
to fail to construct pdb paths
2018-10-16 15:01:39 -04:00
Kenneth Moreland
f3b923a597 Temporarily remove UnitTestParticleAdvection.cxx from CUDA tests
The CUDA compiler is giving us grief while compiling
UnitTestParticleAdvection.cxx even though the code is correct. Disable
it for now until we figure out what can be done with the compiler.
2018-10-16 10:42:45 -06:00
Kenneth Moreland
723792a482 Use new integrators and evaluators for advection 2018-10-16 09:53:18 -06:00
Kenneth Moreland
d49c29cef9 Make particle advection integrators and evaluators ExecObject
By making these helper classes ExecObject, they no longer need to have a
device to be constructed. This is important for future plans to make the
filters not determine a device adapter now that dispatchers no longer
require a device adapter.
2018-10-16 09:53:18 -06:00
Kenneth Moreland
a2602183a4 Make integrators have a virtual superclass
This will make it easier to support integrators as an ExecObject.

One side effect is that the integrators and partical advection
are not templated by the type of the field.
Regardless of the type of the field, there is probably little reason to
compute particle advection with less than 64 bit floats to account for
accumulated errors. This will make it easier to use these classes.
2018-10-16 09:53:18 -06:00
Robert Maynard
e49e21aea4 Cleanup more of contourtree_augmented to make windows builders happy 2018-10-16 10:30:57 -04:00
Robert Maynard
45422478cf Refactor VirtualObjectHandle to support new virtual design 2018-10-15 17:38:54 -04:00
Robert Maynard
ab25b4228e Cleanup the documentation in ErrorBadDevice 2018-10-11 08:11:43 -04:00
Allison Vacanti
6fb879ec20 Fix typo in logging docs. 2018-10-10 15:39:13 -04:00
Allison Vacanti
be0db4b021 Add parameter-less InitLogging().
Also document that this function should only be called from a
single thread.
2018-10-10 15:39:03 -04:00
Allison Vacanti
16c4dde2ee Merge topic 'cuda10_warning'
0e105eae6 cudaPointerAttributes::isManaged deprecated in CUDA 10.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1430
2018-10-10 15:05:57 -04:00
Allison Vacanti
0e105eae6d cudaPointerAttributes::isManaged deprecated in CUDA 10.
Update code to support both the old and new way of checking this.
2018-10-10 13:51:56 -04:00
Haocheng LIU
246a58309c Add a split sharp edge worklet and filter
It's a filter that Split sharp manifold edges where the feature angle
between the adjacent surfaces are larger than the threshold value.
When an edge is split, it would add a new point to the coordinates
and update the connectivity of an adjacent surface.
Ex. there are two adjacent triangles(0,1,2) and (2,1,3). Edge (1,2) needs
to be split. Two new points 4(duplication of point 1) an 5(duplication of point 2)
would be added and the later triangle's connectivity would be changed
to (5,4,3).
By default, all old point's fields would be copied to the new point.
Use with caution.
2018-10-09 15:33:47 -04:00
Kenneth Moreland
6543942568 Merge topic 'better-test-macros'
899b93ec2 Allow variable arguments to VTKM_TEST_ASSERT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1429
2018-10-08 12:11:13 -04:00
Kenneth Moreland
899b93ec2c Allow variable arguments to VTKM_TEST_ASSERT
The VTKM_TEST_ASSERT macro is a very useful tool for performing checks
in tests. However, it is rather annoying to have to always specify a
message for the assert. Often the failure is self evident from the
condition (which is already printed out), and specifying a message is
both repetative and annoying.

Also, it is often equally annoying to print out additional information
in the case of an assertion failure. In that case, you have to either
attach a debugger or add a printf, see the problem, and remove the
printf.

This change solves both of these problems. VTKM_TEST_ASSERT now takes a
condition and a variable number of message arguments. If no message
arguments are given, then a default message (along with the condition)
are output. If multiple message arguments are given, they are appended
together in the result. The messages do not have to be strings. Any
object that can be sent to a stream will be printed correctly. This
allows you to print out the values that caused the issue.
2018-10-08 09:17:56 -06:00
Robert Maynard
96ba37d16b Merge topic 'make_more_arrays_constexpr'
5c5ca3ad9 Mark more data arrays as constexpr instead of just const.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Matt Larsen <mlarsen@cs.uoregon.edu>
Merge-request: !1423
2018-10-08 08:38:23 -04:00
Robert Maynard
9d5efbd95d Merge topic 'misc-typos'
d5beb69ec Misc. typos

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1426
2018-10-08 08:37:19 -04:00
Robert Maynard
5c5ca3ad9e Mark more data arrays as constexpr instead of just const. 2018-10-05 14:52:55 -04:00
Kenneth Moreland
5608615970 Disable header testing in PPP2 mesh_dem_meshtypes
For some unknown reason, on windows these header tests were producing
the following errors:

fatal error C1041: cannot open program database

There might be a better way around this, but the easiest way is to
simply remove those test builds.
2018-10-05 09:01:37 -06:00
luz.paz
d5beb69ec1 Misc. typos
Found via `codespell`
2018-10-04 10:30:33 -04:00
Robert Maynard
db1b394336 Merge branch '291_logging' into 'master'
Add general logging support

See merge request vtk/vtk-m!1414
2018-10-04 09:36:47 -04:00
Robert Maynard
e8bc2a56ed make_DeviceAdapterId is now inline to remove duplicate symbols. 2018-10-04 08:42:29 -04:00
Robert Maynard
a512cd495e Allow runtime construction of DeviceAdapterId
When need some way to convert user input such as an integer or
string to a device adapter id. This allows for integer to
device adapter id.
2018-10-03 13:43:31 -04:00
ayenpure
797c838917 Adding default constructor and removing wrong comment 2018-10-02 15:33:36 -07:00
ayenpure
f8150016ea Fixing warnings 2018-10-02 13:12:26 -07:00
Allison Vacanti
bd337854ec Initial implementation of general logging.
Addresses #291.
2018-10-02 11:37:55 -04:00
Matt Larsen
5a25131aa1 Merge topic 'lagrangian_add_worklet'
a5d678829 Added a worklet to evaluate particle validity in Lagrangian filter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Matt Larsen <mlarsen@cs.uoregon.edu>
Merge-request: !1422
2018-09-29 12:20:34 -04:00
Robert Maynard
91fd7f4f74 Merge topic 'ppp2'
c05b04c9d Fix windows warnings of duplicate symbols
12b90c434 Rename PPP2 to Augmented.
6f5c383e1 Move PPP2 over to constexpr instead of defines
f828ebfd4 Update PPP2 to dispatcher that don't require a device adapter template
98fd16d9a Correct PPP2 warnings found from 32bit builders
b460f5611 Make sure ContourTreeApp obeys the desired device
432ee3422 Optimize the PPP2 ActiveGraphs to reduce size of device transfers
2370a6cc5 Refactor the PPP2 work based on Code Review and add UnitTests.
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1376
2018-09-29 09:40:17 -04:00
Robert Maynard
c05b04c9d7 Fix windows warnings of duplicate symbols 2018-09-27 14:07:45 -07:00
Sudhanshu Sane
a5d678829b Added a worklet to evaluate particle validity in Lagrangian filter 2018-09-26 21:00:08 +02:00
Robert Maynard
12b90c434b Rename PPP2 to Augmented. 2018-09-26 10:48:37 -07:00
mclarsen
795aee6fc7 correcting error when building a BVH with a single primitive 2018-09-25 19:27:12 -07:00
Sujin Philip
184f044f87 Merge topic 'serialization'
ebcd0ade6 Move test_equal_* functions to vtkm::cont::testing
d34eca5f4 Update RedistributePoints to use the new serialization methods
365d3d392 Implement DataSet Serialization
fd89dfc89 Add ArrayHandle Serialization

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1280
2018-09-25 16:52:24 -04:00
mclarsen
09ed5871b6 adding switch for ray tracer shadning 2018-09-25 11:31:37 -07:00
Sujin Philip
ebcd0ade6a Move test_equal_* functions to vtkm::cont::testing
Implement more general versions of `test_equal_ArrayHandles`, `test_equal_CellSets`, `test_equal_Fields`, and `test_equal_DataSets` functions and put them
in vtkm/cont/testing/Testing.hi with the hope that they will be useful for
others also.
2018-09-25 13:58:39 -04:00
Sujin Philip
365d3d3921 Implement DataSet Serialization 2018-09-25 13:58:39 -04:00
Sujin Philip
fd89dfc89b Add ArrayHandle Serialization 2018-09-25 13:58:39 -04:00
mclarsen
bc4d034f8f fixing compositing error 2018-09-25 09:59:59 -07:00
Allison Vacanti
a754787e38 Add loguru to project. 2018-09-21 14:43:56 -04:00
Allison Vacanti
7864a1daac Merge branch 'upstream-loguru' into tmp
* upstream-loguru:
  loguru 2018-09-21 (9d48e6b0)
2018-09-21 14:25:01 -04:00
Allison Vacanti
12f78e7404 Add loguru thirdparty metadata. 2018-09-21 14:24:48 -04:00
Robert Maynard
8d0f441e1b Merge topic 'turing_support'
17a93921c Suppress CUDA 10 warnings about __host__ / __device__
23c5f1182 vtk-m brigand nows knows what workaround are only needed for CUDA 9.
36ca00794 Add turing to VTK-m support hardware now that CUDA 10 is out.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !1417
2018-09-20 15:35:48 -04:00
Robert Maynard
17a93921c3 Suppress CUDA 10 warnings about __host__ / __device__ 2018-09-20 14:02:16 -04:00
Robert Maynard
23c5f11823 vtk-m brigand nows knows what workaround are only needed for CUDA 9.
Some CUDA 9 compiler issues are fixed in CUDA 10.
2018-09-20 14:02:16 -04:00
mclarsen
3ec577f4cd fixing debug prints and removing commented out code 2018-09-20 08:13:15 -07:00
Robert Maynard
fc6fcee8fd Merge topic 'support_connectivity_with_no_default_constructor'
d1d8756dc ThreadIndicesTopologyMap supports types without a default constructor

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1410
2018-09-18 11:49:32 -04:00
Robert Maynard
6d96277b52 Merge topic 'ConnectivityStructuredInternals_32bit_warnings'
3eec282f2 GCC 7.1 was warning about invalid ConnectivityStructuredInternals states

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1413
2018-09-18 11:42:15 -04:00
Robert Maynard
6f5c383e1b Move PPP2 over to constexpr instead of defines 2018-09-18 08:54:22 -04:00
Robert Maynard
f828ebfd4e Update PPP2 to dispatcher that don't require a device adapter template
The update now has PPP2 using the vtkm::worklet::Invoker class
to handle managing the device adapter.
2018-09-18 08:54:22 -04:00
Robert Maynard
98fd16d9ad Correct PPP2 warnings found from 32bit builders 2018-09-18 08:54:22 -04:00
Robert Maynard
432ee34228 Optimize the PPP2 ActiveGraphs to reduce size of device transfers 2018-09-18 08:54:22 -04:00
Oliver Ruebel
2370a6cc5d Refactor the PPP2 work based on Code Review and add UnitTests. 2018-09-18 08:54:22 -04:00
Gunther H. Weber
ab0ccd4cad vtk-m implementation of improved parallel peak pruning with hyperstructure (PPP2.0) 2018-09-18 08:54:22 -04:00
Dave Pugmire
367b84628a Merge topic 'ghost-cells'
c2467d57e fix compiler warning for TBB
0ca97902a Fix tab/white space warnings.
4ae9cedea Add new files for ghost cells
beec40244 Support for ghost zones. Add a filter to remove ghost cells.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1404
2018-09-17 15:08:44 -04:00
Robert Maynard
3eec282f24 GCC 7.1 was warning about invalid ConnectivityStructuredInternals states
In theory if you requested negative indices's or generated a structure
with invalid point sizes the result of some operations would be
in an invalid state. Gave the compiler hints that this states
can't occur.
2018-09-17 08:15:43 -04:00
Robert Maynard
e51472d703 Merge topic 'vtkm_hash_remove_32bit_warnings'
d8375351f vtkm::Hash now doesn't warn when compiling with 32bit ids.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1412
2018-09-17 08:08:04 -04:00
Robert Maynard
caa23b5499 Merge topic 'reverse_conn_support_differing_types'
767eb8206 ReverseConnectivityBuilder can handle 32bit and 64bit connectivity

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1409
2018-09-15 11:45:41 -04:00
ayenpure
0fa7335294 Adding fixes from Ken's review 2018-09-14 11:59:37 -06:00
Robert Maynard
2c218dd958 Merge topic 'osx_static_warnings'
c0a5e1624 Fix vtk-m warnings on static osx builds.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1408
2018-09-13 15:46:37 -04:00
Robert Maynard
d8375351f7 vtkm::Hash now doesn't warn when compiling with 32bit ids. 2018-09-13 13:15:29 -04:00
mclarsen
44feb92066 removing print statements 2018-09-13 09:18:18 -07:00
Robert Maynard
d1d8756dc9 ThreadIndicesTopologyMap supports types without a default constructor
Previously IndicesFromType had to support the default constructor
2018-09-13 09:40:28 -04:00
Robert Maynard
767eb82063 ReverseConnectivityBuilder can handle 32bit and 64bit connectivity
This allows ReverseConnectivityBuilder to build any connectivity
independent of vtkm::Id being 32 or 64 bit.
2018-09-13 09:33:31 -04:00
Robert Maynard
c0a5e16249 Fix vtk-m warnings on static osx builds. 2018-09-13 09:15:25 -04:00
mclarsen
09b880aeb9 fixing shadow variable caused by bad conflict resolution 2018-09-12 19:46:07 -07:00
mclarsen
0e7e51a1ce resolving merge conflict 2018-09-12 18:58:33 -07:00
mclarsen
0b99ff5796 adding doxygen comments to new rendering 2018-09-12 07:41:37 -07:00
Kenneth Moreland
1acc610799 Merge topic 'array-handle-transform-exec-object-2'
2b0548739 Add ExecutionAndControlObjectBase
62d3b9f4f Correct warning about potential divide by zero
98a0a20fe Allow ArrayHandleTransform to work with ExecObject

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1403
2018-09-11 10:28:13 -04:00
mclarsen
9751eed4f9 adding more missing files 2018-09-10 20:27:34 -07:00
mclarsen
20c5c97cd2 adding missing files 2018-09-10 20:00:04 -07:00
mclarsen
6362978ab2 adding more ray tracing files 2018-09-10 19:56:57 -07:00
mclarsen
1c2f78ca92 refactoring ray tracing 2018-09-10 19:25:42 -07:00
Matthew Letter
c45716cb3b Removed ExecutionObjectBase from ExecutionWholeArray
ExecutionObjectBase no longer needs to be used for ExecutionWholeArray

also fixed `#endif` naming for our conventions
2018-09-10 11:28:46 -06:00
Kenneth Moreland
2b05487398 Add ExecutionAndControlObjectBase
This is a subclass of ExecutionObject and a superset of its
functionality. In addition to having a PrepareForExecution method, it
also has a PrepareForControl method that gets an object appropriate for
the control environment. This is helpful for situations where you need
code to work in both environments, such as the functor in an
ArrayHandleTransform.

Also added several runtime checks for execution objects and execution
and cotnrol objects.
2018-09-08 11:54:28 -06:00
Dave Pugmire
c2467d57e0 fix compiler warning for TBB 2018-09-06 13:07:27 -04:00
Dave Pugmire
0ca97902ae Fix tab/white space warnings. 2018-09-06 12:04:37 -04:00
Dave Pugmire
4ae9cedead Add new files for ghost cells 2018-09-06 11:39:04 -04:00
Dave Pugmire
beec402446 Support for ghost zones. Add a filter to remove ghost cells. 2018-09-06 11:34:13 -04:00
Kenneth Moreland
62d3b9f4fb Correct warning about potential divide by zero
I'm not sure why this warning suddenly popped up, but this was an easy
fix.
2018-09-05 15:28:26 -06:00
Kenneth Moreland
98a0a20feb Allow ArrayHandleTransform to work with ExecObject
This change allows you to set a subclass of
vtkm::cont::ExecutionObjectBase as a functor
used in ArrayHandleTransform. This latter class will then detect that
the functor is an ExecObject and will call PrepareForExecution with the
appropriate device to get the actual Functor object.

This change allows you to use virtual objects and other device dependent
objects as functors for ArrayHandleTransform without knowing a priori
what device the portal will be used on.
2018-09-05 13:11:04 -06:00
Robert Maynard
bc9772021c Merge topic 'worklet_invoker_api'
7e3727fa9 Convert some vtkm/cont classes over to vtkm::worklet::Invoker
eae0eb9b7 Add an easier way to launch vtkm worklets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1398
2018-09-04 16:18:14 -04:00
Robert Maynard
7e3727fa9c Convert some vtkm/cont classes over to vtkm::worklet::Invoker 2018-09-04 15:01:18 -04:00