gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-01-05 14:07:27 -08:00
Code Issues Projects Releases Wiki Activity

sci-libs/vtk: add 9.5.2

Browse Source 
Bug: https://bugs.gentoo.org/963035
Closes: https://bugs.gentoo.org/966144
Closes: https://bugs.gentoo.org/965701
Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/44665
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Paul Zander 2025-11-11 14:16:18 +01:00 committed by Sam James
parent 3cf263ce62
commit 84b0ebc2a6
No known key found for this signature in database
GPG Key ID: 738409F520DF9190
5 changed files with 1222 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sci-libs/vtk/Manifest
View File

@ -1,6 +1,12 @@
DIST VTK-9.4.2.tar.gz 118621433 BLAKE2B 5e9ffff915e41fad349cb0fc7aba3620e946362a6e91f7291c1a052691cbebfa3d5cb2a686e561f99f44a8aa608caa2d0201ce8b7cabed6337378bf354b69390 SHA512 740919c9b63ad91c5ae45b90b502585a78e9f08b32f06308c475d874decc1e99e813c49c67d37586886ad4860e61630cd51569747003dcf88b3fb744c481f515
DIST VTK-9.5.2.tar.gz 50189467 BLAKE2B 6e7dab56c4f48d066ca44637f8839e9abc973d2831381ef5aec860aa1daa49ac9beca223e439c12dda2c33056b45395043f2edc54f55f9d169719b6c96499f40 SHA512 fc8157a89fa603a7f7fce356e2f638ae69e0ea629a507458bdbb173daf511c61e39a1f0d7201b196a5b3a7ffa7e3e821398b62521faadf85edb1119a1e8b8e8e
DIST VTKData-9.4.2.tar.gz 1095344755 BLAKE2B d995ef59df2d12c85bd8b44280cec3b7b7a9a494ae19c68eda432310e07d92f6da8649f89dd75485c40d49c86ce28bf8e120900a9cb4545454154e04909866b1 SHA512 a379d442ad4f378c961aef3e285b87b633412eddc7b28f99893d34c700ce07eae5267dd33e29fd1aa065095e541145cd5baba3d6c54d9da3e00aea0b7573c51c
DIST VTKData-9.5.2.tar.gz 1096057742 BLAKE2B 3c50adba539e7457268cd122246361e2161a003264cf4df6a3c7c3b62e9f35026588ad046112c0dd0b8360f6f8f67d5fc6f034bd5cdd4bb67d746dcf2ebb2a86 SHA512 1be895bed613ed0f0ace0ba5e138afacc3d61b57e437299b3aecf6beff702ad1a2d02036fd147853bbbcb6a1f9d20a51831c0263fdc5b8e62ece9a6f8f7d410e
DIST VTKDataFiles-9.4.2.tar.gz 1127688904 BLAKE2B 7cf79325e3d8b5eb935f936321b5465c77a1764afeb9206c2709cca48044f686cd7a3e450686c145a4d9b47b32c9f1e8b8661b499ea30e1c2c47f9200eb6d1d9 SHA512 93bcc16ef7989d2e76effb9b6f778f50f9d0048d1c2a89fa55a6c2c9c8ae228d22cea77f588a729db82c0ab0e87cbd37053c228600fcb9f5734caa3cb714fb7a
DIST VTKDataFiles-9.5.2.tar.gz 1128658332 BLAKE2B c3c3e259479f78bb0cc60b48e00d3fad21dd8bb924e16b87801d230c2f684fc04431873eb7fd5617cb93a09319038f835da17357888ba207f4e10faf19bf6c01 SHA512 f3503fea75aa248fb5b225e4e6437fe47b2eabdc39ffd4113e5f87a5d9edd232afef7e21375e40cf3a6e979f399a7fcc5bdc0b09a6759a2baa491eb360ce0c8b
DIST VTKLargeData-9.4.2.tar.gz 247520755 BLAKE2B d006a0b5a9296332cafcee0917dab1db76e90fa145dbb3093b82dcb668ef38947db97711a00d5013e16147eb3df3cad0f501262897ba342741fa1205a115f31f SHA512 7e896f7b3ee2a454f24bd4b55fe10658d90abd4352ca4d1baed4c67c2606dda7a408ca4d807b05362e311432c0961df0cddfa5236e3aa233ddf28e4a3d48cd58
DIST VTKLargeData-9.5.2.tar.gz 247524517 BLAKE2B 439daacebf50ff65019b42ba3f9a244428ea1d49951e135a655acd65342d6a7ee6a01c313b2565e574910218eebdd8e0291ecfc4c6615b3111050b7233d5a7c8 SHA512 f1ee327bc9ffa4f4055e169b940239031c00e18a3109bb720c5bcc3a68821761c2d5eb573db5245956721cf534b58d3fa737c2ecdac8c90cd3dada565c1a40d5
DIST VTKLargeDataFiles-9.4.2.tar.gz 247504324 BLAKE2B 650b1f8b9bc8a386a3172fa091cb27dbdfdfe8a7317d7afe109ec4273bfbf3bb67c947e83b7ae47a096327cfba9bc5d655375a7ae7ff46b85291ed684f2f3497 SHA512 c43b3b46a2a3a3ad5938d4b3b323cab8cc51591c9a514abf6fdb33a51009572c6fdb0653b3e49ebe594ab6ff204dbe49f4d9d34a3fb0d56db1b2392674301d02
DIST VTKLargeDataFiles-9.5.2.tar.gz 247505288 BLAKE2B 49c02df1cda16b0ff8b447d3785afaef56c15aa447f4bc464676a2b52cd9f9812221e566480ca17990538f69f84ea818b5776c422105a3eb53dc63d5518ca0de SHA512 1ee7beba1ca7eeabe634cf31ff2c377ea708fa0ddd40b60e90ab582e4e439ad130a84449d138040f2c47741026ace4613272409f2b958ebc315a55f62a1fa7e8
DIST vtkDocHtml-9.4.2.tar.gz 191366459 BLAKE2B 36edb0abc9b72def067fc8ce937c7f3154b071a73932634d753ab112436cf66a4b2b5ccc5f2a474ada4d869c4b61457e514bb2e52c4ccf3fb7d27150aadaed4c SHA512 3beb5c1e49f897d320069517134b34ce9bb8ef21a38f95f76e9e06a7bd260532e62e540b3e684daa93641525fe0097d272edfe8370a2a4eb72176d0fd3575b87
DIST vtkDocHtml-9.5.2.tar.gz 193518054 BLAKE2B 1af2d23d049dbd0ccf6307b3fa0a25c917850c70c7e5ce14e76b02baa7fd4d9be1c2f453dfd1a54b3da30ff8ee5ac374d1ad41225cc6affb3ac29ca037d20687 SHA512 76b572f4b4a0bc4c7573334522017578e2eb1cfd83bdc973c515b65ec23a4fe8e2d7914cc1d4c78d574187068df918ccb575904252f96d88ed94428460698721

99
sci-libs/vtk/files/vtk-9.5.0-cuda-13-1.patch Normal file
View File

@ -0,0 +1,99 @@
From 00d84bf753a0f4d79ea3025c04862d0308cbcb6b Mon Sep 17 00:00:00 2001
From: Paul Zander <negril.nx+gentoo@gmail.com>
Date: Mon, 25 Aug 2025 21:14:03 +0200
Subject: [PATCH] cuda 13
Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
diff --git a/ThirdParty/viskores/vtkviskores/viskores/viskores/cont/cuda/internal/CudaAllocator.cu b/ThirdParty/viskores/vtkviskores/viskores/viskores/cont/cuda/internal/CudaAllocator.cu
index cc2da2b..ad382ee 100644
--- a/ThirdParty/viskores/vtkviskores/viskores/viskores/cont/cuda/internal/CudaAllocator.cu
+++ b/ThirdParty/viskores/vtkviskores/viskores/viskores/cont/cuda/internal/CudaAllocator.cu
@@ -284,10 +284,14 @@ void CudaAllocator::PrepareForControl(const void* ptr, std::size_t numBytes)
{
if (IsManagedPointer(ptr) && numBytes >= Threshold)
{
+ // Create device location with specific device ID
+ cudaMemLocation hostLoc;
+ hostLoc.type = cudaMemLocationTypeHost;
+
// TODO these hints need to be benchmarked and adjusted once we start
// sharing the pointers between cont/exec
- VISKORES_CUDA_CALL(cudaMemAdvise(ptr, numBytes, cudaMemAdviseSetAccessedBy, cudaCpuDeviceId));
- VISKORES_CUDA_CALL(cudaMemPrefetchAsync(ptr, numBytes, cudaCpuDeviceId, cudaStreamPerThread));
+ VISKORES_CUDA_CALL(cudaMemAdvise(ptr, numBytes, cudaMemAdviseSetAccessedBy, hostLoc));
+ VISKORES_CUDA_CALL(cudaMemPrefetchAsync(ptr, numBytes, hostLoc, 0));
}
}
@@ -299,10 +303,15 @@ void CudaAllocator::PrepareForInput(const void* ptr, std::size_t numBytes)
viskores::cont::RuntimeDeviceInformation()
.GetRuntimeConfiguration(viskores::cont::DeviceAdapterTagCuda())
.GetDeviceInstance(dev);
+
+ cudaMemLocation deviceLoc;
+ deviceLoc.type = cudaMemLocationTypeDevice;
+ deviceLoc.id = dev;
+
// VISKORES_CUDA_CALL(cudaMemAdvise(ptr, numBytes, cudaMemAdviseSetPreferredLocation, dev));
// VISKORES_CUDA_CALL(cudaMemAdvise(ptr, numBytes, cudaMemAdviseSetReadMostly, dev));
- VISKORES_CUDA_CALL(cudaMemAdvise(ptr, numBytes, cudaMemAdviseSetAccessedBy, dev));
- VISKORES_CUDA_CALL(cudaMemPrefetchAsync(ptr, numBytes, dev, cudaStreamPerThread));
+ VISKORES_CUDA_CALL(cudaMemAdvise(ptr, numBytes, cudaMemAdviseSetAccessedBy, deviceLoc));
+ VISKORES_CUDA_CALL(cudaMemPrefetchAsync(ptr, numBytes, deviceLoc, 0, cudaStreamPerThread));
}
}
@@ -314,10 +323,15 @@ void CudaAllocator::PrepareForOutput(const void* ptr, std::size_t numBytes)
viskores::cont::RuntimeDeviceInformation()
.GetRuntimeConfiguration(viskores::cont::DeviceAdapterTagCuda())
.GetDeviceInstance(dev);
+
+ cudaMemLocation deviceLoc;
+ deviceLoc.type = cudaMemLocationTypeDevice;
+ deviceLoc.id = dev;
+
// VISKORES_CUDA_CALL(cudaMemAdvise(ptr, numBytes, cudaMemAdviseSetPreferredLocation, dev));
// VISKORES_CUDA_CALL(cudaMemAdvise(ptr, numBytes, cudaMemAdviseUnsetReadMostly, dev));
- VISKORES_CUDA_CALL(cudaMemAdvise(ptr, numBytes, cudaMemAdviseSetAccessedBy, dev));
- VISKORES_CUDA_CALL(cudaMemPrefetchAsync(ptr, numBytes, dev, cudaStreamPerThread));
+ VISKORES_CUDA_CALL(cudaMemAdvise(ptr, numBytes, cudaMemAdviseSetAccessedBy, deviceLoc));
+ VISKORES_CUDA_CALL(cudaMemPrefetchAsync(ptr, numBytes, deviceLoc, 0, cudaStreamPerThread));
}
}
@@ -329,10 +343,15 @@ void CudaAllocator::PrepareForInPlace(const void* ptr, std::size_t numBytes)
viskores::cont::RuntimeDeviceInformation()
.GetRuntimeConfiguration(viskores::cont::DeviceAdapterTagCuda())
.GetDeviceInstance(dev);
+
+ cudaMemLocation deviceLoc;
+ deviceLoc.type = cudaMemLocationTypeDevice;
+ deviceLoc.id = dev;
+
// VISKORES_CUDA_CALL(cudaMemAdvise(ptr, numBytes, cudaMemAdviseSetPreferredLocation, dev));
// VISKORES_CUDA_CALL(cudaMemAdvise(ptr, numBytes, cudaMemAdviseUnsetReadMostly, dev));
- VISKORES_CUDA_CALL(cudaMemAdvise(ptr, numBytes, cudaMemAdviseSetAccessedBy, dev));
- VISKORES_CUDA_CALL(cudaMemPrefetchAsync(ptr, numBytes, dev, cudaStreamPerThread));
+ VISKORES_CUDA_CALL(cudaMemAdvise(ptr, numBytes, cudaMemAdviseSetAccessedBy, deviceLoc));
+ VISKORES_CUDA_CALL(cudaMemPrefetchAsync(ptr, numBytes, deviceLoc, 0, cudaStreamPerThread));
}
}
diff --git a/ThirdParty/viskores/vtkviskores/viskores/viskores/Swap.h b/ThirdParty/viskores/vtkviskores/viskores/viskores/Swap.h
index 918075e..4d380db 100644
--- a/ThirdParty/viskores/vtkviskores/viskores/viskores/Swap.h
+++ b/ThirdParty/viskores/vtkviskores/viskores/viskores/Swap.h
@@ -41,7 +41,8 @@ namespace viskores
// defined in the `viskores` namespace as an argument. If that function has an unqualified call to
// `Swap`, it results in ADL being used, causing the templated functions `cub::Swap` and
// `viskores::Swap` to conflict.
-#if defined(VISKORES_CUDA_VERSION_MAJOR) && (VISKORES_CUDA_VERSION_MAJOR >= 12)
+// This was deprecated in favour of `cuda::std::swap` in CUDA 13.
+#if defined(VISKORES_CUDA_VERSION_MAJOR) && (VISKORES_CUDA_VERSION_MAJOR == 12)
using cub::Swap;
#else
template <typename T>
--
2.51.0

94
sci-libs/vtk/files/vtk-9.5.0-cuda-13-2.patch Normal file
View File

@ -0,0 +1,94 @@
From 5a12651b95801fce812b02bf8f854e9f5a332f6e Mon Sep 17 00:00:00 2001
From: Paul Zander <negril.nx+gentoo@gmail.com>
Date: Tue, 5 Aug 2025 15:17:29 +0200
Subject: [PATCH] vtk-9.5.0 cuda-13
Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
diff --git a/Examples/Emscripten/Cxx/WrappedAsyncClipper/CMakeLists.txt b/Examples/Emscripten/Cxx/WrappedAsyncClipper/CMakeLists.txt
index c7762f3..fbf67a2 100644
--- a/Examples/Emscripten/Cxx/WrappedAsyncClipper/CMakeLists.txt
+++ b/Examples/Emscripten/Cxx/WrappedAsyncClipper/CMakeLists.txt
@@ -26,7 +26,7 @@ find_package(VTK
# Compile example code
# -----------------------------------------------------------------------------
add_executable(WrappedAsyncClipper WrappedAsyncClipper.cxx WrappedAsyncClipper.h)
-target_compile_features(WrappedAsyncClipper PRIVATE cxx_std_14) # for initialized lambda captures
+target_compile_features(WrappedAsyncClipper PRIVATE cxx_std_17) # for initialized lambda captures
target_link_libraries(WrappedAsyncClipper PRIVATE ${VTK_LIBRARIES})
# -----------------------------------------------------------------------------
diff --git a/ThirdParty/viskores/vtkviskores/viskores/CMake/ViskoresCompilerFlags.cmake b/ThirdParty/viskores/vtkviskores/viskores/CMake/ViskoresCompilerFlags.cmake
index 246b587..5dd37c2 100644
--- a/ThirdParty/viskores/vtkviskores/viskores/CMake/ViskoresCompilerFlags.cmake
+++ b/ThirdParty/viskores/vtkviskores/viskores/CMake/ViskoresCompilerFlags.cmake
@@ -54,7 +54,7 @@ target_link_libraries(viskores_compiler_flags
INTERFACE $<BUILD_INTERFACE:viskores_vectorization_flags>)
# setup that we need C++14 support
-target_compile_features(viskores_compiler_flags INTERFACE cxx_std_14)
+target_compile_features(viskores_compiler_flags INTERFACE cxx_std_17)
# setup our static libraries so that a separate ELF section
# is generated for each function. This allows for the linker to
diff --git a/ThirdParty/viskores/vtkviskores/viskores/CMake/ViskoresDeviceAdapters.cmake b/ThirdParty/viskores/vtkviskores/viskores/CMake/ViskoresDeviceAdapters.cmake
index d1df6aa..232df64 100644
--- a/ThirdParty/viskores/vtkviskores/viskores/CMake/ViskoresDeviceAdapters.cmake
+++ b/ThirdParty/viskores/vtkviskores/viskores/CMake/ViskoresDeviceAdapters.cmake
@@ -106,10 +106,14 @@ if(Viskores_ENABLE_CUDA)
target_compile_options(viskores_cuda INTERFACE $<$<COMPILE_LANGUAGE:CUDA>:--expt-relaxed-constexpr>)
- if(CMAKE_CUDA_COMPILER_ID STREQUAL "NVIDIA" AND
- CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL 11.0)
- # CUDA 11+ deprecated C++11 support
- target_compile_features(viskores_cuda INTERFACE cxx_std_14)
+ if(CMAKE_CUDA_COMPILER_ID STREQUAL "NVIDIA")
+ if(CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL 13.0)
+ # CUDA 13+ deprecated C++14 support
+ target_compile_features(viskores_cuda INTERFACE cxx_std_17)
+ elseif(CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL 11.0)
+ # CUDA 11+ deprecated C++11 support
+ target_compile_features(viskores_cuda INTERFACE cxx_std_17)
+ endif()
endif()
# If we have specified CMAKE_CUDA_ARCHITECTURES and CMake >= 3.18 we are
diff --git a/ThirdParty/viskores/vtkviskores/viskores/CMakeLists.txt b/ThirdParty/viskores/vtkviskores/viskores/CMakeLists.txt
index 40289e1..5f4ca11 100644
--- a/ThirdParty/viskores/vtkviskores/viskores/CMakeLists.txt
+++ b/ThirdParty/viskores/vtkviskores/viskores/CMakeLists.txt
@@ -20,7 +20,7 @@ cmake_minimum_required(VERSION 3.15 FATAL_ERROR)
project (Viskores)
# We only allow c++14
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
# When using C++14 support make sure you use the standard C++ extensions rather
diff --git a/ThirdParty/viskores/vtkviskores/viskores/viskores/thirdparty/diy/viskoresdiy/CMakeLists.txt b/ThirdParty/viskores/vtkviskores/viskores/viskores/thirdparty/diy/viskoresdiy/CMakeLists.txt
index d7aee18..86b592d 100644
--- a/ThirdParty/viskores/vtkviskores/viskores/viskores/thirdparty/diy/viskoresdiy/CMakeLists.txt
+++ b/ThirdParty/viskores/vtkviskores/viskores/viskores/thirdparty/diy/viskoresdiy/CMakeLists.txt
@@ -161,7 +161,7 @@ function(add_diy_mpi_library use_mpi)
add_library(${lib_name} ${sources})
set_target_properties(${lib_name} PROPERTIES POSITION_INDEPENDENT_CODE ON)
- target_compile_features(${lib_name} PRIVATE cxx_std_14)
+ target_compile_features(${lib_name} PRIVATE cxx_std_17)
target_compile_definitions(${lib_name}
PRIVATE -DVISKORESDIY_HAS_MPI=${has_mpi_val}
PRIVATE -Ddiy=${diy_prefix} # mangle diy namespace
@@ -207,7 +207,7 @@ if (build_diy_mpi_lib)
endif() # build_diy_mpi_lib
add_library(${diy_prefix} INTERFACE)
-target_compile_features(${diy_prefix} INTERFACE cxx_std_14)
+target_compile_features(${diy_prefix} INTERFACE cxx_std_17)
target_compile_definitions(${diy_prefix} INTERFACE ${diy_definitions})
target_include_directories(${diy_prefix} SYSTEM INTERFACE
"$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>"
--
2.50.1

3
sci-libs/vtk/metadata.xml
View File

@ -27,7 +27,8 @@
<flag name="rendering">Building Redering modules</flag>
<flag name="tbb">Use <pkg>dev-cpp/tbb</pkg> to handle smp support</flag>
<flag name="views">Building Views modules</flag>
<flag name="vtkm">Build the vtkm accelerations modules</flag>
<flag name="vtkm" restrict="&lt;sci-libs/vtk-9.5">Build the vtkm accelerations modules</flag>
<flag name="vtkm" restrict="&gt;=sci-libs/vtk-9.5">Build the viskores accelerations modules</flag>
<flag name="web">Install web component</flag>
</use>
<upstream>

1021
sci-libs/vtk/vtk-9.5.2.ebuild Normal file
View File

File diff suppressed because it is too large Load Diff