Skip to content

Commit

Permalink
Merge pull request #1270 from dwavesystems/0.12.0
Browse files Browse the repository at this point in the history
Add Cython CQM Object
  • Loading branch information
arcondello authored Oct 30, 2022
2 parents 82be8d9 + 40babd0 commit 9e14f2b
Show file tree
Hide file tree
Showing 26 changed files with 1,938 additions and 680 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ dimod/binary/*.cpp
dimod/binary/*.html
dimod/binary/cybqm/*.cpp
dimod/binary/cybqm/*.html
dimod/constrained/*.cpp
dimod/constrained/*.html
dimod/cyqmbase/*.cpp
dimod/cyqmbase/*.html
dimod/discrete/*.cpp
Expand Down
2 changes: 1 addition & 1 deletion dimod/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

# version is used by serialization below so we need it before everything
__version__ = '0.12.0.dev0'
__version__ = '0.12.0.dev3'

from dimod.constrained import *
import dimod.constrained
Expand Down
Empty file added dimod/constrained/__init__.pxd
Empty file.
15 changes: 15 additions & 0 deletions dimod/constrained/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Copyright 2022 D-Wave Systems Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

from dimod.constrained.constrained import *
Loading

0 comments on commit 9e14f2b

Please sign in to comment.