Skip to content

Commit

Permalink
Clean up C build dependencies (and bump Qiskit) (#32)
Browse files Browse the repository at this point in the history
* Clean up C build dependencies (and bump Qiskit)

* Remove muparserx which is not needed as of version 0.13
* Patch out muparserx cmake configuration
* Ignore run exports from spdlog. Only its headers are used at build
  time.
* Make numpy a run dependency only. Qiskit Aer interfaces with numpy
  through the pybind11 headers and does not link directly to numpy.
* Make the nlohmann_json bounds consistent across environments instead
  of special for osx arm64.
* Increase qiskit minimum version
* Add missing psutil dependency
  - This was missed before and being pulled in by Qiskit (which recently
dropped it as a dependency).
* Increment build number
* 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).
* MNT: Re-rendered with conda-build 3.28.3, conda-smithy 3.34.1, and conda-forge-pinning 2024.04.05.13.18.18

---------

Co-authored-by: conda-forge-webservices[bot] <91080706+conda-forge-webservices[bot]@users.noreply.github.com>
  • Loading branch information
wshanks and conda-forge-webservices[bot] committed Apr 5, 2024
1 parent a9b4626 commit 6c2838d
Show file tree
Hide file tree
Showing 43 changed files with 358 additions and 311 deletions.
61 changes: 31 additions & 30 deletions .azure-pipelines/azure-pipelines-linux.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

41 changes: 21 additions & 20 deletions .azure-pipelines/azure-pipelines-osx.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions .azure-pipelines/azure-pipelines-win.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
cdt_name:
- cos6
channel_sources:
Expand All @@ -18,8 +22,6 @@ libblas:
- 3.9 *netlib
liblapack:
- 3.9 *netlib
numpy:
- '1.22'
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -32,9 +34,8 @@ target_platform:
- linux-64
zip_keys:
- - cxx_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
- - python
- numpy
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
cdt_name:
- cos6
channel_sources:
Expand All @@ -18,8 +22,6 @@ libblas:
- 3.9 *netlib
liblapack:
- 3.9 *netlib
numpy:
- '1.23'
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -32,9 +34,8 @@ target_platform:
- linux-64
zip_keys:
- - cxx_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
- - python
- numpy
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
cdt_name:
- cos6
channel_sources:
Expand All @@ -18,8 +22,6 @@ libblas:
- 3.9 *netlib
liblapack:
- 3.9 *netlib
numpy:
- '1.26'
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -32,9 +34,8 @@ target_platform:
- linux-64
zip_keys:
- - cxx_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
- - python
- numpy
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
cdt_name:
- cos6
channel_sources:
Expand All @@ -18,8 +22,6 @@ libblas:
- 3.9 *netlib
liblapack:
- 3.9 *netlib
numpy:
- '1.22'
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -32,9 +34,8 @@ target_platform:
- linux-64
zip_keys:
- - cxx_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
- - python
- numpy
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
cdt_name:
- cos6
channel_sources:
Expand All @@ -18,8 +22,6 @@ libblas:
- 3.9 *netlib
liblapack:
- 3.9 *netlib
numpy:
- '1.22'
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -32,9 +34,8 @@ target_platform:
- linux-64
zip_keys:
- - cxx_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
- - python
- numpy
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
channel_sources:
Expand All @@ -11,15 +15,13 @@ cuda_compiler_version:
cxx_compiler:
- gxx
cxx_compiler_version:
- '11'
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libblas:
- 3.9 *netlib
liblapack:
- 3.9 *netlib
numpy:
- '1.22'
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -32,9 +34,8 @@ target_platform:
- linux-64
zip_keys:
- - cxx_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
- - python
- numpy

0 comments on commit 6c2838d

Please sign in to comment.