zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update vtk-m with pinned version for ascent and related packages (#17498)

Browse Source 
* add ascent_ver to vtk-m pkg

* vtk-m:: add patches used by ascent
This commit is contained in:
Cyrus Harrison 2020-07-13 14:56:45 -07:00 committed by GitHub
parent 299dcdd3eb
commit c2d8d8acbd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
var/spack/repos/builtin/packages/vtk-m/disable_flying_edges.patch Normal file
View File

@ -0,0 +1,14 @@
diff --git a/vtkm/worklet/Contour.h b/vtkm/worklet/Contour.h
index c28c5ec09..70737777f 100644
--- a/vtkm/worklet/Contour.h
+++ b/vtkm/worklet/Contour.h
@@ -46,7 +46,8 @@ struct DeduceCoordType
vtkm::cont::CellSetSingleType<>& result,
Args&&... args) const
{
- result = flying_edges::execute(cells, coords, std::forward<Args>(args)...);
+ result = marching_cells::execute(cells, coords, std::forward<Args>(args)...);
+ //result = flying_edges::execute(cells, coords, std::forward<Args>(args)...);
}
};

6
var/spack/repos/builtin/packages/vtk-m/package.py
View File

@ -30,7 +30,11 @@ class VtkM(CMakePackage, CudaPackage):
version('1.3.0', sha256="f88c1b0a1980f695240eeed9bcccfa420cc089e631dc2917c9728a2eb906df2e")
version('1.2.0', sha256="607272992e05f8398d196f0acdcb4af025a4a96cd4f66614c6341f31d4561763")
version('1.1.0', sha256="78618c81ca741b1fbba0853cb5d7af12c51973b514c268fc96dfb36b853cdb18")
# version used by ascent
version('ascent_ver', commit="a3b8525ef97d94996ae843db0dd4f675c38e8b1e")
# patches, required for ascent
patch('vtkmdiy_fpic.patch', when='@ascent_ver')
patch('disable_flying_edges.patch', when='@ascent_ver')
# use release, instead of release with debug symbols b/c vtkm libs
# can overwhelm compilers with too many symbols
variant('build_type', default='Release', description='CMake build type',

12
var/spack/repos/builtin/packages/vtk-m/vtkmdiy_fpic.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/vtkm/thirdparty/diy/vtkmdiy/CMakeLists.txt b/vtkm/thirdparty/diy/vtkmdiy/CMakeLists.txt
index 5211330..3e991f3 100644
--- a/vtkm/thirdparty/diy/vtkmdiy/CMakeLists.txt
+++ b/vtkm/thirdparty/diy/vtkmdiy/CMakeLists.txt
@@ -139,6 +139,7 @@ function(add_diy_mpi_library use_mpi)
endif()
add_library(${lib_name} ${sources})
+ set_property(TARGET ${lib_name} PROPERTY POSITION_INDEPENDENT_CODE ON)
target_compile_features(${lib_name} PRIVATE cxx_std_11)
target_compile_definitions(${lib_name}
PRIVATE -DVTKMDIY_HAS_MPI=${has_mpi_val}