Commit Graph

1979 Commits

Author SHA1 Message Date
T.J. Corona
ce1eeca93b Merge topic 'copyright-check'
4f49a840 Update VTKmCheckCopyright.cmake to ignore build files.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !486
2016-08-02 14:27:43 -04:00
T.J. Corona
e07e4aeda7 Merge topic 'expose-cellarray-api'
8ad8eeda In DynamicCellSet, expose CellSet API.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !488
2016-08-02 14:25:15 -04:00
T.J. Corona
4f49a8407b Update VTKmCheckCopyright.cmake to ignore build files. 2016-08-02 13:50:33 -04:00
Robert Maynard
f527b8a0b2 Merge topic 'collapse-exec-cont-portals'
2e33f883 Collapse exec and cont portals into one class.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !485
2016-08-02 13:42:57 -04:00
T.J. Corona
8ad8eeda77 In DynamicCellSet, expose CellSet API.
Also changes GetCellSet() to CastToBase().
2016-08-02 13:39:25 -04:00
T.J. Corona
2e33f8830f Collapse exec and cont portals into one class. 2016-08-02 11:26:29 -04:00
Kenneth Moreland
8f406cf460 Merge branch 'fix-infinite-recursion' into 'master'
Fix an infinite recursion where the wrong overload was called

The intension was that if Camera::Zoom was called with a Float64, it
would call the Float32 version. However, I made a type where it called
itself. The latest version of XCode called me out on this infinite
recursion.

I think this is the equivalent of the compiler calling me a dumb-ass.

See merge request !483
2016-07-31 18:09:41 -04:00
Kenneth Moreland
8863769ea7 Fix an infinite recursion where the wrong overload was called
The intension was that if Camera::Zoom was called with a Float64, it
would call the Float32 version. However, I made a type where it called
itself. The latest version of XCode called me out on this infinite
recursion.

I think this is the equivalent of the compiler calling me a dumb-ass.
2016-07-31 11:47:30 -06:00
Matt Larsen
d39ac17951 Merge topic 'fix/Triangulator'
a4012c16 Rmoving throw from worklet that prevents rendering from compiling with CUDA

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Acked-by: Matt Larsen <mlarsen@cs.uoregon.edu>
Merge-request: !481
2016-07-29 17:21:42 -04:00
Robert Maynard
1efbbdc19a Merge topic 'example_dispatcher_test_works_again'
17966256 Cleanup the multiple dynamic array handle dispatch example.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !480
2016-07-29 11:32:31 -04:00
Matt Larsen
a4012c1667 Rmoving throw from worklet that prevents rendering from compiling with CUDA 2016-07-29 07:50:14 -07:00
Robert Maynard
1796625616 Cleanup the multiple dynamic array handle dispatch example. 2016-07-29 09:48:13 -04:00
Robert Maynard
c739e02374 Merge topic 'vtkm_find_package_support_QUIET'
063b349a Setup the examples to find vtkm components quietly.
e52f7628 VTKm config module now properly support the QUIET flag.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !479
2016-07-28 16:35:44 -04:00
Robert Maynard
063a4248b3 Merge topic 'unify_contour'
73440ccb vtkm::filter::MarchingCubes now uses vtkm::worklet
33d7ad8f Unify the contour MarchingCubes implementations.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !476
2016-07-28 11:45:38 -04:00
Robert Maynard
063b349a20 Setup the examples to find vtkm components quietly. 2016-07-28 10:47:43 -04:00
Robert Maynard
e52f7628a7 VTKm config module now properly support the QUIET flag.
The QUIET flag will also be properly propagated to all modules
that VTKm finds.
2016-07-28 10:46:59 -04:00
Robert Maynard
73440ccb4e vtkm::filter::MarchingCubes now uses vtkm::worklet
Instead of having two separate implementations of MarchingCubes, we have
a single implementation in worklet, and filter uses that.

That does mean that the version in worklet has been updated to support
merging of duplicate point coordinates.
2016-07-28 08:52:34 -04:00
Robert Maynard
5e1b2e966d Merge topic 'install_missing_config_file'
037ebc4a Install the VTKmConfig.cmake file.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !477
2016-07-25 11:10:36 -04:00
Robert Maynard
037ebc4a9a Install the VTKmConfig.cmake file. 2016-07-25 10:31:08 -04:00
Robert Maynard
16cabc05b1 Merge topic 'status-on-find-package'
f90b42ac Add status messages when using find_package(VTKm)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !471
2016-07-25 10:13:02 -04:00
Robert Maynard
44afc5e878 Merge topic 'more_suppress_of_cuda_warnings'
45ada6b5 Rework ArrayHandleCuda to make it stop generate warnings
4ca6ce2a nvcc doesn't have troubles with boost shared_ptr optimizations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !473
2016-07-20 14:46:15 -04:00
Robert Maynard
45ada6b55a Rework ArrayHandleCuda to make it stop generate warnings 2016-07-20 12:41:13 -04:00
Robert Maynard
33d7ad8f86 Unify the contour MarchingCubes implementations. 2016-07-20 12:40:03 -04:00
Robert Maynard
4ca6ce2ad6 nvcc doesn't have troubles with boost shared_ptr optimizations 2016-07-19 13:26:23 -04:00
Robert Maynard
f96991b63d Merge topic 'remove_result_unused_warnings'
aa01784a Remove unused result warnings from StreamLineUniformGrid example.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !474
2016-07-15 15:31:50 -04:00
Robert Maynard
aa01784a06 Remove unused result warnings from StreamLineUniformGrid example. 2016-07-15 11:40:52 -04:00
Robert Maynard
94c03a72ad Merge topic 'more_suppress_of_host_device_warnings'
76cd2ac4 More corrections needed to suppress false positive host / device warnings.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !469
2016-07-05 08:43:06 -04:00
Kenneth Moreland
f90b42ac84 Add status messages when using find_package(VTKm)
When finding the VTKm package, it is important to load components that
support the devices you want to use. However, there is no indication of
what does and does not get loaded. In some circumstances, it simply says
that VTKm_FOUND is not true but not why. Add some status messages of
whether each component gets loaded or not.
2016-06-30 15:25:26 -06:00
Robert Maynard
76cd2ac4da More corrections needed to suppress false positive host / device warnings. 2016-06-30 16:04:37 -04:00
Kenneth Moreland
94c5b29fdf Merge branch 'document-vtkm-config' into 'master'
Add extra documentation to VTKmConfig.cmake

Add a note about the VTKm_COMPILE_OPTIONS. Also make an easy to read
list of available components.

See merge request !468
2016-06-29 18:56:19 -04:00
Kenneth Moreland
d10f40dbaa Add extra documentation to VTKmConfig.cmake
Add a note about the VTKm_COMPILE_OPTIONS. Also make an easy to read
list of available components.
2016-06-29 13:19:42 -06:00
Kenneth Moreland
1f0b37fc03 Merge branch 'dashboard-win-cuda-issues' into 'master'
Re-disable warnings on CUDA builds for MSVC

In an earlier commit, we took out the "-w" flag for CUDA builds, which
disables all compiler warnings. The original reason for disabling
warnings was an errant warning about unused functions. It was taken out
because the visual studio compiler complains when this flag overrides
another warning flag (such as /W3).

Although the visual studio compiler was not complaining about unused
functions, we were getting lots of other warnings. These warnings did
not seem to actually come from the visual studio compiler. They probably
come from whatever CUDA uses for a device compiler. But it is unclear
how to specifically target these warnings.

So, the easiest solution is to add the "-w" flag back. To get around the
other warning, we now (hopefully temporarily) remove warning flags from
CMAKE_CXX_FLAGS to prevent the conflicting flags.


See merge request !467
2016-06-28 20:47:55 -04:00
Kenneth Moreland
c5e849981f Re-disable warnings on CUDA builds for MSVC
In an earlier commit, we took out the "-w" flag for CUDA builds, which
disables all compiler warnings. The original reason for disabling
warnings was an errant warning about unused functions. It was taken out
because the visual studio compiler complains when this flag overrides
another warning flag (such as /W3).

Although the visual studio compiler was not complaining about unused
functions, we were getting lots of other warnings. These warnings did
not seem to actually come from the visual studio compiler. They probably
come from whatever CUDA uses for a device compiler. But it is unclear
how to specifically target these warnings.

So, the easiest solution is to add the "-w" flag back. To get around the
other warning, we now (hopefully temporarily) remove warning flags from
CMAKE_CXX_FLAGS to prevent the conflicting flags.
2016-06-28 17:26:09 -06:00
Kenneth Moreland
2f5902069a Merge branch 'cuda-fixes' into 'master'
Various CUDA fixes encountered with MSVC



See merge request !466
2016-06-28 16:01:45 -04:00
Kenneth Moreland
6dbff1b778 Fix template issue with IteratorFromArrayPortal
I don't know why, but under some circumstances when compiling with CUDA
and Visual Studio, the compiler was giving syntax errors when the
IteratorFromArrayPortal was using the typename keyword to reference a
type in its superclass. Get around the problem by looking directly in
the superclass.
2016-06-27 14:30:02 -06:00
Kenneth Moreland
d7ed37cd1e Fix incorrect export macro in FieldStatistics worklet 2016-06-27 13:39:03 -06:00
Kenneth Moreland
acf28962d6 Make sure Configure.h included with Assume.h
The VTKM_ASSUME macro uses some of the definitions defined in
Configure.h, but it never included that file. So unless that file
happened to be included before Assume.h, VTKM_ASSUME could be declared
incorrectly.

Actually added the include to Assert.h, which Assume.h includes.
2016-06-27 13:26:39 -06:00
Kenneth Moreland
eb8ca27932 VTKM_SUPPRESS_EXEC_WARNINGS was in the wrong place
The VTKM_SUPPRESS_EXEC_WARNINGS should go before the template keyword,
but on a couple of methods in FunctionInterfaceDetailPre.h.in it was
after the template keyword.
2016-06-27 13:08:35 -06:00
Kenneth Moreland
cadaf0ba7c Merge branch 'cuda-win-fixes' into 'master'
CUDA win fixes

Multiple fixes centered around making sure build work
with CUDA on windows builds.

See merge request !465
2016-06-27 12:10:50 -04:00
Kenneth Moreland
404a007eec Fix typo that was causing a CMake warning
There was missing whitespace when setting a variable.
2016-06-27 08:30:03 -06:00
Kenneth Moreland
4c272b5b43 Remove thrust warnings about type conversion
Add pragmas to disable warnings 4244 and 4800 on Visual Studio when
compiling third party libraries. This gets around some warnings inside
the thrust library.
2016-06-27 07:50:17 -06:00
Kenneth Moreland
51a35cb4fe Fix warnings about type conversions 2016-06-27 07:50:15 -06:00
Kenneth Moreland
fd29c81bde Fix warnings about redefined macros
The build automatically sets some macros when building CUDA files. Some
of the CUDA sources were setting the same macros, which was causing
warnings. Change the code to be more careful about setting preprocessor
macros.
2016-06-27 07:50:13 -06:00
Kenneth Moreland
ca0bafa479 Fix issue with native CUDA hardware detection
To detect what CUDA hardware is native, a simple CUDA program is
compiled. However, CMake was not necessarily pointing to the correct
source file, so the compile was failing.

This change makes sure that VTKm_CMAKE_MODULE_PATH is properly set and
uses that variable to find the source file.
2016-06-27 07:50:10 -06:00
Kenneth Moreland
eb41c6d5bd Disable -w flag for CUDA on Visual Studio
Because the CUDA builds were experiencing some warnings about unused
functions, a -w flag was added to our nvcc flags. This effectively
turned off the warning (which was part of -Wall). But on Visual Studio
this added flag was causing a warning of its own because it overwrote
the /W3 flag. So turn this off for Visual Studio.

I don't think Visual Studio gives this warning anyway. If it does, we
can add a specific flat to suppress that warning.
2016-06-27 07:50:08 -06:00
Kenneth Moreland
8186600aa4 Fix issue with pdb files with nvcc on windows
When doing parallel builds with CUDA's nvcc on windows, you often get
errors about multiple programs trying to write to a pdb file at once. To
get around this, add the /FS flag on windows for the CUDA compiler.
2016-06-27 07:50:06 -06:00
Kenneth Moreland
4795fc1e65 Merge branch 'no-default-adapter' into 'master'
Make sure tests for many devices are using requested devices

There are several tests in the cont directory that are in header files so
that they can be recompiled for different devices. Make sure that the
tests are exclusively using the device being tested by making the error
device adapter the default.

If any part of the test tries to use the default device (which could be
different than the one being tested), a compile error will occur. Several
of these compile errors are fixed in this commit.

See merge request !463
2016-06-27 09:48:36 -04:00
Robert Maynard
b1210a617f Merge topic 'vtkm_usable_from_build_dir'
16f3f8ca VTKm_LOAD_COMPONENTS_COMMANDS now works with CMake version older than 3.3
b0d35919 VTKMConfig.cmake now properly sets VTKm_PACKAGE_IN_BUILD

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !462
2016-06-24 08:26:23 -04:00
Kenneth Moreland
968e1b6008 Make sure tests for many devices are using requested devices
There are several tests in the cont directory that are in header files so
that they can be recompiled for different devices. Make sure that the
tests are exclusively using the device being tested by making the error
device adapter the default.

If any part of the test tries to use the default device (which could be
different than the one being tested), a compile error will occur. Several
of these compile errors are fixed in this commit.
2016-06-23 17:34:01 -06:00
Robert Maynard
16f3f8ca9f VTKm_LOAD_COMPONENTS_COMMANDS now works with CMake version older than 3.3 2016-06-23 15:11:43 -04:00