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

Merge branch 'histogram_worklet' into new_filter_clean_up

Browse Source
This commit is contained in:
Li-Ta Lo 2022-02-02 10:20:13 -07:00
commit e48cc867b2
9 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtkm/filter/density_estimate/worklet/CMakeLists.txt
View File

@ -15,3 +15,5 @@ set(headers
NDimsHistogram.h)
vtkm_declare_headers(${headers})
add_subdirectory(histogram)

2
vtkm/filter/density_estimate/worklet/NDimsEntropy.h
View File

@ -16,9 +16,9 @@
#include <vtkm/cont/ArrayHandle.h>
#include <vtkm/cont/ArrayHandleCounting.h>
#include <vtkm/filter/density_estimate/worklet/NDimsHistogram.h>
#include <vtkm/filter/density_estimate/worklet/histogram/ComputeNDEntropy.h>
#include <vtkm/worklet/DispatcherMapField.h>
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/histogram/ComputeNDEntropy.h>
#include <vtkm/cont/Field.h>

2
vtkm/filter/density_estimate/worklet/NDimsHistogram.h
View File

@ -18,9 +18,9 @@
#include <vtkm/cont/ArrayHandleCounting.h>
#include <vtkm/cont/DataSet.h>
#include <vtkm/cont/ErrorBadValue.h>
#include <vtkm/filter/density_estimate/worklet/histogram/ComputeNDHistogram.h>
#include <vtkm/worklet/DispatcherMapField.h>
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/histogram/ComputeNDHistogram.h>
#include <vtkm/cont/Field.h>

0
vtkm/worklet/histogram/CMakeLists.txt → vtkm/filter/density_estimate/worklet/histogram/CMakeLists.txt
View File

0
vtkm/worklet/histogram/ComputeNDEntropy.h → vtkm/filter/density_estimate/worklet/histogram/ComputeNDEntropy.h
View File

1
vtkm/worklet/histogram/ComputeNDHistogram.h → vtkm/filter/density_estimate/worklet/histogram/ComputeNDHistogram.h
View File

@ -15,6 +15,7 @@
#include <vtkm/cont/ArrayGetValues.h>
#include <vtkm/worklet/DispatcherMapField.h>
#include <vtkm/worklet/WorkletMapField.h>
namespace vtkm
{

0
vtkm/worklet/histogram/MarginalizeNDHistogram.h → vtkm/filter/density_estimate/worklet/histogram/MarginalizeNDHistogram.h
View File

1
vtkm/worklet/CMakeLists.txt
View File

@ -102,7 +102,6 @@ add_subdirectory(contourtree)
add_subdirectory(contourtree_augmented)
add_subdirectory(contourtree_distributed)
add_subdirectory(cosmotools)
add_subdirectory(histogram)
add_subdirectory(lcs)
add_subdirectory(mir)
add_subdirectory(moments)

4
vtkm/worklet/NDimsHistMarginalization.h
View File

@ -17,10 +17,10 @@
#include <vtkm/cont/ArrayHandle.h>
#include <vtkm/cont/ArrayHandleCounting.h>
#include <vtkm/cont/DataSet.h>
#include <vtkm/filter/density_estimate/worklet/histogram/ComputeNDHistogram.h>
#include <vtkm/filter/density_estimate/worklet/histogram/MarginalizeNDHistogram.h>
#include <vtkm/worklet/DispatcherMapField.h>
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/histogram/ComputeNDHistogram.h>
#include <vtkm/worklet/histogram/MarginalizeNDHistogram.h>
#include <vtkm/cont/Field.h>