mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-26 01:30:55 +08:00
[magma] Fix build for Windows with CUDA 12.6 (#41097)
This commit is contained in:
parent
ede6765542
commit
92133e398a
60
ports/magma/fix-min-max.patch
Normal file
60
ports/magma/fix-min-max.patch
Normal file
@ -0,0 +1,60 @@
|
||||
diff --git a/magmablas/cgbtf2_kernels.cu b/magmablas/cgbtf2_kernels.cu
|
||||
index 1b44273..e769534 100644
|
||||
--- a/magmablas/cgbtf2_kernels.cu
|
||||
+++ b/magmablas/cgbtf2_kernels.cu
|
||||
@@ -12,6 +12,10 @@
|
||||
|
||||
#include "magma_internal.h"
|
||||
#if defined(MAGMA_HAVE_CUDA)
|
||||
+#if CUDA_VERSION >= 12060
|
||||
+#undef max
|
||||
+#undef min
|
||||
+#endif
|
||||
#include <cooperative_groups.h>
|
||||
namespace cg = cooperative_groups;
|
||||
#elif defined(MAGMA_HAVE_HIP)
|
||||
diff --git a/magmablas/dgbtf2_kernels.cu b/magmablas/dgbtf2_kernels.cu
|
||||
index c2af4f4..c2e0b4d 100644
|
||||
--- a/magmablas/dgbtf2_kernels.cu
|
||||
+++ b/magmablas/dgbtf2_kernels.cu
|
||||
@@ -12,6 +12,10 @@
|
||||
|
||||
#include "magma_internal.h"
|
||||
#if defined(MAGMA_HAVE_CUDA)
|
||||
+#if CUDA_VERSION >= 12060
|
||||
+#undef max
|
||||
+#undef min
|
||||
+#endif
|
||||
#include <cooperative_groups.h>
|
||||
namespace cg = cooperative_groups;
|
||||
#elif defined(MAGMA_HAVE_HIP)
|
||||
diff --git a/magmablas/sgbtf2_kernels.cu b/magmablas/sgbtf2_kernels.cu
|
||||
index bbc691a..752c5f7 100644
|
||||
--- a/magmablas/sgbtf2_kernels.cu
|
||||
+++ b/magmablas/sgbtf2_kernels.cu
|
||||
@@ -12,6 +12,10 @@
|
||||
|
||||
#include "magma_internal.h"
|
||||
#if defined(MAGMA_HAVE_CUDA)
|
||||
+#if CUDA_VERSION >= 12060
|
||||
+#undef max
|
||||
+#undef min
|
||||
+#endif
|
||||
#include <cooperative_groups.h>
|
||||
namespace cg = cooperative_groups;
|
||||
#elif defined(MAGMA_HAVE_HIP)
|
||||
diff --git a/magmablas/zgbtf2_kernels.cu b/magmablas/zgbtf2_kernels.cu
|
||||
index c1afa3b..3ea8136 100644
|
||||
--- a/magmablas/zgbtf2_kernels.cu
|
||||
+++ b/magmablas/zgbtf2_kernels.cu
|
||||
@@ -12,6 +12,10 @@
|
||||
|
||||
#include "magma_internal.h"
|
||||
#if defined(MAGMA_HAVE_CUDA)
|
||||
+#if CUDA_VERSION >= 12060
|
||||
+#undef max
|
||||
+#undef min
|
||||
+#endif
|
||||
#include <cooperative_groups.h>
|
||||
namespace cg = cooperative_groups;
|
||||
#elif defined(MAGMA_HAVE_HIP)
|
@ -17,10 +17,11 @@ vcpkg_download_distfile(
|
||||
vcpkg_extract_source_archive(
|
||||
src_path
|
||||
ARCHIVE "${dist_file}"
|
||||
PATCHES
|
||||
PATCHES
|
||||
disable-openmp-msvc.patch
|
||||
no-tests.patch
|
||||
clang-cuda.patch
|
||||
fix-min-max.patch
|
||||
)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
|
@ -1,6 +1,7 @@
|
||||
{
|
||||
"name": "magma",
|
||||
"version": "2.8.0",
|
||||
"port-version": 1,
|
||||
"description": "Matrix Algebra on GPU and Multi-core Architectures (MAGMA) is a collection of next-generation linear algebra libraries for heterogeneous computing",
|
||||
"homepage": "https://icl.utk.edu/magma/",
|
||||
"license": null,
|
||||
|
@ -5662,7 +5662,7 @@
|
||||
},
|
||||
"magma": {
|
||||
"baseline": "2.8.0",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"magnum": {
|
||||
"baseline": "2020.06",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "1f027fdb55e2bea18637a7cbe85c2ea544ee2f6d",
|
||||
"version": "2.8.0",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "07a55182c9e5bace6cbaff6e08c77a54fdcdcdbc",
|
||||
"version": "2.8.0",
|
||||
|
Loading…
x
Reference in New Issue
Block a user