Commit Graph

2322 Commits

Author SHA1 Message Date
Kenneth Moreland
750b261f71 Merge topic 'glut-component'
fbb061d6 Fix some minor issues with move to glut CMake component
039efd6b Fix some issues with OpenGL configuration
d1d7ac54 Add GLUT component to find_package(VTKm)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !573
2016-10-04 15:35:52 -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
039efd6b7e Fix some issues with OpenGL configuration
Change the OpenGL configuration to require GLEW as most of the OpenGL
code actually requires GLEW (or will as soon as the VBO branch gets
merged in).

Also removed some stray find_package commands and rearranged the
configuration to use the vtkm_configure_component_* commands instead.
2016-10-03 17:34:15 -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
Kenneth Moreland
9acccf44f6 Merge topic 'cxx-flags-in-package-config'
13534a06 Drop cxx_constexpr from target compile features
9f0bd788 Add C++11 flags to sub-projects

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !568
2016-10-03 13:43:59 -04:00
Kenneth Moreland
13534a06b9 Drop cxx_constexpr from target compile features
It turns out, this is not supported on MSVC 2013. Presumably
cxx_auto_type is sufficient to force C++11 on all supported compilers.
2016-10-03 10:28:44 -06:00
Kenneth Moreland
30e9651658 Merge topic 'restore-function-interface-api'
452af3a0 Restore the AppendType and ReplaceType templates of FunctionInterface

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !570
2016-10-03 12:20:36 -04:00
Robert Maynard
03eca7a414 Merge topic 'enable_serial_tests'
43fe1a92 Enable the serial backend tests.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !571
2016-09-30 15:46:22 -04:00
Robert Maynard
43fe1a92cb Enable the serial backend tests. 2016-09-30 15:12:34 -04:00
Kenneth Moreland
452af3a0eb Restore the AppendType and ReplaceType templates of FunctionInterface
These are documented and an expected part of the interface. (The
examples in the user's guide started to fail because they were removed.
2016-09-29 16:22:26 -04:00
Kenneth Moreland
9f0bd78860 Add C++11 flags to sub-projects
Recently VTK-m was changed to require C++11. The internal builds set
properties to require C++11, but these never make it to the
configuration for projects that use the VTK-m package (i.e. not declared
in VTKmConfig.cmake).

This change adds a new CMake target, vtkm, which is an interface. It
does not point to an actual library, but it allows code that links it in
to have the appropriate compile flags.
2016-09-29 14:06:07 -04:00
Robert Maynard
dfcef00019 Merge topic 'deviceAdapter_serial_separate_directory'
0f58d6fc Add vtkm/cont/serial directory for the serial backend.
f7a9bbe0 All cuda / tbb unit tests follow the same naming pattern.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !569
2016-09-28 17:45:34 -04:00
Robert Maynard
0f58d6fc54 Add vtkm/cont/serial directory for the serial backend. 2016-09-28 14:22:53 -04:00
Robert Maynard
f7a9bbe0e7 All cuda / tbb unit tests follow the same naming pattern. 2016-09-28 14:22:53 -04:00
Robert Maynard
b2307cba5c Merge topic 'remove_boost_random_number_gen_from_test'
80b220ff Remove boost::random usage from DataSetBuilder tests.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !567
2016-09-28 13:42:36 -04:00
Robert Maynard
80b220ff0d Remove boost::random usage from DataSetBuilder tests. 2016-09-28 10:54:04 -04:00
Robert Maynard
70abe603c5 Merge topic 'use_brigand_over_boost_mpl'
ba8c8586 Get IntegerSequence to work correctly with MSVC.
377532c7 Update brigand to get a chunk of msvc2013 fixes.
a7f7cfe4 Update brigand.hpp to get corrections for MSVC2013.
a931b8e2 FunctionInterface and DispatcherBase don't require boost now.
ac0929a1 Add fast tracks for ListTag operations on size <= 4.
7ad88b6e Use c++11 variadic templates as storage of ListTags.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !559
2016-09-28 08:41:25 -04:00
Robert Maynard
ba8c85866a Get IntegerSequence to work correctly with MSVC. 2016-09-27 09:02:53 -04:00
Robert Maynard
377532c7a6 Update brigand to get a chunk of msvc2013 fixes. 2016-09-27 09:02:39 -04:00
Robert Maynard
a7f7cfe4f9 Update brigand.hpp to get corrections for MSVC2013. 2016-09-26 10:11:29 -04:00
Robert Maynard
600b7dc069 Merge topic 'correct_duplicate_trailing_semilcolon_warnings'
248ec04d Correct double trailing semicolons with VTKM_IS_TOPOLOGY_ELEMENT_TAG

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !564
2016-09-26 08:30:38 -04:00
Robert Maynard
a931b8e295 FunctionInterface and DispatcherBase don't require boost now. 2016-09-23 16:39:20 -04:00
Robert Maynard
ac0929a1cc Add fast tracks for ListTag operations on size <= 4.
As the significant majority of Lists contain for or less items,
this is a significant improvement to performance.
2016-09-23 16:39:20 -04:00
Robert Maynard
7ad88b6e5c Use c++11 variadic templates as storage of ListTags. 2016-09-23 16:39:20 -04:00
Robert Maynard
248ec04db7 Correct double trailing semicolons with VTKM_IS_TOPOLOGY_ELEMENT_TAG 2016-09-23 16:38:52 -04:00
Robert Maynard
8cb295d6ca Merge topic 'yet_another_cuda_cxx11_flag_pass'
346133d1 Make sure we don't duplicate commands to NVCC.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !563
2016-09-23 16:37:17 -04:00
Robert Maynard
346133d195 Make sure we don't duplicate commands to NVCC.
The previous attempt at using caching to prevent duplicate commands, failed
when you tried to build VTK-m itself and had examples turned on. Now we
just don't add the std=c++11 option if it already exists.
2016-09-23 10:09:32 -04:00
Robert Maynard
71b20353cd Merge topic 'require_cmake_3_3'
314d91a5 Explicitly require CMake 3.3 and a C++11 Compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !544
2016-09-22 16:03:33 -04:00
Kenneth Moreland
30de41271e Merge topic 'build-rendering-to-enable-rendering'
4b838263 Fix uninitialized variable warning in structured volume renderer
1e819c33 Remove uninitialized value warnings from PNGDecode
c1de0e07 Change VTKm_BUILD_RENDERING to VTKm_ENABLE_RENDERING

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !553
2016-09-22 15:40:36 -04:00
Robert Maynard
31ea9e3693 Merge topic 'cache_nvcc_flags_state_modification'
43651c55 Make sure we don't duplicate commands to NVCC.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !558
2016-09-22 14:01:14 -04:00
Kenneth Moreland
4b83826345 Fix uninitialized variable warning in structured volume renderer
One of the dashboard was complaining that the bottomLeft variable might
have been used uninitialized because it got set in a condition above it.
In fact, that condition is always true the first during the first
iteration, but it is not worth fighting the compiler over it. Instead,
just initialize the value of bottomLeft when it is constructed.
2016-09-22 09:52:12 -06:00
Kenneth Moreland
1e819c335f Remove uninitialized value warnings from PNGDecode
One of the dashboard compilers found a code path in PNGDecode where if
given a buffer too short for a header the info.width and info.height
were not initialized but their values still returned to the calling
function. This case does not really matter since an error is also
returned, but still technically incorrect. Fixed the problem by
initializing the width and height to 0 (which could help anyway if the
error is not properly checked).
2016-09-22 09:43:24 -06:00
Matt Larsen
f0660990c6 Merge topic 'fix/vtk_reader_strings_fields'
2fbb9324 Merge branch 'fix/vtk_reader_strings_fields' of https://gitlab.kitware.com/mclarsen/vtk-m into fix/vtk_reader_strings_fields
69d4ced2 Fixing typo
a564ca0f Casting size_t
0015e315 Adding static cast to suppress warnings
d9bd4cb6 Adding else statement
f6234001 Adding support in the vtk data set reader for skipping strings in field data
7ccd0d9e Fixing typo
c687e06f Casting size_t
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !560
2016-09-22 11:17:18 -04:00
Matt Larsen
2fbb9324a6 Merge branch 'fix/vtk_reader_strings_fields' of https://gitlab.kitware.com/mclarsen/vtk-m into fix/vtk_reader_strings_fields 2016-09-21 14:14:55 -07:00
Matt Larsen
69d4ced2ac Fixing typo 2016-09-21 14:14:27 -07:00
Matt Larsen
a564ca0f3e Casting size_t 2016-09-21 14:14:26 -07:00
Matt Larsen
0015e3150b Adding static cast to suppress warnings 2016-09-21 14:14:26 -07:00
Matt Larsen
d9bd4cb698 Adding else statement 2016-09-21 14:14:26 -07:00
Matt Larsen
f623400151 Adding support in the vtk data set reader for skipping strings in field data 2016-09-21 14:14:26 -07: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
Robert Maynard
314d91a5f3 Explicitly require CMake 3.3 and a C++11 Compiler
We need to bump our minimum CMake version to get support for C++11
flags on certain compilers.
2016-09-21 16:24:54 -04:00
Robert Maynard
43651c55bc Make sure we don't duplicate commands to NVCC.
When you called find_package multiple times with VTK-m components such as CUDA
would continuously append to variables, causing a variable to have the same
parameter listed multiple times.
2016-09-21 16:22:52 -04:00
Robert Maynard
fa3c2b8986 Merge topic 'properly_handle_host_compiler_being_c_compiler'
c8726814 Make VTKmDetectCUDAVersion work with C compilers.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !561
2016-09-21 16:22:38 -04:00
Robert Maynard
c8726814b8 Make VTKmDetectCUDAVersion work with C compilers. 2016-09-21 16:00:57 -04:00
Matt Larsen
7ccd0d9e7f Fixing typo 2016-09-21 08:54:26 -07:00
Matt Larsen
c687e06f0d Casting size_t 2016-09-21 08:40:38 -07:00
Matt Larsen
7b28ff93a6 Adding static cast to suppress warnings 2016-09-21 08:33:09 -07:00
Matt Larsen
84779eb457 Adding else statement 2016-09-21 08:19:10 -07:00
Matt Larsen
2975cf4867 Adding support in the vtk data set reader for skipping strings in field data 2016-09-21 08:16:43 -07:00
Dave Pugmire
c4a78d952c Merge branch 'master' into 'master'
Fix compile errors. decl for memcpy required.



See merge request !556
2016-09-20 11:17:29 -04:00