Robert Maynard
57471721f7
Merge topic 'safer_vectorizations_for_serial_backend'
...
73b90a2e Don't provide vectorization hints for operations that can be done inplace.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !360
2016-03-16 15:27:02 -04:00
Robert Maynard
28c0118d83
Merge topic 'triangluate_table_conversion_warning'
...
81147365 fix a long long to int warning.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !361
2016-03-16 15:26:36 -04:00
Robert Maynard
8114736510
fix a long long to int warning.
2016-03-16 13:27:32 -04:00
Robert Maynard
73b90a2e44
Don't provide vectorization hints for operations that can be done inplace.
...
Previously we hinted to the compiler that it should vectorized operations
where the input and output are the same array. This obviously caused problems,
and these hints had to be removed.
In the future we need to first check for aliased arrays, and go from there.
2016-03-16 08:29:00 -04:00
Robert Maynard
177b31f330
Merge topic 'properly_compute_scatter_array_lengths'
...
85084f2c ScatterIdentity::GetVisitArray parameters are now named properly
86ecad65 ScatterIdentity::GetOutputToInputMap parameters are now named properly
40896e2b Allocate the scatter arrays to be proper length.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !359
2016-03-15 16:59:52 -04:00
Robert Maynard
85084f2ca1
ScatterIdentity::GetVisitArray parameters are now named properly
...
Now it is clear you pass in the input range and you will get the output
range
2016-03-15 16:49:36 -04:00
Robert Maynard
86ecad659a
ScatterIdentity::GetOutputToInputMap parameters are now named properly
...
Now it is clear you pass in the input range and you will get the output
range.
2016-03-15 16:20:37 -04:00
Robert Maynard
40896e2bab
Allocate the scatter arrays to be proper length.
...
The previous code would over allocate all the scatter arrays since
it was computing the output range, than using that as the input range.
2016-03-15 13:13:34 -04:00
Robert Maynard
2f352f90f4
Merge topic 'vtkm_filters'
...
e4237c3a Fix warnings found by the dashboard machines.
179b48e0 Reduce compile time for MarchingCubes by passing less info by Invoke.
8e4a47ef Update IsosurfaceUniformGrid to use the marching cubes filter.
d370155e MarchingCubes filter now generates coordinates when point merging is enabled.
c00fb53b Marching Cubes now generates vertices when merge duplicates is enabled.
f699c986 Renamed the ```Convert``` method to ```ApplyPolicy```
8e72ec8e Switch filter::threshold over to have a lower and upper bounds.
bcee8270 First draft of vtkm::filter design.
...
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !311
2016-03-15 13:07:20 -04:00
Robert Maynard
e9040745e0
Merge topic 'functorbase_proper_constructor'
...
8683240b vtkm::exec::FunctorBase now properly initializes ErrorMessageBuffer.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !358
2016-03-14 17:44:58 -04:00
Robert Maynard
af3c942e69
Merge topic 'implicit_function_wrong'
...
06424786 Correct implicit function test failures when vectorization is enabled.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !356
2016-03-14 17:44:47 -04:00
Robert Maynard
8683240b85
vtkm::exec::FunctorBase now properly initializes ErrorMessageBuffer.
2016-03-14 16:57:35 -04:00
Robert Maynard
62dd5e6a2a
Merge topic 'proper_atomics_with_serial_device'
...
ee4e490f Moved SMP atomic operations from TBB to General.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !357
2016-03-14 16:56:23 -04:00
Robert Maynard
0642478668
Correct implicit function test failures when vectorization is enabled.
...
When vectorization is enabled we start using 'fast' math, and therefore instead
of getting perfect 0.0 values we get values that are extremely close to zero.
2016-03-14 15:56:27 -04:00
Robert Maynard
da09f73951
Merge topic '64bit_float_default_build_corrections'
...
f01fd68b DataSetBuilderUniform now builds when the float default is double.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !355
2016-03-14 13:05:10 -04:00
Robert Maynard
ee4e490f1d
Moved SMP atomic operations from TBB to General.
...
Even when running with the serial backend, the compiler might enable SIMD
vectorization when optimizations are turned on. When this occurs, we need
to use properly atomic Add's and CAE's.
2016-03-14 10:40:42 -04:00
Robert Maynard
f01fd68b7e
DataSetBuilderUniform now builds when the float default is double.
2016-03-14 10:36:13 -04:00
Robert Maynard
e4237c3a3b
Fix warnings found by the dashboard machines.
2016-03-14 08:39:17 -04:00
Robert Maynard
179b48e094
Reduce compile time for MarchingCubes by passing less info by Invoke.
...
When the number of parameters to a worklet hits 6+ like the EdgeGenerate
worklet did, the compile times when some of those parameters are dynamic array
handle is very bad.
For example when building the MarchingCubes filter for VTK integration the
EdgeGenerate worklet would take 800+ seconds to compile, but when we switch
it to have fewer arguments the compile time comes down to ~250sec.
2016-03-14 08:39:17 -04:00
Robert Maynard
8e4a47ef57
Update IsosurfaceUniformGrid to use the marching cubes filter.
...
This way we have an example of how to use the filter code.
2016-03-14 08:39:17 -04:00
Robert Maynard
d370155e74
MarchingCubes filter now generates coordinates when point merging is enabled.
2016-03-14 08:39:17 -04:00
Robert Maynard
c00fb53b54
Marching Cubes now generates vertices when merge duplicates is enabled.
2016-03-14 08:39:17 -04:00
Robert Maynard
f699c98602
Renamed the ``Convert
` method to
`ApplyPolicy
``
...
The original name was a really bad name, so thank to Ken for suggesting
a better name.
2016-03-14 08:39:17 -04:00
Robert Maynard
8e72ec8ea4
Switch filter::threshold over to have a lower and upper bounds.
2016-03-14 08:39:17 -04:00
Robert Maynard
bcee827097
First draft of vtkm::filter design.
2016-03-14 08:39:17 -04:00
Robert Maynard
531dececfd
Multiple changes to VertexClustering to make it more suitable for filter.
...
The original implementation wasn't flexible enough to handle the requirements
that filter requires ( mainly policy support ).
2016-03-14 08:39:17 -04:00
Robert Maynard
aaa10f0c50
Remove the ability to get bounds from Make3DExplicitDataSetCowNose.
...
This isn't needed now that vtkm::cont::Field can compute bounds.
2016-03-14 08:39:17 -04:00
Robert Maynard
4b7054f4da
Changes to computing bounds to allow custom types and storage.
2016-03-14 08:39:17 -04:00
Robert Maynard
52d8a4d9b7
Fix vtkm::cont::Field default constructor to have valid values.
2016-03-14 08:39:17 -04:00
Robert Maynard
5b6676d21f
Merge topic 'feature/atomics'
...
5ddade7a Adding some basic documentation on atomics.
e5c4aa3f Fixing cuda index error
00a7f6c1 Correcting function call
249cce35 Adding type restrictions to serial atomics
43131ee0 Adding comments about CAS
40b6db7e Inserted missing ,
3b46706e Adding compare and swap and removing unsigned atomics
12632de3 Casting Uint64 to long long
...
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !336
2016-03-11 13:49:38 -05:00
Robert Maynard
b8f28d6dee
Merge topic 'properly_specify_fermi_when_cuda_autodetect_fails'
...
19dc5672 Correct CUDA fallback to "fermi" when trying to do auto detection.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !353
2016-03-11 10:04:51 -05:00
Robert Maynard
ba202cc1c8
Merge topic 'suppress_thrust_warnings_on_windows'
...
55280637 Correct the VTKM_THIRDPARTY_PRE_INCLUDE/POST_INCLUDE for MSVC.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !354
2016-03-11 10:04:16 -05:00
Robert Maynard
55280637f8
Correct the VTKM_THIRDPARTY_PRE_INCLUDE/POST_INCLUDE for MSVC.
...
We now properly suppress a collection of warnings from thirdparty headers on
windows.
2016-03-11 09:59:49 -05:00
Robert Maynard
19dc5672bf
Correct CUDA fallback to "fermi" when trying to do auto detection.
...
The logic would properly fall to fermi, but not set the proper NVCC flags
to actually compile targeting the fermi compute architecture.
2016-03-10 16:28:54 -05:00
Robert Maynard
5df0cf42fe
Merge topic 'suppress_thrust_warnings_on_windows'
...
8c579b77 Setup VTKM_THIRDPARTY_PRE_INCLUDE/POST_INCLUDE for MSVC.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !352
2016-03-10 16:09:30 -05:00
Robert Maynard
8c579b7742
Setup VTKM_THIRDPARTY_PRE_INCLUDE/POST_INCLUDE for MSVC.
...
We now suppress a collection of warnings from thirdparty headers on windows.
2016-03-10 13:31:21 -05:00
Matt Larsen
5ddade7a44
Adding some basic documentation on atomics.
2016-03-09 14:29:59 -05:00
Robert Maynard
63ff43c613
Merge topic 'increase_timeout_on_cuda_worklet_tests'
...
559d2aab CUDA based worklets should now not timeout.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !350
2016-03-09 08:52:02 -05:00
Robert Maynard
559d2aab94
CUDA based worklets should now not timeout.
...
The first CUDA worklet test requires way more time because of the overhead to
allow the driver to convert the kernel code from virtual arch to actual arch.
2016-03-09 08:09:21 -05:00
Matt Larsen
e5c4aa3f78
Fixing cuda index error
2016-03-08 12:41:11 -08:00
Matt Larsen
00a7f6c14b
Correcting function call
2016-03-08 12:04:55 -08:00
Matt Larsen
249cce352b
Adding type restrictions to serial atomics
2016-03-08 10:39:23 -08:00
Matt Larsen
43131ee02b
Adding comments about CAS
2016-03-08 09:58:20 -08:00
Matt Larsen
40b6db7eee
Inserted missing ,
2016-03-08 09:51:50 -08:00
Matt Larsen
3b46706e1f
Adding compare and swap and removing unsigned atomics
2016-03-08 09:41:02 -08:00
Matt Larsen
12632de34b
Casting Uint64 to long long
2016-03-04 15:17:56 -08:00
Matt Larsen
ecc12dddb7
using reinterpret cast and removing warning from atomic array test
2016-03-04 14:46:45 -08:00
Matt Larsen
72f2549bb9
Removing shadow variable
2016-03-04 12:12:25 -08:00
Matt Larsen
f3c7f188ee
Fixing problem with function signatures matching long * to int *
2016-03-04 11:52:52 -08:00
Matt Larsen
733edc8325
changing MS method signatures to long instead of int
2016-03-04 11:13:53 -08:00