Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,893 Commits 8 Branches 22 Tags 30 MiB
27dade1453
Commit Graph

143 Commits

Author SHA1 Message Date
Robert Maynard
9861cdecb1 Use CMake to automatically set policies to NEW. 
CMake 3.12 introduces a ...<max> syntax in the version given to
cmake_minimum_required to automatically set policies to NEW up
to that version. Use it to avoid listing policies explicitly.
 2018-06-19 16:12:48 -04:00
luz.paz
940c891886 Misc. typos 
Found via `codespell` and `grep`
more typos

includes source typo change and a typo that needs further review
follow-up typos


Follow-up typos


Revert a commit
 2018-06-14 16:49:11 -04:00
Allison Vacanti
4e07825ad6 Hide BUILD_TESTING cmake option. 
We use VTKm_ENABLE_TESTING to disable/enable tests.
 2018-06-11 12:01:35 -04:00
Allison Vacanti
183bcf109a Add initial version of an OpenMP backend. 2018-05-31 16:47:48 -04:00
Robert Maynard
7e3df68fb4 State that MSVC Generators require CMake 3.11+ 
We require CMake 3.11 with the MSVC generator as the $<COMPILE_LANGUAGE:>
generator expression is not supported on older versions.
 2018-05-18 12:50:38 -04:00
Sujin Philip
52758f7f3a Properly set up cuda architecture flags 2018-05-14 14:23:28 -04:00
Sujin Philip
d501a41576 Add VTKm_ENABLE_DEVELOPER_FLAGS cmake option 
The goal is to provide a way to disable VTK-m warning flags when used as a
thirdparty library.
VTK-m's stricter warning flags were cauing several new warnings in VTK.
 2018-05-10 12:47:20 -04:00
Utkarsh Ayachit
4610e8b167 increate timeout for CopyrightStatement test. 2018-04-12 16:40:19 -04:00
Robert Maynard
5dfdc8304b Cuda will also print error/warning pragma values now. 
Previously we only printed out the error numbers on MSVC.
 2018-04-12 10:06:57 -04:00
Kenneth Moreland
c6dcbc1fe1 Check for git version only once 
The check to determine the version of VTK-m from git was duplicated in
CMakeLists.txt. Although pointless, it generally was not a big deal
(only an extra check when running CMake). Except for some reason with
the latest changes to the CMake build the second time find_package(Git)
was called on my system the GIT_EXECUTABLE variable got cleared out and
that caused the configure to fail. I have no idea why this happens (and
running CMake again seems to fix the problem), but simply removing the
extraneous find seems fix the problem.
 2018-04-09 13:00:26 -04:00
Robert Maynard
f2f8796d1b Properly install all required cmake files needed by vtk-m 2018-04-09 11:08:58 -04:00
Robert Maynard
d205f9530e Update the documentation on when we need CMake 3.9+ 2018-02-23 15:38:44 -05:00
Robert Maynard
e630ac5aa4 Merge branch 'master' into vtk-m-cmake_refactor 2018-02-23 14:52:00 -05:00
luz.paz
80b11afa24 Misc. typos 
Found via `codespell -q 3` via downstream VTK
 2018-01-30 06:51:47 -05:00
Ben Boeckel
2b72110d14 cmake: support suppressing CPack usage 2018-01-18 08:40:40 -05:00
Ben Boeckel
dd1f096255 cmake: allow overriding of the build-tree CMake location 2018-01-18 08:40:40 -05:00
Ben Boeckel
74bd01b4cc cmake: install documentation to a "share" location 2018-01-18 08:40:40 -05:00
Ben Boeckel
9ce4bfe5af cmake: allow embedded vtk-m to not use cache variables 
Projects might want to force these without giving users the indication
that their choices actually matter.
 2018-01-17 10:23:15 -05:00
Robert Maynard
1d9a9dd1c6 Simplify VTK-m detection of the size of different types. 
Most of the code was unneeded as the primitive types have a minimum required
size that we can rely on.
 2018-01-17 09:57:51 -05:00
Robert Maynard
4f131d8223 Make VTK-m CMake output no extra information when configuring 2018-01-16 17:23:42 -05:00
Robert Maynard
0ea06bfdb7 Properly version dynamic libraries and build them in the correct location 2018-01-16 17:23:12 -05:00
Robert Maynard
89ce1a34a0 Respect the settings of VTKm_Vectorization when building VTK-m 2018-01-16 15:42:37 -05:00
Robert Maynard
0660c67fef Merge branch 'master' into vtk-m-cmake_refactor 2018-01-16 15:42:28 -05:00
Ben Boeckel
c5d630a77e cmake: add a vtkm_option macro 
Projects might want to force these without giving users the indication
that their choices actually matter.
 2018-01-16 15:21:17 -05:00
Ben Boeckel
022f12b2ec cmake: find Pyexpander quietly 
It's an internal detail and if it doesn't exist, it is handled properly.
 2018-01-16 15:21:17 -05:00
Robert Maynard
cb05cbc1a7 Properly find MPI and setup DIY when CMake >= 3.10 2018-01-08 14:00:58 -05:00
Robert Maynard
3f02d97ae4 Re-enable verification of generated files with pyexpander 2018-01-08 14:00:58 -05:00
Robert Maynard
5e1f7c60ad VTKm_INSTALL_ONLY_LIBRARIES allows installation of only vtk-m libs 2018-01-08 14:00:58 -05:00
Robert Maynard
d07ab6bc4a Refactor benchmarking to be outside the vtkm folder structure 
The benchmarking isn't installed as part of vtk-m and therefore shouldn't
be under vtkm/
 2018-01-08 14:00:57 -05:00
Robert Maynard
afc19ab0fc Setup symbol visibility controls for VTK-m 2018-01-08 14:00:57 -05:00
Robert Maynard
37a2359c70 Refactor the rendering context flags to not be a combo box. 
This way in the future it is easier to make currently mutually exclusive
compile options be all enabled at the same time.
 2018-01-08 14:00:57 -05:00
Utkarsh Ayachit
92cf8bf6d4 cmake: update cmake rules to use vtkm/thirdparty/diy. 2018-01-03 14:37:23 -05:00
Robert Maynard
52329ba3f6 Make sure all VTKm cmake files are prefixed with VTKm 2017-12-28 14:25:44 -05:00
Robert Maynard
24e57556e6 Merge branch 'master' into vtk-m-cmake_refactor 
Includes updating to cleanup benchmark code and handle the new MPI option
 2017-12-28 14:23:21 -05:00
Utkarsh Ayachit
d52b275e59 Making vtkm-cont depend on diy. 2017-12-15 15:15:23 -05:00
Utkarsh Ayachit
9dfc6f814e Add MPI as a dependency. 
Adding option to enable MPI. When enabled, we do `find_package(MPI)` in
the Base component itself.
 2017-12-15 10:53:30 -05:00
Matthew Letter
d7eb1d32db first pass at adding vertorization flags back into the build #5 
Ported cpu vectorization flags over to new CMake file called CPUVectorization.cmake and refactored some of the logic to use an interface lib.
 2017-11-16 16:50:07 -07:00
Allison Vacanti
5f1db422cd Add option to use default symbol visiblity for VTK-m libraries. 
VTK doesn't hide symbols for static builds, which results in linker
errors for VTK targets that link with VTK-m. This option allows VTK-m
to match VTK's behavior.
 2017-11-08 16:29:47 -05:00
Matthew Letter
0c574d7d60 Added pyexpander back into the build closes #6 2017-10-31 16:30:09 -06:00
Matthew Letter
fdfcc91fe1 Added doxyfile and vtkmBuildDocumentation.cmake closes #8 
added doxyfile and vtkmBuildDocumentation.cmake back into the build process and tested that they built out the html docs.
 2017-10-31 16:10:14 -06:00
Robert Maynard
ed8f4111ef Update all the code to work with CMake 3.3 
Obviously this does mean that CUDA is not supported with 3.3.
 2017-10-27 15:30:14 -04:00
Robert Maynard
3ded554831 Extend the CMake rewrite to include vtkm_rendering 2017-10-27 15:29:58 -04:00
Robert Maynard
56c7362258 A thought on what CMake 3.9 would mean to VTK-m. 2017-10-27 15:29:51 -04:00
Allison Vacanti
7fd7336a5d Don't version include directory under build tree. 
This is causing issues when building ParaView with VTK-m and VTK
kits enabled.
 2017-10-23 15:16:49 -04:00
Allison Vacanti
c0a7315906 Clean up install/VTK issues in VTKmConfig.cmake. 2017-10-03 11:28:15 -04:00
Allison Vacanti
85062a3ab3 Add version info to installed cmake config files. 
Files like VTKmConfig.cmake are now under:

prefix/lib/cmake/vtkm-1.0/, rather than
prefix/lib

to allow multiple vtkm versions to share an installation prefix.
 2017-10-02 12:33:30 -04:00
Allison Vacanti
75f88b4c46 Add versioning to VTKM installed include/share dirs. 2017-10-02 11:39:10 -04:00
Kenneth Moreland
c3a3184d51 Update copyright for Sandia 
Sandia National Laboratories recently changed management from the
Sandia Corporation to the National Technology & Engineering Solutions
of Sandia, LLC (NTESS). The copyright statements need to be updated
accordingly.
 2017-09-20 15:33:44 -06:00
Robert Maynard
5ec6d8fd13 Merge topic 'for-vtk' 
2f2909f7 Add support for containing project to override default install locations
0dbf776b Use VTKm_BINARY_DIR relative path to find headers to install
a481671c Configure files to VTKm_BINARY_DIR-based paths
16720937 Avoid redefining CMake default variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !889
 2017-08-31 11:52:05 -04:00
Shawn Waldon
2f2909f796 Add support for containing project to override default install locations 2017-08-28 11:38:31 -04:00