Revert to the upstream CUDA 12 migration

The pybind11 issue (pybind/pybind11#4606) requiring a deviation from the upstream migration in conda-forge-pinning-feedstock should be fixed in the latest release (2.12).
wshanks · Apr 5, 2024 · bc96799 · bc96799
1 parent 6f295c3
commit bc96799
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/.ci_support/migrations/cuda120.yaml b/.ci_support/migrations/cuda120.yaml
@@ -2,10 +2,6 @@ migrator_ts: 1682985063
 __migrator:
   kind:
     version
-  # Vendor CUDA 12 migrator to use GCC 11.
-  # This is needed to workaround a pybind + GCC 12 + nvcc 12 bug
-  # xref: https://github.com/pybind/pybind11/issues/4606
-  use_local: true
   migration_number:
     3
   build_number:
@@ -86,13 +82,13 @@ cuda_compiler_version:         # [(linux or win64) and os.environ.get("CF_CUDA_E
   - 12.0                       # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
 
 c_compiler_version:            # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
-  - 11                         # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
+  - 12                         # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
 
 cxx_compiler_version:          # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
-  - 11                         # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
+  - 12                         # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
 
 fortran_compiler_version:      # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
-  - 11                         # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
+  - 12                         # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
 
 cdt_name:                      # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
   - cos7                       # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -54,7 +54,7 @@ requirements:
   build:
     - python                                 # [build_platform != target_platform]
     - cross-python_{{ target_platform }}     # [build_platform != target_platform]
-    - pybind11                               # [build_platform != target_platform]
+    - pybind11 >=2.12.0                      # [build_platform != target_platform]
     - {{ compiler('cxx') }}
     - {{ compiler('cuda') }}  # [cuda_compiler != "None"]
     - cmake !=3.17,>=3.8
@@ -71,7 +71,7 @@ requirements:
     - nlohmann_json <=3.10.2
     - pip
     - python
-    - pybind11
+    - pybind11 >=2.12.0  # This constraint is for CUDA 12 and numpy 2.0, not for qiskit-aer
     - scikit-build >=0.11.0
     - setuptools >=40.1.0
     - spdlog