Merge pull request #137 from arcondello/bug/python-timeout

Fix timeout issues

Author: arcondello

python/dwave_qbsolv/qbsolv_binding.pyx

@@ -99,8 +99,8 @@ def run_qbsolv(Q, num_repeats=50, seed=17932241798878,  verbosity=-1,
     else:
         raise ValueError('unknown algorithm given')
 
-    if not isinstance(timeout, int) or timeout <= 0:
-        raise ValueError("'timeout' must be a positive integer")
+    if timeout <= 0:
+        raise ValueError("'timeout' must be positive")
     global Time_
     Time_ = timeout # the maximum runtime of the algorithm in seconds before timeout (2592000 = a month's worth of seconds)
 

python/requirements.txt

@@ -1,5 +1,5 @@
-dimod==0.7.2
-cython==0.28.4
+dimod==0.8.1
+cython==0.29.2
 
 coverage
 codecov

setup.py

@@ -18,7 +18,7 @@
 
 extra_compile_args = {
     'msvc': [],
-    'unix': ['-std=c++11', '-Ofast', '-Wall', '-Wextra', '-flto'],
+    'unix': ['-std=c++11', '-Ofast', '-Wall', '-Wextra'],
     # 'unix': ['-std=c++1y','-w','-O0', '-g', '-fipa-pure-const'],
 }
 
@@ -78,7 +78,7 @@ def build_extensions(self):
     version='0.2.9',
     packages=packages,
     package_dir={'dwave_qbsolv': 'python/dwave_qbsolv'},
-    install_requires=['dimod>=0.6.10,<0.8.0'],
+    install_requires=['dimod>=0.6.10,<0.9.0'],
     ext_modules=extensions,
     cmdclass={'build_ext': build_ext_compiler_check},
     long_description=open('README.rst').read(),

tests/test_dwave_qbsolv.py

@@ -1,5 +1,5 @@
 import unittest
-
+import time
 import itertools
 
 import dwave_qbsolv as qbs
@@ -69,3 +69,18 @@ def test_energy_calculation(self):
 
         for sample, energy in response.data(['sample', 'energy']):
             self.assertAlmostEqual(dimod.ising_energy(sample, h, J), energy)
+
+    # these tests are hard to automate for CI because different systems have different
+    # speeds
+    # def test_timeout_parameter(self):
+    #     # set up a problem we hope will take a long time
+    #     Q = {edge: random.uniform(-1, 1) for edge in itertools.combinations_with_replacement(range(500), 2)}
+
+    #     timeout = 1 # in seconds
+
+    #     t = time.time()
+
+    #     response = qbs.QBSolv().sample_qubo(Q, timeout=timeout)  # seconds to millisconds
+        
+    #     # let's be generous and give it 3x the timeout
+    #     self.assertLessEqual(time.time() - t, 3*timeout)