mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-20 11:05:44 +00:00
db0f5c31b9
Previously, ArrayHandleVirtual was using the default Transfer object. This was problematic because it would copy/allocate things in the execution environment independently from the array that it was wrapped around. This caused several negative effects, particularly for CUDA devices. First, if the data were already on the device (or the array is implicit), a second copy of the data would be made. Second, the copy to the device is likely less efficient. Third (and worst of all), the data did not always get pulled back to the original array correctly. This commit also contains instantiations of ArrayHandleVirtual and its components for the most common types.
213 lines
5.3 KiB
CMake
213 lines
5.3 KiB
CMake
##============================================================================
|
|
## Copyright (c) Kitware, Inc.
|
|
## All rights reserved.
|
|
## See LICENSE.txt for details.
|
|
## This software is distributed WITHOUT ANY WARRANTY; without even
|
|
## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
|
## PURPOSE. See the above copyright notice for more information.
|
|
##
|
|
## Copyright 2014 National Technology & Engineering Solutions of Sandia, LLC (NTESS).
|
|
## Copyright 2014 UT-Battelle, LLC.
|
|
## Copyright 2014 Los Alamos National Security.
|
|
##
|
|
## Under the terms of Contract DE-NA0003525 with NTESS,
|
|
## the U.S. Government retains certain rights in this software.
|
|
##
|
|
## Under the terms of Contract DE-AC52-06NA25396 with Los Alamos National
|
|
## Laboratory (LANL), the U.S. Government retains certain rights in
|
|
## this software.
|
|
##============================================================================
|
|
|
|
set(headers
|
|
Algorithm.h
|
|
ArrayCopy.h
|
|
ArrayHandle.h
|
|
ArrayHandleCartesianProduct.h
|
|
ArrayHandleCast.h
|
|
ArrayHandleCompositeVector.h
|
|
ArrayHandleConcatenate.h
|
|
ArrayHandleConstant.h
|
|
ArrayHandleCounting.h
|
|
ArrayHandleDiscard.h
|
|
ArrayHandleExtractComponent.h
|
|
ArrayHandleGroupVec.h
|
|
ArrayHandleGroupVecVariable.h
|
|
ArrayHandleImplicit.h
|
|
ArrayHandleIndex.h
|
|
ArrayHandlePermutation.h
|
|
ArrayHandleReverse.h
|
|
ArrayHandleStreaming.h
|
|
ArrayHandleSwizzle.h
|
|
ArrayHandleTransform.h
|
|
ArrayHandleUniformPointCoordinates.h
|
|
ArrayHandleView.h
|
|
ArrayHandleVirtual.h
|
|
ArrayHandleVirtualCoordinates.h
|
|
ArrayHandleZip.h
|
|
ArrayPortal.h
|
|
ArrayPortalToIterators.h
|
|
ArrayRangeCompute.h
|
|
AssignerMultiBlock.h
|
|
AtomicArray.h
|
|
BoundingIntervalHierarchy.h
|
|
BoundingIntervalHierarchyNode.h
|
|
BoundsCompute.h
|
|
BoundsGlobalCompute.h
|
|
CellLocator.h
|
|
CellLocatorHelper.h
|
|
CellLocatorRectilinearGrid.h
|
|
CellLocatorTwoLevelUniformGrid.h
|
|
CellLocatorUniformGrid.h
|
|
CellSet.h
|
|
CellSetExplicit.h
|
|
CellSetListTag.h
|
|
CellSetPermutation.h
|
|
CellSetSingleType.h
|
|
CellSetStructured.h
|
|
ColorTable.h
|
|
ColorTableSamples.h
|
|
CoordinateSystem.h
|
|
DataSet.h
|
|
DataSetBuilderExplicit.h
|
|
DataSetBuilderRectilinear.h
|
|
DataSetBuilderUniform.h
|
|
DataSetFieldAdd.h
|
|
DeviceAdapter.h
|
|
DeviceAdapterAlgorithm.h
|
|
DeviceAdapterListTag.h
|
|
DynamicCellSet.h
|
|
EnvironmentTracker.h
|
|
Error.h
|
|
ErrorBadAllocation.h
|
|
ErrorBadDevice.h
|
|
ErrorBadType.h
|
|
ErrorBadValue.h
|
|
ErrorExecution.h
|
|
ErrorFilterExecution.h
|
|
ErrorInternal.h
|
|
ExecutionAndControlObjectBase.h
|
|
ExecutionObjectBase.h
|
|
Field.h
|
|
FieldRangeCompute.h
|
|
FieldRangeGlobalCompute.h
|
|
ImplicitFunctionHandle.h
|
|
Initialize.h
|
|
Logging.h
|
|
MultiBlock.h
|
|
PointLocator.h
|
|
PointLocatorUniformGrid.h
|
|
RuntimeDeviceInformation.h
|
|
RuntimeDeviceTracker.h
|
|
Serialization.h
|
|
Storage.h
|
|
StorageBasic.h
|
|
StorageImplicit.h
|
|
StorageListTag.h
|
|
StorageVirtual.h
|
|
Timer.h
|
|
TryExecute.h
|
|
SerializableTypeString.h
|
|
VariantArrayHandle.h
|
|
VirtualObjectHandle.h
|
|
)
|
|
|
|
set(template_sources
|
|
ArrayHandle.hxx
|
|
ArrayHandleVirtual.hxx
|
|
ArrayRangeCompute.hxx
|
|
BoundingIntervalHierarchy.hxx
|
|
CellSetExplicit.hxx
|
|
CellSetStructured.hxx
|
|
ColorTable.hxx
|
|
CoordinateSystem.hxx
|
|
FieldRangeCompute.hxx
|
|
FieldRangeGlobalCompute.hxx
|
|
StorageBasic.hxx
|
|
StorageVirtual.hxx
|
|
VirtualObjectHandle.hxx
|
|
)
|
|
|
|
set(sources
|
|
ArrayHandle.cxx
|
|
ArrayHandleVirtual.cxx
|
|
AssignerMultiBlock.cxx
|
|
BoundsCompute.cxx
|
|
BoundsGlobalCompute.cxx
|
|
CellSet.cxx
|
|
CellSetStructured.cxx
|
|
ColorTable.cxx
|
|
ColorTablePresets.cxx
|
|
DataSet.cxx
|
|
DataSetBuilderExplicit.cxx
|
|
DataSetBuilderRectilinear.cxx
|
|
DataSetBuilderUniform.cxx
|
|
EnvironmentTracker.cxx
|
|
ErrorBadDevice.cxx
|
|
ErrorBadType.cxx
|
|
Field.cxx
|
|
FieldRangeCompute.cxx
|
|
FieldRangeGlobalCompute.cxx
|
|
internal/ArrayHandleBasicImpl.cxx
|
|
internal/ArrayManagerExecutionShareWithControl.cxx
|
|
internal/DeviceAdapterTag.cxx
|
|
internal/SimplePolymorphicContainer.cxx
|
|
internal/TransferInfo.cxx
|
|
internal/VirtualObjectTransfer.cxx
|
|
Initialize.cxx
|
|
Logging.cxx
|
|
MultiBlock.cxx
|
|
RuntimeDeviceInformation.cxx
|
|
RuntimeDeviceTracker.cxx
|
|
StorageBasic.cxx
|
|
TryExecute.cxx
|
|
VariantArrayHandle.cxx
|
|
)
|
|
|
|
# This list of sources has code that uses devices and so might need to be
|
|
# compiled with a device-specific compiler (like CUDA).
|
|
set(device_sources
|
|
ArrayRangeCompute.cxx
|
|
CellSetExplicit.cxx
|
|
CoordinateSystem.cxx
|
|
StorageVirtual.cxx
|
|
Timer.cxx
|
|
)
|
|
|
|
#-----------------------------------------------------------------------------
|
|
vtkm_library( NAME vtkm_cont
|
|
SOURCES ${sources}
|
|
TEMPLATE_SOURCES ${template_sources}
|
|
HEADERS ${headers}
|
|
WRAP_FOR_CUDA ${device_sources}
|
|
)
|
|
|
|
add_subdirectory(internal)
|
|
add_subdirectory(arg)
|
|
add_subdirectory(serial)
|
|
add_subdirectory(tbb)
|
|
add_subdirectory(openmp)
|
|
add_subdirectory(cuda)
|
|
|
|
set(backends )
|
|
set (DL_LIBS )
|
|
if(TARGET vtkm::tbb)
|
|
list(APPEND backends vtkm::tbb)
|
|
endif()
|
|
if(TARGET vtkm::cuda)
|
|
list(APPEND backends vtkm::cuda)
|
|
endif()
|
|
if(TARGET vtkm::openmp)
|
|
list(APPEND backends vtkm::openmp)
|
|
endif()
|
|
if (VTKm_ENABLE_LOGGING)
|
|
list(APPEND DL_LIBS ${CMAKE_DL_LIBS} Threads::Threads) # dladdr function
|
|
endif()
|
|
target_link_libraries(vtkm_cont PUBLIC vtkm_compiler_flags ${backends} ${DL_LIBS})
|
|
if(TARGET vtkm_diy)
|
|
# This will become a required dependency eventually.
|
|
target_link_libraries(vtkm_cont PUBLIC vtkm_diy vtkm_taotuple)
|
|
endif()
|
|
|
|
#-----------------------------------------------------------------------------
|
|
add_subdirectory(testing)
|