mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 03:09:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[magma] Fix build for Windows with CUDA 12.6 (#41097)

Browse Source
This commit is contained in:
Rahul Sheth 2024-09-24 17:00:23 +00:00 committed by GitHub
parent ede6765542
commit 92133e398a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 69 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
ports/magma/fix-min-max.patch Normal file
View 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)

1
ports/magma/portfile.cmake
View File

@ -21,6 +21,7 @@ vcpkg_extract_source_archive(
disable-openmp-msvc.patch
no-tests.patch
clang-cuda.patch
fix-min-max.patch
)
vcpkg_cmake_configure(

1
ports/magma/vcpkg.json
View File

@ -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,

2
versions/baseline.json
View File

@ -5662,7 +5662,7 @@
},
"magma": {
"baseline": "2.8.0",
"port-version": 0
"port-version": 1
},
"magnum": {
"baseline": "2020.06",

5
versions/m-/magma.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "1f027fdb55e2bea18637a7cbe85c2ea544ee2f6d",
"version": "2.8.0",
"port-version": 1
},
{
"git-tree": "07a55182c9e5bace6cbaff6e08c77a54fdcdcdbc",
"version": "2.8.0",