[yt-svn] commit/yt: 2 new changesets

[commits-noreply at bitbucket.org]

2 new commits in yt:

https://bitbucket.org/yt_analysis/yt/commits/069715baac70/
Changeset:   069715baac70
Branch:      yt
User:        ngoldbaum
Date:        2015-11-13 23:49:14+00:00
Summary:     Avoid mixing floats and ints in stream parallel decomposition utility code
Affected #:  1 file

diff -r 518c0dcd67074138745f26a3797adbf09fe00d38 -r 069715baac70d5f0b186293b518eaf3802798370 yt/utilities/decompose.py
--- a/yt/utilities/decompose.py
+++ b/yt/utilities/decompose.py
@@ -69,7 +69,8 @@
     temp = np.bincount(factors)
     return np.array(
         [(prime, temp[prime], (temp[prime] + 1) * (temp[prime] + 2) / 2)
-         for prime in np.unique(factors)]
+         for prime in np.unique(factors)],
+        dtype=np.int64
     )
 
 
@@ -81,12 +82,12 @@
     fac = factorize_number(pieces)
     nfactors = len(fac[:, 2])
     best = 0.0
-    p_size = np.ones(3, dtype=np.int)
+    p_size = np.ones(3, dtype=np.int64)
     if pieces == 1:
         return p_size
 
     while np.all(fac[:, 2] > 0):
-        ldom = np.ones(3, dtype=np.int)
+        ldom = np.ones(3, dtype=np.int64)
         for nfac in range(nfactors):
             i = int(np.sqrt(0.25 + 2 * (fac[nfac, 2] - 1)) - 0.5)
             k = fac[nfac, 2] - int(1 + i * (i + 1) / 2)


https://bitbucket.org/yt_analysis/yt/commits/fc56cb7acc07/
Changeset:   fc56cb7acc07
Branch:      yt
User:        jzuhone
Date:        2015-11-16 14:41:37+00:00
Summary:     Merged in ngoldbaum/yt (pull request #1862)

[bugfix] Fix python 3.5 tests
Affected #:  1 file

diff -r 7943011d640ffaa78472a2e3a6bb0f81d6fcd352 -r fc56cb7acc07431d4e8877b9c89192b0b05477fd yt/utilities/decompose.py
--- a/yt/utilities/decompose.py
+++ b/yt/utilities/decompose.py
@@ -69,7 +69,8 @@
     temp = np.bincount(factors)
     return np.array(
         [(prime, temp[prime], (temp[prime] + 1) * (temp[prime] + 2) / 2)
-         for prime in np.unique(factors)]
+         for prime in np.unique(factors)],
+        dtype=np.int64
     )
 
 
@@ -81,12 +82,12 @@
     fac = factorize_number(pieces)
     nfactors = len(fac[:, 2])
     best = 0.0
-    p_size = np.ones(3, dtype=np.int)
+    p_size = np.ones(3, dtype=np.int64)
     if pieces == 1:
         return p_size
 
     while np.all(fac[:, 2] > 0):
-        ldom = np.ones(3, dtype=np.int)
+        ldom = np.ones(3, dtype=np.int64)
         for nfac in range(nfactors):
             i = int(np.sqrt(0.25 + 2 * (fac[nfac, 2] - 1)) - 0.5)
             k = fac[nfac, 2] - int(1 + i * (i + 1) / 2)

Repository URL: https://bitbucket.org/yt_analysis/yt/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.