Commit Graph

7063 Commits

Author SHA1 Message Date
Robert Maynard
576bd6bbea Merge topic 'adding-link-tutorial'
3cf1d9dbe add link to tutorial at the wiki

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1960
2020-02-19 10:57:22 -05:00
Robert Maynard
000e1781d6 Merge topic 'add_recommend_review_hints'
7a6430e3d Add CODEOWNERS to vtk-m to improve merge request reviewer suggestions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1957
2020-02-17 14:38:57 -05:00
Kenneth Moreland
90890ae802 Merge topic 'fix-warning'
ef7b89920 Fix type conversion warning in ContourTreeApp example

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1956
2020-02-17 10:22:22 -05:00
Vicente Adolfo Bolea Sanchez
3cf1d9dbe0 add link to tutorial at the wiki 2020-02-17 10:17:27 -05:00
Kenneth Moreland
ef7b899208 Fix type conversion warning in ContourTreeApp example 2020-02-13 08:26:59 -07:00
Matt Larsen
2123a56ab3 Merge topic 'change_lagrangian_output_structuredgrid'
e68b283e8 Delete commented, unused class variables
4d358e5b2 Remove coordinates from class member variable list
e6647efaf Fix condition to populate coordinate variables
2e2a847f5 Change Lagrangian output format to structured grid

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1945
2020-02-12 16:20:19 -05:00
Robert Maynard
7a6430e3d8 Add CODEOWNERS to vtk-m to improve merge request reviewer suggestions 2020-02-11 12:53:07 -05:00
Kenneth Moreland
37128fc151 Merge topic 'find-benchmark'
7e49c1131 Mark the find_package(benchmark) with required

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1942
2020-02-11 12:17:11 -05:00
Kenneth Moreland
3d421ff589 Merge topic 'deprecate-old-topology-worklets'
f7709a8db Mark deprecated superclasses of WorkletMapTopology with VTKM_DEPRECATED

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1955
2020-02-11 12:16:15 -05:00
Robert Maynard
6a62b7f2e4 Merge topic '450_openmp_scaling'
1f61c500e Remove non-atomic ops from BitField unit test.
5565848d9 Use a dynamic strategy for openmp 1D scheduling.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1925
2020-02-11 12:12:47 -05:00
Kenneth Moreland
f7709a8dba Mark deprecated superclasses of WorkletMapTopology with VTKM_DEPRECATED 2020-02-06 20:30:21 -06:00
Robert Maynard
124fb23c50 Merge topic 'allow_for_easier_scheduling_range_overloads'
36161b42c Renamed to SchedulingRange to follow VTK-m naming convention
40c0c0fef Allow for easier overloads of scheduling_range

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1952
2020-01-29 15:18:56 -05:00
Robert Maynard
36161b42c7 Renamed to SchedulingRange to follow VTK-m naming convention 2020-01-29 10:39:41 -05:00
Sudhanshu Sane
e68b283e8b Delete commented, unused class variables 2020-01-28 10:27:58 -08:00
Robert Maynard
40c0c0fefd Allow for easier overloads of scheduling_range
This is needed to support custom types that need 3D scheduling
or to call custom methods to get the 1D scheduling size
2020-01-28 11:17:42 -05:00
Sudhanshu Sane
4d358e5b29 Remove coordinates from class member variable list 2020-01-28 02:05:10 -08:00
Sudhanshu Sane
e6647efaf0 Fix condition to populate coordinate variables 2020-01-27 21:12:23 -08:00
Kenneth Moreland
ec010d2e8d Merge topic 'no-deprecated-nvcc-vs'
fb01d38a0 Disable deprecated attribute when using nvcc under VS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1949
2020-01-22 17:49:08 -05:00
Robert Maynard
f2aa6ad5be Merge topic 'gcc_61_ice_openmp_and_optimizations'
dc86ac207 Avoid a GCC 6.1 compiler regression that occurs when openmp is enabled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1950
2020-01-22 14:40:00 -05:00
Robert Maynard
dc86ac2077 Avoid a GCC 6.1 compiler regression that occurs when openmp is enabled 2020-01-22 11:06:54 -05:00
Kenneth Moreland
fb01d38a09 Disable deprecated attribute when using nvcc under VS
The nvcc compiler under visual studio seems to give the error `attribute
does not apply to any entity` when you try to use the `[[deprecated]]`
attribute. So disable for this compiler configuration.
2020-01-22 07:52:59 -07:00
Robert Maynard
579a4bab2f Merge topic 'correct_vtkm_cuda_cellset_host_device_warnings'
3e99b1776 Correct host/device warnings in CellSetPermutation found by VTK

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1947
2020-01-21 16:41:17 -05:00
Robert Maynard
3e99b17762 Correct host/device warnings in CellSetPermutation found by VTK 2020-01-21 15:09:48 -05:00
Robert Maynard
9787be3b84 Merge topic 'correct_unused_variable_warning_color_table'
3f02558fc correct warnings in color table

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1946
2020-01-20 10:37:29 -05:00
Sudhanshu Sane
2e2a847f55 Change Lagrangian output format to structured grid 2020-01-16 23:54:47 -08:00
Robert Maynard
3f02558fc2 correct warnings in color table 2020-01-16 17:33:22 -05:00
Robert Maynard
f395e084d8 Merge topic 'correct_warnings_from_osx_dashboard'
b9516c116 Correct CellSetStructured compile failures
00235874d Suppress more warning types from thirdparty includes
a52af2d13 Correct double to float warning in CellAspectFrobeniusMetric
cf5ebfb16 Suppress warning about extension use, since all compilers support it
27739660b Add missing constructors/assignment operators
123f8b01a Mark virtual destructors as override where applicable
54118dfca Use noexcept instead of throw() as it was deprecated in c++11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1943
2020-01-15 15:27:18 -05:00
Robert Maynard
b9516c116e Correct CellSetStructured compile failures 2020-01-15 08:24:35 -05:00
Robert Maynard
00235874d7 Suppress more warning types from thirdparty includes 2020-01-14 11:18:22 -05:00
Robert Maynard
a52af2d132 Correct double to float warning in CellAspectFrobeniusMetric 2020-01-14 11:18:22 -05:00
Robert Maynard
cf5ebfb16e Suppress warning about extension use, since all compilers support it 2020-01-14 11:18:22 -05:00
Robert Maynard
27739660b9 Add missing constructors/assignment operators
Having a custom assignment operator means that the compiler
isn't required to generate the implicit copy constructor.
This makes sure they are constructed.
2020-01-14 11:18:22 -05:00
Robert Maynard
123f8b01aa Mark virtual destructors as override where applicable 2020-01-13 15:54:33 -05:00
Robert Maynard
54118dfca0 Use noexcept instead of throw() as it was deprecated in c++11 2020-01-13 10:05:35 -05:00
Kenneth Moreland
347a769953 Merge topic 'test-long-list-index-of'
aa59224f2 More testing of long lists

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1941
2020-01-09 14:52:44 -05:00
Kenneth Moreland
7e49c11313 Mark the find_package(benchmark) with required
Add the REQUIRED flag to the find_package command to find the Google
benchmark package. Without that flag, the find_package command will
happily pass if the benchmarks are not found.

However, if benchmarks is not found, then the CMake configure will then
fail because the benchmark::benchmark library is not defined. That is a
confusing error to get. Since benchmark is not a typical thing installed
on a system, this can be problematic.
2020-01-09 12:28:48 -07:00
Kenneth Moreland
aa59224f28 More testing of long lists
We encountered some issues with `ListIndexOf` for longer lists with
repeated elements. Add some tests for that.
2020-01-09 10:33:49 -07:00
Kenneth Moreland
a5c686214b Merge topic 'no-std-conditional-in-list-operations'
b534bdb1b Remove std::conditional from List.h

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1940
2020-01-09 12:31:26 -05:00
Kenneth Moreland
b534bdb1ba Remove std::conditional from List.h
The `std::conditional` utility is very convenient, but it unfortunately
means that the compiler has to evaluate both the true and false types
even though one is guaranteed to be thrown out. This is problematic
because it requires the compiler to do a lot more work then necessary.
It is especially dumb when introducing the conditionals to reduce the
number of cases being evaluated, as was much of the case in List.h.
2020-01-09 09:11:26 -07:00
Allison Vacanti
73e9430a85 Merge topic 'google_benchmark'
46b7155bd Add 64-bit CUDA atomic store.
539f6e5ad Port benchmarking framework to Google Benchmark.
39d981bcf Shorten names returned by testing's TypeName utility.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1936
2020-01-08 10:59:42 -05:00
Allison Vacanti
46b7155bdb Add 64-bit CUDA atomic store. 2020-01-08 10:58:51 -05:00
Allison Vacanti
539f6e5ad7 Port benchmarking framework to Google Benchmark. 2020-01-08 10:58:51 -05:00
Allison Vacanti
39d981bcf9 Shorten names returned by testing's TypeName utility.
Eg:

```
vtkm::Float32                                       -> F32
vtkm::Int64                                         -> I64
vtkm::Vec< vtkm::Float32, 3 >                       -> Vec3f_32
vtkm::Vec< vtkm::Pair< vtkm::Int32, vtkm::Float64 > -> Vec<Pair<I32, F64>>
```

This makes the benchmark names a lot shorter to keep rows tabular
results on
a single line.
2020-01-08 10:58:51 -05:00
Kenneth Moreland
ba90057ef3 Merge topic 'shorter-fancy-array-handle-classnames'
60c57303d Fix name clash of template parameter and field
4a52a3f7a Shorter StorageTag for ArrayHandleZip
4a626b2e9 Shorter storage tag for ArrayHandleView
4c8c28d1f Shorter storage tag for ArrayHandleReverse
bfd21dfae Declare StorageTags with VTKM_ALWAYS_EXPORT
1ec716e5d Shorten storage tag for ArrayHandlePermutation
ca0ad1dc2 Shorten storage tag for ArrayHandleIndex
7bd5802dd Shorter storage tag for ArrayHandleGroupVecVariable
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1937
2020-01-07 09:05:52 -05:00
Kenneth Moreland
60c57303da Fix name clash of template parameter and field 2020-01-07 07:01:35 -07:00
Kenneth Moreland
4a52a3f7a9 Shorter StorageTag for ArrayHandleZip 2020-01-07 07:01:34 -07:00
Kenneth Moreland
4a626b2e93 Shorter storage tag for ArrayHandleView 2020-01-07 07:01:13 -07:00
Kenneth Moreland
4c8c28d1f1 Shorter storage tag for ArrayHandleReverse
Also discovered that many C++ compilers have trouble giving warnings
for partial specialization of classes marked as deprecated. Fix
the problem by instead deprecating the items in the class.
2020-01-07 07:01:12 -07:00
Kenneth Moreland
bfd21dfae2 Declare StorageTags with VTKM_ALWAYS_EXPORT
This modifier is required on OSX for dynamic_cast to work properly
across libraries.
2020-01-07 07:01:11 -07:00
Kenneth Moreland
1ec716e5d2 Shorten storage tag for ArrayHandlePermutation 2020-01-07 07:01:10 -07:00