Skip to content

Commit

Permalink
Merge pull request #264 from arcondello/6.5.0
Browse files Browse the repository at this point in the history
Update packages for 6.5.0
  • Loading branch information
arcondello authored Sep 29, 2023
2 parents 90c7f62 + 82a7c46 commit 8e52e88
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion dimod
Submodule dimod updated 86 files
+4 −8 .circleci/config.yml
+1 −0 MANIFEST.in
+1 −1 dimod/__init__.py
+56 −36 dimod/binary/binary_quadratic_model.py
+209 −149 dimod/constrained/constrained.py
+90 −0 dimod/constrained/cyconstrained.pyx
+146 −50 dimod/constrained/cyexpression.pyx
+0 −16 dimod/constrained/expression.py
+164 −12 dimod/cylp.pyx
+10 −3 dimod/discrete/discrete_quadratic_model.py
+4 −2 dimod/generators/__init__.py
+9 −5 dimod/generators/fcl.py
+110 −0 dimod/generators/magic_square.py
+985 −0 dimod/generators/wireless.py
+34 −13 dimod/include/dimod/constrained_quadratic_model.h
+38 −1 dimod/include/dimod/expression.h
+0 −1,305 dimod/include/dimod/lp.h
+0 −1 dimod/libcpp/__init__.pxd
+17 −0 dimod/libcpp/abc.pxd
+1 −1 dimod/libcpp/constrained_quadratic_model.pxd
+0 −34 dimod/libcpp/lp.pxd
+1 −13 dimod/quadratic/cyqm/cyqm_template.pyx.pxi
+12 −65 dimod/quadratic/quadratic_model.py
+24 −9 dimod/sampleset.py
+107 −4 dimod/serialization/fileview.py
+40 −0 dimod/serialization/utils.py
+2 −0 docs/reference/generators.rst
+0 −0 extern/filereaderlp/HConfig.h
+19 −0 extern/filereaderlp/LICENSE
+25 −0 extern/filereaderlp/builder.hpp
+19 −0 extern/filereaderlp/def.hpp
+68 −0 extern/filereaderlp/model.hpp
+1,303 −0 extern/filereaderlp/reader.cpp
+10 −0 extern/filereaderlp/reader.hpp
+1 −1 pyproject.toml
+8 −0 releasenotes/notes/CaseLabelDQM.to_file-775d4d79237f01c7.yaml
+6 −0 releasenotes/notes/cqm-magic-square-generator-36a9de45609ce0be.yaml
+8 −0 releasenotes/notes/cqm-serialization-v2.0-90b5133c3f5aac89.yaml
+3 −0 releasenotes/notes/drop-Python3.7-0f8e53018858815f.yaml
+4 −0 releasenotes/notes/expose-is_onehot-044d860d5eb7b115.yaml
+6 −0 releasenotes/notes/expression-remove-variables-4da6fef4b08ee743.yaml
+3 −0 releasenotes/notes/faster-dqm-to-cqm-ead6de443ad38c87.yaml
+8 −0 releasenotes/notes/feature-mimo-59c3d6d02335061c.yaml
+4 −0 releasenotes/notes/fix-CQM.from_dqm-f9b7b35c91118d0a.yaml
+5 −0 releasenotes/notes/fix-frustrated-loop-tuple-labels-0ec17b68ee6cfd42.yaml
+7 −0 releasenotes/notes/fix-quadratic-cqm-fix-variables-43f21519357c228f.yaml
+10 −0 releasenotes/notes/fix-relabelling-unresolved-sampleset-inplace-c991d28394f2dc94.yaml
+5 −0 releasenotes/notes/lp-refresh-7269c9525a3bfcf8.yaml
+3 −0 releasenotes/notes/remove-constraints-if-dfa2734c9566e1b2.yaml
+12 −0 releasenotes/notes/sampleset-serialization-replace-float-with-int-5a3133c66480b8f4.yaml
+4 −0 releasenotes/notes/unbalanced-penalization-e16af2362227bcdb.yaml
+2 −3 requirements.txt
+1 −2 setup.cfg
+3 −5 setup.py
+ tests/data/cqm/compressed_v1.3.cqm
+ tests/data/cqm/compressed_v2.0.cqm
+ tests/data/cqm/discrete_v1.1.cqm
+ tests/data/cqm/discrete_v1.2.cqm
+ tests/data/cqm/discrete_v1.3.cqm
+ tests/data/cqm/discrete_v2.0.cqm
+ tests/data/cqm/empty_v1.1.cqm
+ tests/data/cqm/empty_v1.2.cqm
+ tests/data/cqm/empty_v1.3.cqm
+ tests/data/cqm/empty_v2.0.cqm
+ tests/data/cqm/no-objective_v1.1.cqm
+ tests/data/cqm/no-objective_v1.2.cqm
+ tests/data/cqm/no-objective_v1.3.cqm
+ tests/data/cqm/no-objective_v2.0.cqm
+ tests/data/cqm/soft_v1.3.cqm
+ tests/data/cqm/soft_v2.0.cqm
+ tests/data/cqm/uncompressed_v1.3.cqm
+ tests/data/cqm/uncompressed_v2.0.cqm
+ tests/data/cqm/unused-variable_v1.1.cqm
+ tests/data/cqm/unused-variable_v1.2.cqm
+ tests/data/cqm/unused-variable_v1.3.cqm
+ tests/data/cqm/unused-variable_v2.0.cqm
+18 −0 tests/test_bqm.py
+101 −110 tests/test_constrained.py
+19 −0 tests/test_discrete_quadratic_model.py
+662 −2 tests/test_generators.py
+14 −11 tests/test_lp.py
+19 −3 tests/test_sampleset.py
+205 −0 tests/test_serialization_cqm.py
+100 −0 tests/test_serialization_utils.py
+152 −0 testscpp/tests/test_constrained_quadratic_model.cpp
+0 −70 testscpp/tests/test_lp.cpp
2 changes: 1 addition & 1 deletion dwave-preprocessing
Submodule dwave-preprocessing updated 52 files
+16 −45 .circleci/config.yml
+2 −7 .gitignore
+1 −0 MANIFEST.in
+6 −4 README.rst
+22 −2 docs/reference/presolve.rst
+1 −1 dwave/preprocessing/__init__.py
+118 −60 dwave/preprocessing/composites/spin_reversal_transform.py
+1 −1 dwave/preprocessing/include/dwave-preprocessing/fix_variables.hpp
+5 −7 dwave/preprocessing/include/dwave-preprocessing/helper_graph_algorithms.hpp
+7 −3 dwave/preprocessing/include/dwave-preprocessing/posiform_info.hpp
+28 −0 dwave/preprocessing/include/dwave/exceptions.hpp
+63 −0 dwave/preprocessing/include/dwave/flags.hpp
+0 −503 dwave/preprocessing/include/dwave/presolve.h
+91 −0 dwave/preprocessing/include/dwave/presolve.hpp
+30 −6 dwave/preprocessing/libcpp.pxd
+1 −0 dwave/preprocessing/presolve/__init__.py
+14 −2 dwave/preprocessing/presolve/cypresolve.pxd
+24 −2 dwave/preprocessing/presolve/cypresolve.pyi
+209 −17 dwave/preprocessing/presolve/cypresolve.pyx
+21 −0 dwave/preprocessing/presolve/exceptions.py
+34 −17 dwave/preprocessing/presolve/pypresolve.py
+21 −0 dwave/preprocessing/src/exceptions.cpp
+105 −0 dwave/preprocessing/src/presolve.cpp
+1,065 −0 dwave/preprocessing/src/presolveimpl.hpp
+4 −5 pyproject.toml
+4 −0 releasenotes/notes/SRT-refresh-069d6054be246be7.yaml
+5 −0 releasenotes/notes/avoid-Presolve-constructor-copy-4915915d2725e4fe.yaml
+4 −0 releasenotes/notes/bounds-nan-c4fc9b0f32c7cce6.yaml
+5 −0 releasenotes/notes/c++-Presolver.restore-147bfaac7d439695.yaml
+6 −0 releasenotes/notes/develwheel-1.4.0-55ede67315399961.yaml
+6 −0 releasenotes/notes/domain-propagation-7b4da99379fcf305.yaml
+5 −0 releasenotes/notes/drop-py3.7-4d2d65390d03a123.yaml
+6 −0 releasenotes/notes/faster-discrete-marker-normalization-a2feaead389ff14e.yaml
+5 −0 releasenotes/notes/faster-small-bias-removal-96f364d2cd50bd88.yaml
+6 −0 releasenotes/notes/fix-presolve-quadratic-9b554f5cefccb40c.yaml
+5 −0 releasenotes/notes/inf-21c9fc0db2ae759c.yaml
+19 −0 releasenotes/notes/load-presolvers-by-default-3472afca76831aa8.yaml
+5 −0 releasenotes/notes/presolve-nogil-9f000e3179f36084.yaml
+8 −0 releasenotes/notes/presolve-pimpl-00987944df99570e.yaml
+12 −0 releasenotes/notes/presolve-refactor-d9c3d2fc91715c8e.yaml
+4 −0 releasenotes/notes/presolve-time-limit-76a64a5e42735042.yaml
+4 −0 releasenotes/notes/python-level-normalization-d5e685c1ffc8cace.yaml
+2 −2 requirements.txt
+1 −2 setup.cfg
+9 −8 setup.py
+0 −1 tests/requirements.txt
+386 −22 tests/test_presolve.py
+91 −70 tests/test_spin_reversal_transform.py
+30 −16 testscpp/Makefile
+142 −21 testscpp/tests/test_presolve.cpp
+989 −0 testscpp/tests/test_presolveimpl.cpp
+20 −34 testscpp/tests/test_roof_duality.cpp
2 changes: 1 addition & 1 deletion dwaveoceansdk/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = '6.4.1'
__version__ = '6.5.0'
12 changes: 6 additions & 6 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -25,24 +25,24 @@ description = Software development kit for open source D-Wave tools

[options]
install_requires =
dimod==0.12.6
dimod==0.12.12
dwave-cloud-client==0.10.6
dwave-greedy==0.3.0
dwave-hybrid==0.6.10
dwave-inspector==0.4.2
dwave-neal==0.6.0
dwave-networkx==0.8.14
dwave-preprocessing==0.5.4
dwave-samplers==1.0.0
dwave-system==1.19.0
dwave-preprocessing==0.6.3
dwave-samplers==1.1.0
dwave-system==1.20.0
dwave-tabu==0.5.0
dwavebinarycsp==0.2.0
minorminer==0.2.11
minorminer==0.2.12
penaltymodel==1.0.2
pyqubo==1.4.0
packages = dwaveoceansdk
python_requires = >=3.8

[options.extras_require]
all =
dwave-gate==0.2.1
dwave-gate==0.3.0

0 comments on commit 8e52e88

Please sign in to comment.