Commit Graph

331 Commits

Author SHA1 Message Date
Jeremy Meredith
39b1b9cc18 adding convenience methods and cleaning up explicit connectivity. 2015-05-19 14:30:41 -04:00
Jeremy Meredith
bd4bfb175a Merge branch 'datamodel-design' of public.kitware.com:vtkm into datamodel-design 2015-05-19 13:11:17 -04:00
Jeremy Meredith
4e67adca8c moving explicit data set creation to make test data set file. 2015-05-19 13:10:56 -04:00
Dave Pugmire
a8ff5af670 check for cell set. 2015-05-19 11:17:04 -04:00
Dave Pugmire
3a4966fef3 check assert for cell set. 2015-05-18 17:12:34 -04:00
Dave Pugmire
4dd186eda6 add worklet test for regular 2015-05-18 17:08:15 -04:00
Dave Pugmire
76a2a98ba1 rename a method 2015-05-18 16:24:46 -04:00
Dave Pugmire
9c0931f24f Create a class that generates small test datasets. Converted the unit tests to use this. 2015-05-18 13:17:03 -04:00
Dave Pugmire
1941c455f1 Add some more tests for regular data sets. 2015-05-18 11:04:15 -04:00
Dave Pugmire
97844f6ca2 added cell to node code. 2015-05-15 16:22:00 -04:00
Dave Pugmire
ee45766c01 Don't use Extents and just use an array of Id in regular connectivity/structure 2015-05-15 15:40:25 -04:00
Dave Pugmire
5ddc1230bd Make regular conn/struct cont and export. Update other files to reflect the changes. 2015-05-15 15:29:55 -04:00
Jeremy Meredith
6816ec4293 updating reg struct usage in cell set 2015-05-15 13:15:11 -04:00
Dave Pugmire
3343f92c11 re-do commmit. 2015-05-15 12:03:52 -04:00
Dave Pugmire
138807a312 Tweaks to RegularStructure and RegularConnectivity. Moved RegularStructure to a separate file. Added some more unit testing. 2015-05-15 12:00:27 -04:00
Jeremy Meredith
8124814a83 moving to purely compile time check with a compile time error for missing specialization. 2015-05-14 17:19:55 -04:00
Jeremy Meredith
8fab33a42b different approach for get indices. 2015-05-14 16:26:59 -04:00
Jeremy Meredith
e65b8ac464 adding topology template parameters. 2015-05-14 16:18:30 -04:00
Dave Pugmire
83753a8ac0 fix typo. 2015-05-14 16:10:17 -04:00
Dave Pugmire
5392207735 Merge branch 'datamodel-design' of public.kitware.com:vtkm into datamodel-design 2015-05-14 16:08:43 -04:00
Dave Pugmire
ad93bbb353 1,2,3D fixes 2015-05-14 16:08:28 -04:00
Jeremy Meredith
9768070aed fixing problems with cuda build. 2015-05-14 15:59:37 -04:00
Dave Pugmire
312f026e4c Merge branch 'datamodel-design' of public.kitware.com:vtkm into datamodel-design 2015-05-14 12:23:33 -04:00
Dave Pugmire
f35f0e0e56 Add regularStructure and modify regularconnnectivity 2015-05-14 12:22:39 -04:00
Robert Maynard
4086119f0e Correct propagation of const types where they don't make sense. 2015-05-13 13:25:55 -04:00
Robert Maynard
c56b9602f5 Add some whitespace to make the class easier to read. 2015-05-12 16:00:40 -04:00
Robert Maynard
bcda989641 Correct issues with using function level statics.
You can use function level statics, but instead you must use class level
statics, this is due to how nvcc treats method statics as being shared
across all threads in a warp.
2015-05-12 15:58:53 -04:00
Robert Maynard
269ac3a8af Add in the MapTopologyExplicit worklet test.
Currently only works on serial backend.
2015-05-12 15:42:48 -04:00
Robert Maynard
eb19501772 Actually verify the contents of the datasets. 2015-05-12 14:59:18 -04:00
Robert Maynard
7c95b314b9 Allow user to get number of cellsets and number of fields. 2015-05-12 14:57:32 -04:00
Robert Maynard
026018a82a Make CellSetStructured inherit from CellSet. 2015-05-12 14:57:18 -04:00
Robert Maynard
cc1f4e37d2 Split the Explicit and Regular grid cont tests into two separate tests. 2015-05-12 14:42:43 -04:00
Jeremy Meredith
9c4bd54424 getting exec version of connectivity working 2015-05-12 12:50:30 -04:00
Dave Pugmire
959bd0a9a8 add explicit connectivity code for exec side. 2015-05-12 12:13:43 -04:00
Jeremy Meredith
9ff5832909 adding wrapper for exec connectivity. 2015-05-12 09:39:00 -04:00
Jeremy Meredith
8a382f138a fleshing out cell set and data set more. 2015-05-11 16:54:16 -04:00
Jeremy Meredith
ed5ddc849e completing field. 2015-05-11 16:15:58 -04:00
Jeremy Meredith
b2fdff2873 Merge branch 'master' into datamodel-design 2015-05-11 15:14:08 -04:00
Robert Maynard
59618b3a50 Merge branch 'sort_by_key' 2015-05-11 08:04:09 -04:00
Robert Maynard
ca0d1ade55 Merge branch 'test_permutation_as_output' 2015-05-08 15:32:37 -04:00
Robert Maynard
1bafa94194 Verify the permutation handle can be used as output on all devices 2015-05-08 15:32:06 -04:00
Kenneth Moreland
9db8483b5a Merge branch 'msvc-warnings' 2015-05-08 10:55:24 -06:00
Kenneth Moreland
dd897c0565 Remove template parameter for IncrementBy2
THe IncrementBy2 test type previously allowed any subtype including
floating point numbers. The meaning of this is actually a little unclear
and the feature was causing implicit type conversion warnings that were
hard to template out. The utility of of templating this class is dubious
in the first place, so class is now a fixed type.

I'm a little unsure whether we should keep this test class at all. It's
math operations are ad hoc and it could be difficult to determine if a
problem is caused by an actual problem or just bad math operators.
2015-05-08 10:53:28 -06:00
Kenneth Moreland
209053b79e Fix issues with implicitly converting ints to floats
MSVC complains that converting a 32-bit int to a 32-bit float could
cause loss of precision.
2015-05-08 10:33:59 -06:00
Kenneth Moreland
b2e39ad895 Merge branch 'type-conversions' 2015-05-07 16:37:17 -06:00
Kenneth Moreland
66aa10aab7 Fix issues with warnings about data loss from type conversion
Fix compile warnings that come up with the flags

  -Wconversion -Wno-sign-conversion

This catches several instances (mostly in the testing framework) where
types are implicitly converted. I expect these changes to fix some of
the warnings we are seeing in MSVC.

I was going to add these flags to the list of extra warning flags, but
unfortunately the Thrust library has several warnings of these types,
and I don't know a good way to turn on the warnings for our code but
turn them off for Thrust.
2015-05-07 16:34:06 -06:00
Kenneth Moreland
29319d1c3d Merge branch 'test-array-handle-permutation-error' 2015-05-07 13:22:29 -06:00
Kenneth Moreland
229579c337 Compare with tolerance in UnitTestArrayHandlePermutation
The UnitTestArrayHandlePermutation test was failing when compiled with
icc. I believe the issue is that the icc optimization takes some
liberties when computing literal floating point values versus computing
them at run time that makes the two slightly different. I changed all
the applicable comparisons in this test from using the == operator to
using the test_equal function, which adds a tolerance to the comparison.
I expect this to fix the test failure.
2015-05-07 13:22:10 -06:00
Kenneth Moreland
1f7ed4311b Merge branch 'cuda-errors' 2015-05-07 13:14:46 -06:00
Kenneth Moreland
c9f6628c5b Make VTKM_ASSERT_CONT gracefully ignore CUDA devices
There are often instances where one wants to make an assert check in a
method that can run in either the control or execution environment. This
is rather difficult in general for the execution environment, but with
this change you can place the VTKM_ASSERT_CONT macro in such a method,
and it should compile even under CUDA. It works by removing the macro if
compiling for a CUDA device.
2015-05-07 13:13:50 -06:00