Changeset e2592f0 in sasmodels


Ignore:
Timestamp:
Oct 9, 2018 5:23:53 PM (2 months ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
py3
Children:
7d97437
Parents:
353e899
Message:

fix test warnings from py3 and numpy

Location:
sasmodels
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/kernelcl.py

    rd86f0fc re2592f0  
    5656import time 
    5757 
     58try: 
     59    from time import perf_counter as clock 
     60except ImportError: # CRUFT: python < 3.3 
     61    if sys.platform.count("darwin") > 0: 
     62        from time import time as clock 
     63    else: 
     64        from time import clock 
     65 
    5866import numpy as np  # type: ignore 
    59  
    6067 
    6168# Attempt to setup opencl. This may fail if the opencl package is not 
     
    575582        # Call kernel and retrieve results 
    576583        wait_for = None 
    577         last_nap = time.clock() 
     584        last_nap = clock() 
    578585        step = 1000000//self.q_input.nq + 1 
    579586        for start in range(0, call_details.num_eval, step): 
     
    586593                # Allow other processes to run 
    587594                wait_for[0].wait() 
    588                 current_time = time.clock() 
     595                current_time = clock() 
    589596                if current_time - last_nap > 0.5: 
    590597                    time.sleep(0.05) 
  • sasmodels/resolution.py

    r9e7837a re2592f0  
    445445    q = np.sort(q) 
    446446    if q_min + 2*MINIMUM_RESOLUTION < q[0]: 
    447         n_low = np.ceil((q[0]-q_min) / (q[1]-q[0])) if q[1] > q[0] else 15 
     447        n_low = int(np.ceil((q[0]-q_min) / (q[1]-q[0]))) if q[1] > q[0] else 15 
    448448        q_low = np.linspace(q_min, q[0], n_low+1)[:-1] 
    449449    else: 
    450450        q_low = [] 
    451451    if q_max - 2*MINIMUM_RESOLUTION > q[-1]: 
    452         n_high = np.ceil((q_max-q[-1]) / (q[-1]-q[-2])) if q[-1] > q[-2] else 15 
     452        n_high = int(np.ceil((q_max-q[-1]) / (q[-1]-q[-2]))) if q[-1] > q[-2] else 15 
    453453        q_high = np.linspace(q[-1], q_max, n_high+1)[1:] 
    454454    else: 
     
    499499            q_min = q[0]*MINIMUM_ABSOLUTE_Q 
    500500        n_low = log_delta_q * (log(q[0])-log(q_min)) 
    501         q_low = np.logspace(log10(q_min), log10(q[0]), np.ceil(n_low)+1)[:-1] 
     501        q_low = np.logspace(log10(q_min), log10(q[0]), int(np.ceil(n_low))+1)[:-1] 
    502502    else: 
    503503        q_low = [] 
    504504    if q_max > q[-1]: 
    505505        n_high = log_delta_q * (log(q_max)-log(q[-1])) 
    506         q_high = np.logspace(log10(q[-1]), log10(q_max), np.ceil(n_high)+1)[1:] 
     506        q_high = np.logspace(log10(q[-1]), log10(q_max), int(np.ceil(n_high))+1)[1:] 
    507507    else: 
    508508        q_high = [] 
  • sasmodels/weights.py

    r3d58247 re2592f0  
    2323    default = dict(npts=35, width=0, nsigmas=3) 
    2424    def __init__(self, npts=None, width=None, nsigmas=None): 
    25         self.npts = self.default['npts'] if npts is None else npts 
     25        self.npts = self.default['npts'] if npts is None else int(npts) 
    2626        self.width = self.default['width'] if width is None else width 
    2727        self.nsigmas = self.default['nsigmas'] if nsigmas is None else nsigmas 
Note: See TracChangeset for help on using the changeset viewer.