Zengtudor
/
pybind11
mirror of https://github.com/pybind/pybind11.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "fix: NVCC 11.4.0 - 11.8.0 host bug workaround (#4220)" 

This reverts commit 6cb214748d.
This commit is contained in:
Henry Schreiner 2022-10-07 21:15:56 -04:00 committed by GitHub
parent 7c6f2f80a7
commit dba00d7369
2 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ci.yml vendored
View File

@ -324,8 +324,8 @@ jobs:
# Testing NVCC; forces sources to behave like .cu files
cuda:
runs-on: ubuntu-latest
name: "🐍 3.10 • CUDA 11.7 • Ubuntu 22.04"
container: nvidia/cuda:11.7.0-devel-ubuntu22.04
name: "🐍 3.8 • CUDA 11.2 • Ubuntu 20.04"
container: nvidia/cuda:11.2.2-devel-ubuntu20.04
steps:
- uses: actions/checkout@v3

17
include/pybind11/pybind11.h
View File

@ -1578,22 +1578,6 @@ public:
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...);
@ -1605,7 +1589,6 @@ public:
op.execute_cast(*this, extra...);
return *this;
}
#endif
template <typename... Args, typename... Extra>
class_ &def(const detail::initimpl::constructor<Args...> &init, const Extra &...extra) {