Fix 0.2.1 --> 0.2.2

Subsampler kwargs passed down
dwavesystems · Feb 9, 2018 · c5e58d5 · c5e58d5
1 parent 90d0b4d
commit c5e58d5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/python/dwave_qbsolv/dimod_wrapper.py b/python/dwave_qbsolv/dimod_wrapper.py
@@ -22,7 +22,7 @@ class QBSolv(dimod.TemplateSampler):
     @dimod.decorators.qubo_index_labels(1)
     def sample_qubo(self, Q, num_repeats=50, seed=None, algorithm=None,
                     verbosity=-1, timeout=2592000, solver_limit=None, solver=None,
-                    target=None, find_max=False):
+                    target=None, find_max=False, **sample_kwargs):
         """Sample low-energy states defined by a QUBO using qbsolv.
 
         Note:
@@ -80,7 +80,7 @@ def sample_qubo(self, Q, num_repeats=50, seed=None, algorithm=None,
         # pose the QUBO to qbsolv
         samples, counts = run_qbsolv(Q=Q, num_repeats=num_repeats, seed=seed, algorithm=algorithm,
                                      verbosity=verbosity, timeout=timeout, solver_limit=solver_limit,
-                                     solver=solver, target=target, find_max=find_max)
+                                     solver=solver, target=target, find_max=find_max, sample_kwargs=sample_kwargs)
 
         # load the response
         response = dimod.BinaryResponse()

diff --git a/python/dwave_qbsolv/qbsolv_binding.pyx b/python/dwave_qbsolv/qbsolv_binding.pyx
@@ -25,7 +25,7 @@ log = logging.getLogger(__name__)
 
 def run_qbsolv(Q, num_repeats=50, seed=17932241798878,  verbosity=-1,
                algorithm=None, timeout=2592000, solver_limit=None,
-               solver=None, target=None, find_max=False):
+               solver=None, target=None, find_max=False, sample_kwargs={}):
     """Entry point to `solve` method in the qbsolv library.
 
     Arguments are described in the dimod wrapper.
@@ -62,7 +62,7 @@ def run_qbsolv(Q, num_repeats=50, seed=17932241798878,  verbosity=-1,
         params.sub_sampler = &solver_callback
 
         def dimod_callback(Q, best_state):
-            result = solver.sample_qubo(Q)
+            result = solver.sample_qubo(Q, **sample_kwargs)
             sample = next(result.samples())
             for key, value in sample.items():
                 best_state[key] = value

diff --git a/python/setup.py b/python/setup.py
@@ -46,7 +46,7 @@ def build_extensions(self):
 
 setup(
     name='dwave_qbsolv',
-    version='0.2.1',
+    version='0.2.2',
     packages=packages,
     install_requires=['dimod>=0.3.1', 'cython'],
     ext_modules=cythonize(extensions, language='c++'),