David C. Lonie
0564af0a5f
Fix Clipping example compilation.
...
Some functions were refactored and broke this example code.
2017-06-28 12:20:09 -04:00
Robert Maynard
5dd346007b
Respect VTK-m convention of parameters all or nothing on a line
...
clang-format BinPack settings have been disabled to make sure that the
VTK-m style guideline is obeyed.
2017-05-26 13:53:28 -04:00
Kitware Robot
4ade5f5770
clang-format: apply to the entire tree
2017-05-25 07:51:37 -04:00
Kitware Robot
efbde1d54b
clang-format: sort include directives
2017-05-18 12:59:33 -04:00
Robert Maynard
57ab48fe8e
Replace occurrences of NULL with nullptr.
2017-05-04 10:50:57 -04:00
Li-Ta Lo
7f4d5de2b2
remove unused code in CMakeList.txt
2017-03-28 09:05:08 -06:00
Li-Ta Lo
fb8a8369ca
update examples/tetrhedra to use filters instead of worklets
2017-03-27 17:38:03 -06:00
Li-Ta Lo
8d5ce89458
Merge branch 'tri-tet-fix' of gitlab.kitware.com:Fasel/vtk-m into tri-tet-fix
2017-03-27 16:47:44 -06:00
Patricia Kroll Fasel - 090207
3a1a6aece3
Added mapping of cell data onto output dataset
2017-03-23 17:14:39 -06:00
Robert Maynard
2481dd6248
Merge topic 'multi_iso_value_contour'
...
5566afdd Allow MarchingCubes to handle multiple iso-contour values.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !730
2017-03-17 14:16:17 -04:00
Li-Ta Lo
5a50d60573
Merge topic 'unified-memory'
...
2bdc0be5 add cuda calls for memory advise as per Tom Fogel
6ce8a013 Merge branch 'master' into unified-memory
b470175f new unified memory effort with the new Thrust device
835073da clean up with custom allocator
dfae8f5e Fixing merge issue with contour_tree
82c40a63 First support for unified memory
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !729
2017-03-16 15:14:55 -04:00
Robert Maynard
5566afdd8d
Allow MarchingCubes to handle multiple iso-contour values.
2017-03-16 11:49:20 -04:00
Robert Maynard
476dc1e56e
remove unneeded dependency from contour_tree example.
2017-03-14 09:03:58 -04:00
Li-Ta Lo - 194699
b470175f98
new unified memory effort with the new Thrust device
2017-03-09 14:51:45 -07:00
Tom Fogal
55be1fcbb2
examples: ensure cleanup occurs before main ends.
...
Else the implicit context in the CUDA driver may destroy itself
before the destructors for globals/statics run, and we could try
to e.g. cudaFree without a valid context.
2017-02-15 10:32:20 -08:00
Robert Maynard
407f9822c2
Merge branch 'use_usage_requirements' into 'master'
...
Use usage requirements
See merge request !673
2017-01-27 17:36:16 -05:00
Robert Maynard
e415f55b6f
Update the examples to work with the new usage requirements
2017-01-27 10:03:53 -05:00
Robert Maynard
f7e651fa10
When building the multi_backend code suppress warnings from thrust.
2017-01-26 14:41:30 -05:00
Kenneth Moreland
5fed7dda7f
Fix compile issue on windows
...
A variable length array declaration was used. That is not part of the
official C++11 standard and is not supported on all compilers.
2017-01-19 14:21:47 -07:00
Christopher Sewell
dfae8f5e3e
Fixing merge issue with contour_tree
2017-01-18 11:47:52 -07:00
Christopher Sewell
82c40a6374
First support for unified memory
2017-01-18 11:43:49 -07:00
Robert Maynard
4a56e9f129
Merge branch 'contour-tree' into 'master'
...
Contour tree
See merge request !658
2017-01-17 17:00:54 -05:00
Patricia Kroll Fasel - 090207
0950af7aeb
Compiler warnings
2017-01-12 14:35:34 -07:00
Kenneth Moreland
713cf4228a
Make it not possible to create a cell set without specifying num points
...
The CellSetExplicit and CellSetSingleType classes have an ivar that
marks the number of points. There were several instances of code
creating cell sets without specifying the number of points. This can be
very bad if subsequent code needs that information.
2017-01-12 13:02:10 -07:00
Patricia Kroll Fasel - 090207
bed40256c8
Fix compiler warnings. Fix case table operation to comply.
2017-01-11 14:02:32 -07:00
Patricia Kroll Fasel - 090207
9548441565
Fix compiler warnings and test errors before merge.
2017-01-10 16:52:59 -07:00
Patricia Kroll Fasel - 090207
851dfc094b
Correct the example compilation for TBB.
2017-01-10 12:33:45 -07:00
Patricia Kroll Fasel - 090207
f6140c39e2
Add LANL/LLC copyright notification.
2017-01-09 14:53:59 -07:00
Patricia Kroll Fasel - 090207
9412584bf2
First implementation of contour tree 2D and 3D, serial and cuda.
2017-01-09 13:54:47 -07:00
Kenneth Moreland
fdaccc22db
Remove exports for header-only functions/methods
...
Change the VTKM_CONT_EXPORT to VTKM_CONT. (Likewise for EXEC and
EXEC_CONT.) Remove the inline from these macros so that they can be
applied to everything, including implementations in a library.
Because inline is not declared in these modifies, you have to add the
keyword to functions and methods where the implementation is not inlined
in the class.
2016-11-15 22:22:13 -07:00
Dave Pugmire
4edb91ad96
Get rid of warnings in examples.
2016-11-04 16:29:07 -04:00
Robert Maynard
5ec273aade
Remove all occurrences of boost::lexical_cast from vtk-m.
...
Replaced with the new std::stof/stoi functions.
2016-10-20 16:55:15 -04:00
Robert Maynard
37efba159c
CellSetSingleType now can be constructed with proper number of points
...
This is important so that when we execute a Cell->Point worklet we
don't have to compute the number of points from the connectivity array.
2016-10-20 08:33:16 -04:00
Mark Kim
464da87d5a
Merge branch 'master' of gitlab.kitware.com:vtk/vtk-m
2016-10-12 14:40:32 -04:00
Kenneth Moreland
fbb061d661
Fix some minor issues with move to glut CMake component
...
I was using GLUT_LIBRARY instead of GLUT_LIBRARIES, and there was an
extra use of GLUT_INCLUDE_DIR that should not have been there.
2016-10-04 10:48:19 -06:00
Kenneth Moreland
d1d7ac54a0
Add GLUT component to find_package(VTKm)
...
This makes it easier to use VTK-m with GLUT. It also makes it more
consistent with GLFW, GLEW, and other support libraries.
2016-10-03 17:34:13 -06:00
Robert Maynard
0f58d6fc54
Add vtkm/cont/serial directory for the serial backend.
2016-09-28 14:22:53 -04:00
Mark Kim
a41e0f28df
Merge branch 'master' of gitlab.kitware.com:vtk/vtk-m
2016-09-26 16:12:19 -04:00
Mark Kim
5827473abb
Merge branch 'master' of gitlab.kitware.com:dpugmire/vtk-m
2016-09-23 09:46:48 -04:00
Kenneth Moreland
c1de0e0746
Change VTKm_BUILD_RENDERING to VTKm_ENABLE_RENDERING
...
This makes the name more consistent with the names of the other VTK-m
CMake options.
Also changed the default to be ON. I do not see a big downside to
compiling the rendering library most of the time.
2016-09-21 14:38:00 -06:00
Mark Kim
e59fc37f90
Merge topic 'master'
...
7cfc1199 Demo.cxx: MapperRayTracer is no longer a templated class. UnitTestMapperEGL.cxx: MapperGL is no longer a templated class. UnitTestMapperGLFW.cxx: strmp needs cstring rendering/CMakeLists.txt: need to append egl_sources to sources.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !552
2016-09-16 09:02:06 -04:00
Mark Kim
7cfc119999
Demo.cxx: MapperRayTracer is no longer a templated class.
...
UnitTestMapperEGL.cxx: MapperGL is no longer a templated class.
UnitTestMapperGLFW.cxx: strmp needs cstring
rendering/CMakeLists.txt: need to append egl_sources to sources.
2016-09-14 15:58:45 -04:00
Robert Maynard
4521403fd2
Examples now correctly request the optional CUDA component
2016-09-14 15:29:04 -04:00
Mark Kim
c216c98c57
Merge branch 'umaster'
2016-09-14 10:39:52 -04:00
Mark Kim
fbaee11da9
Demo.cxx: MapperRayTracer is no longer a templated class.
...
UnitTestMapperEGL.cxx: MapperGL is no longer a templated class.
UnitTestMapperGLFW.cxx: strmp needs cstring
rendering/CMakeLists.txt: need to append egl_sources to sources.
2016-09-14 10:33:51 -04:00
Mark Kim
f293c5a0bc
Merge branch 'glut-unittest'
2016-09-14 09:19:57 -04:00
Kenneth Moreland
e6686e8be7
Merge branch 'master' into rendering-library
2016-09-09 13:59:15 -06:00
Robert Maynard
08eb3a957b
Correct a bad target_compile_definitions line in examples/demo
2016-09-09 15:19:17 -04:00
Kenneth Moreland
22c6741152
Add View to rendering library
...
To get rid of some templates, I added the ability to create new
instances of mappers and canvases without knowing their type.
2016-09-07 16:48:04 -06:00
Kenneth Moreland
668f93a66b
Move Mappers to rendering library
...
Also changed the mappers to not be templated on the device adapter.
Instead, use TryExecute to determine the device adapter at runtime.
2016-09-07 16:47:52 -06:00