Changeset 0d26e91 in sasmodels for sasmodels/kernelcl.py

Timestamp:

Mar 6, 2019 3:44:39 PM (5 years ago)

Author:

GitHub <noreply@…>

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

15f5138

Parents:

da3638f (diff), e589e9a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Paul Kienzle <pkienzle@…> (03/06/19 15:44:39)

git-committer:

GitHub <noreply@…> (03/06/19 15:44:39)

Message:

Merge branch 'beta_approx' into ticket-1015-gpu-mem-error

File:

• sasmodels/kernelcl.py (modified) (3 diffs)

sasmodels/kernelcl.py

@@ -58 +58 @@
 import time
 
+try:
+    from time import perf_counter as clock
+except ImportError: # CRUFT: python < 3.3
+    import sys
+    if sys.platform.count("darwin") > 0:
+        from time import time as clock
+    else:
+        from time import clock
+
 import numpy as np  # type: ignore
-
 
 # Attempt to setup OpenCL. This may fail if the pyopencl package is not
@@ -592 +600 @@
         #call_details.show(values)
         wait_for = None
-        last_nap = time.clock()
+        last_nap = clock()
         step = 1000000//self.q_input.nq + 1
         for start in range(0, call_details.num_eval, step):
@@ -603 +611 @@
                 # Allow other processes to run.
                 wait_for[0].wait()
-                current_time = time.clock()
+                current_time = clock()
                 if current_time - last_nap > 0.5:
                     time.sleep(0.001)