Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-16 17:22:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Update the documentation to note have references to dax.

Browse Source
This commit is contained in:
Robert Maynard 2014-12-10 10:37:25 -05:00
parent d754bad470
commit 519509bba1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtkm/cont/DeviceAdapter.h
View File

@ -38,7 +38,7 @@ namespace cont {
/// mechanisms to run algorithms on a type of parallel device. The tag
/// DeviceAdapterTag___ does not actually exist. Rather, this documentation is
/// provided to describe the interface for a DeviceAdapter. Loading the
/// dax/cont/DeviceAdapter.h header file will set a default device adapter
/// vtkm/cont/DeviceAdapter.h header file will set a default device adapter
/// appropriate for the current compile environment. You can specify the
/// default device adapter by first setting the \c VTKM_DEVICE_ADAPTER macro.
/// Valid values for \c VTKM_DEVICE_ADAPTER are the following:

2
vtkm/testing/UnitTestPair.cxx
View File

@ -154,7 +154,7 @@ struct DecideFirstType
void TestPair()
{
//we want to test each combination of standard dax types in a
//we want to test each combination of standard vtkm types in a
//vtkm::Pair, so to do that we dispatch twice on TryTypes. We could
//dispatch on all types, but that gets excessively large and takes a
//long time to compile (although it runs fast). Instead, just select