Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Sep 3, 2025

Summary

Updates the argument definitions for the optimisers to match those in SciPy 1.16, similarly to qiskit-community/qiskit-algorithms#234

Fixes #957


This is an automatic backport of pull request #966 done by [Mergify](https://mergify.com).

* Set scipy>=1.16

* Release pinned scipy and change x0 for cobyla

* Enforces 1D arrays in all jac modes as per scipy 1.16

* Fix formatting

* Fix copyright

---------

Co-authored-by: M. Emre Sahin <40424147+OkuyanBoga@users.noreply.github.com>
(cherry picked from commit 8fce265)

# Conflicts:
#	test/datasets/test_entanglement_concentration.py
@mergify
Copy link
Contributor Author

mergify bot commented Sep 3, 2025

Cherry-pick of 8fce265 has failed:

On branch mergify/bp/stable/0.8/pr-966
Your branch is up to date with 'origin/stable/0.8'.

You are currently cherry-picking commit 8fce265.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   docs/lowercase_filter.py
	modified:   qiskit_machine_learning/algorithms/classifiers/__init__.py
	modified:   qiskit_machine_learning/algorithms/inference/__init__.py
	modified:   qiskit_machine_learning/algorithms/regressors/__init__.py
	modified:   qiskit_machine_learning/exceptions.py
	modified:   qiskit_machine_learning/optimizers/optimizer_utils/__init__.py
	modified:   qiskit_machine_learning/optimizers/scipy_optimizer.py
	modified:   qiskit_machine_learning/utils/loss_functions/kernel_loss_functions.py
	modified:   qiskit_machine_learning/utils/loss_functions/loss_functions.py
	modified:   requirements.txt
	modified:   test/__init__.py
	modified:   test/algorithms/classifiers/test_fidelity_quantum_kernel_pegasos_qsvc.py
	modified:   test/algorithms/classifiers/test_neural_network_classifier.py
	modified:   test/algorithms/classifiers/test_pegasos_qsvc.py
	modified:   test/algorithms/classifiers/test_qsvc.py
	modified:   test/algorithms/classifiers/test_vqc.py
	modified:   test/algorithms/inference/test_qbayesian.py
	modified:   test/algorithms/regressors/test_neural_network_regressor.py
	modified:   test/algorithms/regressors/test_vqr.py
	modified:   test/datasets/__init__.py
	modified:   test/datasets/test_ad_hoc_data.py
	modified:   test/kernels/algorithms/test_fidelity_qkernel_trainer.py
	modified:   test/kernels/test_trainable_fidelity_qkernel.py
	modified:   test/neural_networks/test_effective_dimension.py
	modified:   test/neural_networks/test_estimator_qnn_v1.py
	modified:   test/neural_networks/test_estimator_qnn_v2.py
	modified:   test/optimizers/test_optimizers.py
	modified:   tools/check_copyright.py
	modified:   tools/extract_deprecation.py
	modified:   tools/generate_spell_dict.py

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   test/datasets/test_entanglement_concentration.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot requested a review from Benjamin-Symons as a code owner September 3, 2025 14:12
edoaltamura
edoaltamura previously approved these changes Sep 3, 2025
@edoaltamura edoaltamura closed this Sep 3, 2025
@edoaltamura edoaltamura deleted the mergify/bp/stable/0.8/pr-966 branch September 3, 2025 14:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants