xrange fixes for Python 3

This commit is contained in:
Mike Croucher 2015-03-07 07:49:59 +00:00
parent 5eeb2f18e9
commit cf1c382acd
14 changed files with 29 additions and 29 deletions

View file

@ -66,12 +66,12 @@ def safe_root(N):
# return flat
def triang_to_cov(L):
return np.dstack([np.dot(L[:,:,i], L[:,:,i].T) for i in xrange(L.shape[-1])])
return np.dstack([np.dot(L[:,:,i], L[:,:,i].T) for i in range(L.shape[-1])])
def multiple_dpotri_old(Ls):
M, _, D = Ls.shape
Kis = np.rollaxis(Ls, -1).copy()
[dpotri(Kis[i,:,:], overwrite_c=1, lower=1) for i in xrange(D)]
[dpotri(Kis[i,:,:], overwrite_c=1, lower=1) for i in range(D)]
code = """
for(int d=0; d<D; d++)
{

View file

@ -27,7 +27,7 @@ def divide_data(datanum, rank, size):
residue = (datanum)%size
datanum_list = np.empty((size),dtype=np.int32)
for i in xrange(size):
for i in range(size):
if i<residue:
datanum_list[i] = int(datanum/size)+1
else:
@ -38,4 +38,4 @@ def divide_data(datanum, rank, size):
else:
size = datanum/size
offset = size*rank+residue
return offset, offset+size, datanum_list
return offset, offset+size, datanum_list