Commit Graph

2190 Commits

Author SHA1 Message Date
Sujin Philip
011605d489 Refactor CMake files
1. Change set_property(...) to target_* commands
2. Remove explcit adding of CMAKE_CXX_FLAGS_WARN_EXTRA as compile option
3. Add /bigobj option to VTKm_COMPILE_OPTIONS under MSVC
2016-09-01 11:14:29 -04:00
Robert Maynard
1379502179 Merge topic 'vtkm_configure_component_CUDA_typo'
45f2ee19 Correct typo in error message of vtkm_configure_component_CUDA

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !533
2016-09-01 09:28:33 -04:00
Robert Maynard
45f2ee1907 Correct typo in error message of vtkm_configure_component_CUDA 2016-09-01 08:55:12 -04:00
Robert Maynard
b818a75b18 Merge topic 'convert_over_to_c++11_typetraits'
12810165 Switch over to c++11 type_traits.
696ca48b Make sure CUDA is built with c++11 support enabled.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !529
2016-08-31 17:07:37 -04:00
Robert Maynard
12810165bb Switch over to c++11 type_traits. 2016-08-31 16:11:26 -04:00
Kenneth Moreland
7255506620 Merge branch 'cmp0058-policy' into 'master'
Honor CMake policy CMP0058

CMake policy CMP0058, introduced in CMake 3.3, requires that all
intermediate files created during the build process will be declared as
an output or byproduct of a target. See "cmake --help-policy CMP0058"
for details.

Per this policy, CMake was giving a warning about some files generated
during configuration (e.g. with configure_file) because they were files
in the build directory with no apparent target command. This is not an
issue since the configure will ensure that the file is always there
before the build starts. Thus, we declare that we will adhere to the new
policy to avoid the warning.

See merge request !528
2016-08-29 16:28:24 -04:00
Robert Maynard
696ca48bd1 Make sure CUDA is built with c++11 support enabled. 2016-08-29 16:19:44 -04:00
Kenneth Moreland
e4ca73fc05 Honor CMake policy CMP0058
CMake policy CMP0058, introduced in CMake 3.3, requires that all
intermediate files created during the build process will be declared as
an output or byproduct of a target. See "cmake --help-policy CMP0058"
for details.

Per this policy, CMake was giving a warning about some files generated
during configuration (e.g. with configure_file) because they were files
in the build directory with no apparent target command. This is not an
issue since the configure will ensure that the file is always there
before the build starts. Thus, we declare that we will adhere to the new
policy to avoid the warning.
2016-08-29 13:42:55 -06:00
Robert Maynard
c4dd3cffd5 Merge topic 'remove_CheckCXX11Features'
c34fab4f Remove CheckCXX11 Feature since we now require C++11.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !524
2016-08-26 15:49:37 -04:00
Dave Pugmire
162c584a06 Merge branch 'glfw-test-batch' into 'master'
Make glfw auto-terminate during testing

The UnitTestMapperGLFW test was coded to run in an interactive mode,
which was problematic when simply running the test. If no one was there
to exit the interactive window, the test would time out. This change
adds a "batch" mode that is on when run by ctest. The batch mode runs
through all configurations and exits.

See merge request !525
2016-08-26 13:46:02 -04:00
Kenneth Moreland
4fd9ba7e11 Make glfw auto-terminate during testing
The UnitTestMapperGLFW test was coded to run in an interactive mode,
which was problematic when simply running the test. If no one was there
to exit the interactive window, the test would time out. This change
adds a "batch" mode that is on when run by ctest. The batch mode runs
through all configurations and exits.
2016-08-26 08:28:35 -06:00
Robert Maynard
c34fab4f84 Remove CheckCXX11 Feature since we now require C++11. 2016-08-26 10:23:15 -04:00
Kenneth Moreland
b568dcee62 Merge branch 'incorrect-configure-in-rendering' into 'master'
Fix configuration of dependent rendering libraries

The VTKmConfigureComponents.cmake file has lots of careful configuration
of many of VTK-m components and dependent libraries (like OpenGL,
OSMesa, etc.) that takes care of several corner cases. The configuration
is consolidated here so that it can be consistent across the many
directories in VTK-m as well as other projects that use VTK-m.

Recent changes to the configuration in rendering circumvented these and
directly tried to configure dependent rendering libraries. This is wrong
(and more importantly broke my OSX build).

See merge request !519
2016-08-25 18:20:56 -04:00
Kenneth Moreland
4088226eac Merge branch 'interop-fixes' into 'master'
Generalize BufferTypePicker

Previously there was a bug where BufferTypePicker was not implemented
correctly when LONG was 32 bits (even though 64 bit integers were
available).

This changes fixes the problem and also makes the implementation more
general by using the TypeTraits already available.

See merge request !522
2016-08-25 18:19:39 -04:00
Kenneth Moreland
7f8ea09f88 Fix configuration of dependent rendering libraries
The VTKmConfigureComponents.cmake file has lots of careful configuration
of many of VTK-m components and dependent libraries (like OpenGL,
OSMesa, etc.) that takes care of several corner cases. The configuration
is consolidated here so that it can be consistent across the many
directories in VTK-m as well as other projects that use VTK-m.

Recent changes to the configuration in rendering circumvented these and
directly tried to configure dependent rendering libraries. This is wrong
(and more importantly broke my OSX build).
2016-08-25 14:44:30 -06:00
Kenneth Moreland
8a961f5b12 Generalize BufferTypePicker
Previously there was a bug where BufferTypePicker was not implemented
correctly when LONG was 32 bits (even though 64 bit integers were
available).

This changes fixes the problem and also makes the implementation more
general by using the TypeTraits already available.
2016-08-25 14:42:12 -06:00
Kenneth Moreland
2da053ce67 Merge branch 'source-in-build-missing' into 'master'
Add RenderTest.h to configure scripts

The SourceInBuild was failing because of that.

See merge request !521
2016-08-25 16:40:19 -04:00
Kenneth Moreland
40db6c1cd1 Merge branch 'faster-compile' into 'master'
Faster compile

Some small change to make modest improvements to the
compile time.

See merge request !520
2016-08-25 16:03:58 -04:00
Kenneth Moreland
1b69a83423 Don't add tests from parent directories
The testing subdirectories were including the tests from the parent
directory. I believe this was a copy-paste error from the tests
originally all being in one file (where the unit_tests variable had all
tests appended) and then moved to subdirectories where they should not
be appended.
2016-08-25 13:20:40 -06:00
Kenneth Moreland
8ac6ce4501 Add back a condition to zip array test with vec as first
In the test for the ArrayHandleZip fancy array handle, re-add a
condition where the first array being zipped is of type Vec.
2016-08-25 13:11:04 -06:00
Kenneth Moreland
8fd0768b39 Add RenderTest.h to configure scripts
The SourceInBuild was failing because of that.
2016-08-25 10:34:40 -06:00
Dave Pugmire
be7a8d5019 Merge branch 'fresh_smelling_branch' into 'master'
Add GLFW unit test.

Simplify the test code with a class templated on mapper, canvas and view.

See merge request !518
2016-08-25 08:39:39 -04:00
Robert Maynard
0413ca10d8 Merge topic 'add_copy_subrange'
14ad996d Update vtk-m to use CopySubRange where applicable.
51e50d29 Add DeviceAdapter::CopySubRange to all device adapters.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !516
2016-08-25 08:22:40 -04:00
Kenneth Moreland
f8442903d8 Replace TryAllTypes with trying exemplar tests
There were many tests that created code paths for every base and Vec
type that VTK-m supports (up to 4 components). Although this is
admirable, it is also excessive, and our compile times for the tests are
very long.

To shorten compile times, remove the TryAllTypes method. Replace it with
a version of TryTypes that uses a default list of "exemplar" set of
integers, floats, and Vecs.
2016-08-24 16:02:18 -06:00
Kenneth Moreland
fc0d804ad0 Reduce conditions to check in TestingFancyArrayHandles
By far the source file that was taking the longest to compile was that
for the fancy array handles. This is because this test was being
pedantic about all the different types it was testing. This change
should drastically reduce the types actually compiled for and,
therefore, also drastically reduce the compile time for this test.
2016-08-24 15:43:33 -06:00
Dave Pugmire
6f30b786f5 Add GLFW unit test.
Simplify the test code with a class templated on mapper, canvas and view.
2016-08-24 16:22:48 -04:00
Robert Maynard
14ad996d93 Update vtk-m to use CopySubRange where applicable. 2016-08-24 15:42:51 -04:00
Robert Maynard
51e50d2933 Add DeviceAdapter::CopySubRange to all device adapters.
This allows callers to copy a subsection of an array into another array,
without clearing the contents of the destination array if a resize
is required.
2016-08-24 15:42:51 -04:00
Dave Pugmire
fd353b0454 Merge branch 'fresh_smelling_branch' into 'master'
Did a chmod on these files that had the execute bit set.



See merge request !517
2016-08-24 13:26:43 -04:00
Dave Pugmire
78f368486c Did a chmod on these files that had the execute bit set. 2016-08-24 13:08:23 -04:00
Kenneth Moreland
6c09bbb64a Merge branch 'msvc-include-directories' into 'master'
Fix config issues with headers and libraries

There were a couple of places where the configure scripts did not add
either includes to VTKm_INCLUDE_DIRS or libraries to VTKm_LIBRARIES.

The biggest offender was when the examples used find_package to load the
VTK-m configuration it needed. find_package cleared out the includes and
libraries, but it did not clear out the VTKm_<COMPONENT>_FOUND
variables. Normally, these variables would not be set before
find_package is called, but in this case the examples were called after
some partial configuration. I got around this issue by clearing out all
the *_FOUND variables in VTKmConfig.cmake.

See merge request !515
2016-08-24 10:47:07 -04:00
Robert Maynard
f4457fc767 Merge topic 'clip_filter'
2d31774b Add a Clip filter that can do iso value clipping.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !514
2016-08-24 10:00:28 -04:00
Kenneth Moreland
ab528b8ec9 Configure examples after writing VTKmConfig.cmake
The examples configuration now behave like external projects and use
find_package to configure themselves. As such that file should be built
before we try to configure the examples.
2016-08-23 16:04:58 -06:00
Robert Maynard
2d31774b3b Add a Clip filter that can do iso value clipping. 2016-08-23 16:12:22 -04:00
Kenneth Moreland
866c617cbf Fix config issues with headers and libraries
There were a couple of places where the configure scripts did not add
either includes to VTKm_INCLUDE_DIRS or libraries to VTKm_LIBRARIES.

The biggest offender was when the examples used find_package to load the
VTK-m configuration it needed. find_package cleared out the includes and
libraries, but it did not clear out the VTKm_<COMPONENT>_FOUND
variables. Normally, these variables would not be set before
find_package is called, but in this case the examples were called after
some partial configuration. I got around this issue by clearing out all
the *_FOUND variables in VTKmConfig.cmake.
2016-08-23 14:07:38 -06:00
Robert Maynard
7ece97bb87 Merge topic 'some_examples_show_how_to_find_vtkm'
88ce3f23 Examples now call find_package(VTKm)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !511
2016-08-23 13:09:20 -04:00
Robert Maynard
38ebf08439 Merge topic 'multiple_backend_example_uses_TryExecute'
1224a903 multi_backend example now uses vtkm::cont::TryExecute

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !512
2016-08-22 16:58:56 -04:00
Robert Maynard
1224a90305 multi_backend example now uses vtkm::cont::TryExecute
Now that TryExecute has been standardized, update the example of
how to compile for multiple runtime backends.
2016-08-22 15:45:45 -04:00
Robert Maynard
88ce3f23ae Examples now call find_package(VTKm)
The examples are now written so they can be copied out of the vtk-m
source and still build properly. This will help new users / developers
learn how to build projects that use VTK-m.
2016-08-22 14:03:16 -04:00
Robert Maynard
ce3c7f64b5 Merge topic 'clip_restructure'
af05ea0e Cleanup clipping so we can use it from a filter.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !508
2016-08-22 09:56:21 -04:00
Robert Maynard
426555c698 Merge topic 'master'
e920659a Don't need to set uni_tests.
e3834d1c Merge https://gitlab.kitware.com/vtk/vtk-m
5fbc55fa Check to see if osmesa or egl were found before adding testing.
7bb3e89e Split EGL and OSMesa into separate directories. libGL and libOSMesa do not play well together.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !510
2016-08-19 17:28:11 -04:00
Mark Kim
e920659ab8 Don't need to set uni_tests. 2016-08-19 14:27:40 -06:00
Mark Kim
e3834d1c73 Merge https://gitlab.kitware.com/vtk/vtk-m 2016-08-18 14:33:37 -06:00
Mark Kim
5fbc55fa52 Check to see if osmesa or egl were found before adding testing. 2016-08-18 14:04:37 -06:00
Robert Maynard
9712de8b24 Merge topic 'wavelets'
d677d0d1 small tweaks
816364d2 in an effort to get rid of a warning
778da350 In attempt to fix errors and warnings
bb450c51 fix a warning
49e56b61 two new wavelet filters, HAAR and CDF8/4 supported now
767356bc working on even length filters; need ASYM* support in Extend1D()
a6efad04 half done even length filters implementation
ee32ea4c took off timing code
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !482
2016-08-18 15:47:33 -04:00
Kenneth Moreland
069fc69869 Merge branch 'try-run-on-device' into 'master'
Add general purpose TryExecute

The filters directory had a couple of classes designed to try executing
filters on a list of devices until one succeeds. There was quite a bit
of code duplication in these, and the code was inaccessible to other
parts of VTK-m. This resolves both of these issues by moving the
functionality to a TryExecute method located in the vtkm::cont
package.

See merge request !507
2016-08-18 15:05:03 -04:00
Robert Maynard
377c38247e Merge topic 'remove_default_device_worklet'
b934c1c7 Remove improper defaults for worklets device adapter.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !509
2016-08-18 13:28:49 -04:00
Robert Maynard
af05ea0e8d Cleanup clipping so we can use it from a filter. 2016-08-18 12:50:20 -04:00
Samuel Li
d677d0d175 small tweaks 2016-08-18 10:28:41 -06:00
Samuel Li
816364d204 in an effort to get rid of a warning 2016-08-18 09:10:38 -06:00