From c671d6aa804384ce7b24243d1d9df8d0fc8c0b00 Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@plasma.ninja>
Date: Thu, 6 Oct 2022 12:06:05 -0700
Subject: [PATCH 1/3] Work-Around: NVCC 11.4.0 - 11.8.0

Adds a targeted NVCC work around for limited number of CUDA
releases. Fixed in NVCC development.
---
 include/pybind11/pybind11.h | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/include/pybind11/pybind11.h b/include/pybind11/pybind11.h
index c889dc4169..e1f2e3f779 100644
--- a/include/pybind11/pybind11.h
+++ b/include/pybind11/pybind11.h
@@ -1578,6 +1578,21 @@ class class_ : public detail::generic_type {
         return *this;
     }
 
+// Nvidia's NVCC is broken between 11.4.0 and 11.8.0
+//   https://github.com/pybind/pybind11/issues/4193
+#if defined(__CUDACC__) && (__CUDACC_VER_MAJOR__ == 11) && (__CUDACC_VER_MINOR__ >= 4) && (__CUDACC_VER_MINOR__ <= 8)
+    template <typename T, typename... Extra>
+    class_ &def(const T &op, const Extra &...extra) {
+        op.execute(*this, extra...);
+        return *this;
+    }
+
+    template <typename T, typename... Extra>
+    class_ &def_cast(const T &op, const Extra &...extra) {
+        op.execute_cast(*this, extra...);
+        return *this;
+    }
+#else
     template <detail::op_id id, detail::op_type ot, typename L, typename R, typename... Extra>
     class_ &def(const detail::op_<id, ot, L, R> &op, const Extra &...extra) {
         op.execute(*this, extra...);
@@ -1589,6 +1604,7 @@ class class_ : public detail::generic_type {
         op.execute_cast(*this, extra...);
         return *this;
     }
+#endif
 
     template <typename... Args, typename... Extra>
     class_ &def(const detail::initimpl::constructor<Args...> &init, const Extra &...extra) {

From dd2971733764c9a62cabd4309f01e29f9554fdca Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Thu, 6 Oct 2022 19:07:56 +0000
Subject: [PATCH 2/3] style: pre-commit fixes

---
 include/pybind11/pybind11.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/pybind11/pybind11.h b/include/pybind11/pybind11.h
index e1f2e3f779..3f6e27b751 100644
--- a/include/pybind11/pybind11.h
+++ b/include/pybind11/pybind11.h
@@ -1580,7 +1580,8 @@ class class_ : public detail::generic_type {
 
 // Nvidia's NVCC is broken between 11.4.0 and 11.8.0
 //   https://github.com/pybind/pybind11/issues/4193
-#if defined(__CUDACC__) && (__CUDACC_VER_MAJOR__ == 11) && (__CUDACC_VER_MINOR__ >= 4) && (__CUDACC_VER_MINOR__ <= 8)
+#if defined(__CUDACC__) && (__CUDACC_VER_MAJOR__ == 11) && (__CUDACC_VER_MINOR__ >= 4)            \
+    && (__CUDACC_VER_MINOR__ <= 8)
     template <typename T, typename... Extra>
     class_ &def(const T &op, const Extra &...extra) {
         op.execute(*this, extra...);

From 4b853eb119c206dc3d88724ed978639f9491b1bb Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@plasma.ninja>
Date: Thu, 6 Oct 2022 20:27:52 -0700
Subject: [PATCH 3/3] CI: Bump CTK Version 11.2 -> 11.7

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fe57e7ce90..99caabf097 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -324,8 +324,8 @@ jobs:
   # Testing NVCC; forces sources to behave like .cu files
   cuda:
     runs-on: ubuntu-latest
-    name: "🐍 3.8 • CUDA 11.2 • Ubuntu 20.04"
-    container: nvidia/cuda:11.2.2-devel-ubuntu20.04
+    name: "🐍 3.10 • CUDA 11.7 • Ubuntu 22.04"
+    container: nvidia/cuda:11.7.0-devel-ubuntu22.04
 
     steps:
     - uses: actions/checkout@v3