Commit Graph

274 Commits

Author SHA1 Message Date
Robert Maynard
8b4181141d Correct the build location of libraries. 2018-01-31 15:58:23 -05:00
Robert Maynard
d1f0b621ab VTKmConfig sets all VTKm variables before doing anything else 2018-01-17 16:34:38 -05:00
Robert Maynard
df406b5ed3 VTKmConfig.cmake now correctly stating which gl context rendering has 2018-01-17 13:23:29 -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
06da1528c4 vtk-m installed included directory obeys VTKm_INSTALL_INCLUDE_DIR 2018-01-16 15:42:38 -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
7c882473bd Correct compilation under MSVC when CUDA is enabled. 2018-01-16 15:42:37 -05:00
Robert Maynard
ec074bb627 Redesign how we specify cxx files should be compiled as cuda.
Due to limitations in the CUDA MSBuild support and how CMake stores the language
of a source file, we had to change VTK-m over to using generated .cu files
to signal when we want CUDA compilation.
2018-01-16 15:42:37 -05:00
Robert Maynard
e1916ea7e2 Redesign of vtk-m test build infrastructure to reduce amount of cmake re-runs
Previous versions of the test build infrastructure would cause cmake to re-run
everytime a header was modified. Now this will not occur.
2018-01-16 15:42:37 -05:00
Robert Maynard
98e4a34cd1 VTKm now refers to diy as vtkm_diy
This is done to be more consistent with the vtkm CMake naming and
to make sure we don't conflict with other exported diy instances.
2018-01-16 15:42:36 -05:00
Robert Maynard
0660c67fef Merge branch 'master' into vtk-m-cmake_refactor 2018-01-16 15:42:28 -05:00
Robert Maynard
4a09615000 Correct issues when building on windows 2018-01-08 14:00:58 -05:00
Matthew Letter
360174fd48 adding logic for determining a location for cuda windows
adding logic for determining a location for cuda windows, the location has to be valid for cmake to config cuda correctly.
2018-01-08 14:00:58 -05:00
Robert Maynard
5dd6e09da6 CUDA compilation on linux now works with CMake 3.9 and gcc 6 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
5c140abc64 Re-enable support for header include tests for VTK-m 2018-01-08 14:00:58 -05:00
Robert Maynard
dcb340b8ee Correct logic failure on when to find OpenGL 2018-01-08 14:00:58 -05:00
Robert Maynard
f59856ec17 VTKmCPUVectorization now follows VTK-m CMake indentation rules 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
9277eaa2d3 Update FindOpenGL to version in CMake 3.10.1 2018-01-08 14:00:57 -05:00
Robert Maynard
18a360b793 Properly allow constexpr on the device side when compiling cuda 2018-01-08 14:00:57 -05:00
Robert Maynard
b2c03ad858 Unit_tests are built with the correct compiler when cuda is enabled.
Previously all the Unit_tests that shared source files would use cuda
once CUDA set the language on the file.
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
Robert Maynard
af0a781086 Properly detect what flags to pass to cuda when CUDA_Architecture is native 2018-01-08 14:00:54 -05:00
Utkarsh Ayachit
4a05277296 Exclude thirdparty/diy from VTKmCheckSourceInBuild check. 2018-01-03 15:09:14 -05:00
Utkarsh Ayachit
4b4e43ae83 update VTKmCheckCopyright for new diy header locations. 2018-01-03 14:53:37 -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
Matt Larsen
83e51cf42e creating ray tracing benchmark 2017-12-20 14:22:52 -08:00
Utkarsh Ayachit
186e686968 Add ability to run tests with mpiexec.
Extends `vtkm_unit_tests` to support running tests with `mpiexec`.
Updates `UnitTestMultiBlock` to use mpi, if available.
2017-12-18 14:45:25 -05:00
Utkarsh Ayachit
6a4edd87f7 Exclude diy from VTK-m Copyright checks. 2017-12-15 15:15:22 -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
4b058229ce Merge branch 'master' into cmake_refactor 2017-12-08 09:51:48 -07:00
Kenneth Moreland
62fa1d562a Fix location of VTKmCheckPyexpander.cmake
The location of VTKmCheckPyexpander.cmake was originally set to $
{CMAKE_SOURCE_DIR}/CMake. This is correct with respect to the VTK-m
install, but incorrect if VTK-m is being included as a module in another
project (like VTK). Change the location to ${VTKm_CMAKE_MODULE_PATH},
which should be correct in every case.
2017-12-07 09:27:59 -07:00
Matthew Letter
7f2862a78d found naming bug with CMmake dir name
there appears to be a bug in the naming of a source dir for VTKmExportHeaderTemplate.h.in so it can't find the config file
2017-11-30 10:33:05 -07:00
Matthew Letter
4e4dec627c added missing copyright statement 2017-11-30 10:21:38 -07:00
Matthew Letter
605c78722d updated to recommended flags for clang
added the recommended flags for clang for knl and  skylake achitectures and removed the old flags.
2017-11-28 11:58:09 -07:00
Matthew Letter
92f4aa95c4 Added skylake_flags and knl_flags
Removed avx512_flags and replace it with 2 options of skylake_flags and knl_flags.
2017-11-27 16:38:33 -07:00
Matthew Letter
e416516a36 added guard to vectorization flags
added guard to vectorication flags so we do not build the flags more than once
2017-11-27 14:23:31 -07:00
Matthew Letter
05a6ba5254 Added newlines to resolve kitware robot errors
I was getting missing newlines errors from the kitware robot so this should fix them
2017-11-17 09:12:16 -07: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
Matthew Letter
c57c11adc8 Removed fermi flags from the cuda "all" build #4
Fermi architecture support is being deprecated
in the CUDA 8.0 Toolkit so we are removing it from the all build
2017-11-12 20:21:23 -07:00
Matthew Letter
5a2dbeff4c modifying CUDA_NVCC_FLAGS and updating for string list appending #4
modifying CUDA_NVCC_FLAGS to CMAKE_CUDA_FLAGS and CMAKE_CUDA_FLAGS is a string not a list so changed the way the flags are being added to the variable
2017-11-12 15:59:04 -07:00
Matthew Letter
3941530d64 removing NVCC FLAGS now that we use proper CUDA support #4 2017-11-10 10:27:55 -07:00
Matthew Letter
59ce1189cc added cuda compiler flags logic from ConfigureComponents #4
Ported cuda compiler flags logic from ConfigureComponents over to vtkmDeviceAdapters.cmake
2017-11-09 14:52:25 -07:00
Matthew Letter
8efa4bdf19 added SourceInBuild back into vtkm closes #10 2017-10-31 16:38:44 -06:00
Matthew Letter
47d0926a26 added SystemInformation cmake funcitonality closes #9 2017-10-31 16:37:04 -06:00
Matthew Letter
57cc8cdad1 Added copyright check back into the build closes #7 2017-10-31 16:36:07 -06:00