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

Merge branch 'distributed-contours' of https://gitlab.kitware.com/mingzhefluorite/vtk-m.git into distributed-contours

Browse Source 
# Conflicts:
#	vtkm/filter/scalar_topology/SelectTopVolumeContoursFilter.cxx
#	vtkm/filter/scalar_topology/SelectTopVolumeContoursFilter.h
#	vtkm/filter/scalar_topology/internal/ParentBranchExtremaFunctor.cxx
#	vtkm/filter/scalar_topology/internal/SelectTopVolumeContoursBlock.cxx
This commit is contained in:
Mingzhe Li 2024-07-08 17:08:37 -07:00
commit 5bda11d2fa
4 changed files with 32 additions and 1065 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMake/testing/VTKmPerformanceTest.cmake
View File

@ -76,14 +76,6 @@ function(add_benchmark_test benchmark)
set(VTKm_PERF_COMPARE_JSON "${CMAKE_BINARY_DIR}/$ENV{CI_COMMIT_SHA}_${VTKm_PERF_NAME}.json")
endif()
# Only upload when we are inside a CI build and in master. We need to check
# if VTKM_BENCH_RECORDS_TOKEN is either defined or non-empty, the reason is
# that in Gitlab CI Variables for protected branches are also defined in MR
# from forks, however, they are empty.
if (DEFINED ENV{VTKM_BENCH_RECORDS_TOKEN} AND ENV{VTKM_BENCH_RECORDS_TOKEN})
set(enable_upload TRUE)
endif()
set(test_name "PerformanceTest${VTKm_PERF_NAME}")
###TEST INVOKATIONS##########################################################
@ -125,7 +117,12 @@ function(add_benchmark_test benchmark)
-P "${VTKm_SOURCE_DIR}/CMake/testing/VTKmPerformanceTestReport.cmake"
)
if (enable_upload)
# Only upload when we are inside a CI build and in master. We need to check
# if VTKM_BENCH_RECORDS_TOKEN is non-empty, the reason is that in Gitlab CI
# Variables for protected branches are also defined in MR from forks,
# however, they are empty.
if ($ENV{VTKM_BENCH_RECORDS_TOKEN})
add_test(NAME "${test_name}Upload"
COMMAND ${CMAKE_COMMAND}
"-DVTKm_PERF_REPO=${VTKm_PERF_REPO}"

9
docs/changelog/obsolete-thrust-patch.md Normal file
View File

@ -0,0 +1,9 @@
# Disable Thrust patch that is no longer needed in modern Thrust
There is a Thrust patch that works around an issue in Thrust 1.9.4
(https://github.com/NVIDIA/thrust/issues/972). The underlying issue
should be fixed in recent versions. In recent versions of CUDA, the patch
breaks (https://gitlab.kitware.com/vtk/vtk-m/-/issues/818).
This change fixes the problem by disabling the patch where it is not
needed.

6
vtkm/exec/cuda/internal/ThrustPatches.h
View File

@ -170,9 +170,9 @@ ALIGN_RE_PAIR(vtkm::Int64, vtkm::Float64);
#undef ALIGN_RE_PAIR
}
}
#endif //THRUST_VERSION >= 100900
#endif //THRUST_VERSION >= 100900 && THRUST_VERSION < 100906
#if THRUST_VERSION >= 100904
#if (THRUST_VERSION >= 100904) && (THRUST_VERSION < 100909)
//So for thrust 1.9.4+ (CUDA 10.1+) the stateless_resource_allocator has a bug
//where it is not marked as __host__ __device__ && __thrust_exec_check_disable__.
//To fix this we add a new partial specialization on cuda::memory_resource
@ -236,7 +236,7 @@ public:
};
}
}
#endif //THRUST_VERSION >= 100903
#endif //(THRUST_VERSION >= 100904) && (THRUST_VERSION < 100909)
#if THRUST_VERSION < 100900

1067
vtkm/filter/scalar_topology/SelectTopVolumeContoursFilter.cxx
View File

File diff suppressed because it is too large Load Diff