1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
|
From d2a480d14f29fb1d2baee292bc6a2cca4817dcbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Sun, 24 Jan 2021 16:36:21 +0100
Subject: [PATCH] Use lowercase float/int as numpy dtype
Float64 is gone with numpy 1.20, which causes doctests to fail
(https://bugzilla.redhat.com/show_bug.cgi?id=1914335).
Similarly all uses of Float32, Int32 should be replaced by float32 and int32.
>>> numpy.__version__
'1.19.4'
>>> [k for k in numpy.sctypeDict.keys() if str(k).lower().startswith('float')]
['float16', 'Float16', 'float32', 'Float32', 'float64', 'Float64', 'float128', 'Float128', 'float_', 'float']
>>> numpy.__version__
'1.20.0rc2'
>>> [k for k in numpy.sctypeDict.keys() if str(k).lower().startswith('float')]
['float16', 'float32', 'float64', 'float128', 'float_', 'float']
---
bench/bsddb-table-bench.py | 10 +++++-----
bench/postgres-search-bench.py | 4 ++--
bench/pytables-search-bench.py | 6 +++---
bench/recarray2-test.py | 2 +-
bench/shelve-bench.py | 10 +++++-----
bench/sqlite-search-bench.py | 4 ++--
tables/atom.py | 2 +-
7 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/bench/bsddb-table-bench.py b/bench/bsddb-table-bench.py
index dd9f875b..a2e02361 100644
--- a/bench/bsddb-table-bench.py
+++ b/bench/bsddb-table-bench.py
@@ -83,11 +83,11 @@ def createFile(filename, totalrows, recsize, verbose):
# Get the record object associated with the new table
if recsize == "big":
isrec = Big()
- arr = np.array(np.arange(32), type=np.Float64)
- arr2 = np.array(np.arange(32), type=np.Float64)
+ arr = np.array(np.arange(32), type=np.float64)
+ arr2 = np.array(np.arange(32), type=np.float64)
elif recsize == "medium":
isrec = Medium()
- arr = np.array(np.arange(2), type=np.Float64)
+ arr = np.array(np.arange(2), type=np.float64)
else:
isrec = Small()
# print d
@@ -107,8 +107,8 @@ def createFile(filename, totalrows, recsize, verbose):
#d['TDCcount'] = i % 256
d['ADCcount'] = (i * 256) % (1 << 16)
if recsize == "big":
- #d.float1 = np.array([i]*32, np.Float64)
- #d.float2 = np.array([i**2]*32, np.Float64)
+ #d.float1 = np.array([i]*32, np.float64)
+ #d.float2 = np.array([i**2]*32, np.float64)
arr[0] = 1.1
d['float1'] = arr
arr2[0] = 2.2
diff --git a/bench/postgres-search-bench.py b/bench/postgres-search-bench.py
index d2c9f4f4..7fe83f6a 100644
--- a/bench/postgres-search-bench.py
+++ b/bench/postgres-search-bench.py
@@ -15,11 +15,11 @@ def flatten(l):
def fill_arrays(start, stop):
- col_i = numpy.arange(start, stop, type=numpy.Int32)
+ col_i = numpy.arange(start, stop, type=numpy.int32)
if userandom:
col_j = numpy.random.uniform(0, nrows, size=[stop - start])
else:
- col_j = numpy.array(col_i, type=numpy.Float64)
+ col_j = numpy.array(col_i, type=numpy.float64)
return col_i, col_j
# Generator for ensure pytables benchmark compatibility
diff --git a/bench/pytables-search-bench.py b/bench/pytables-search-bench.py
index 726d30b1..6417186b 100644
--- a/bench/pytables-search-bench.py
+++ b/bench/pytables-search-bench.py
@@ -37,11 +37,11 @@ def create_db(filename, nrows):
stop = (j + 1) * step
if stop > nrows:
stop = nrows
- arr_f8 = np.arange(i, stop, type=np.Float64)
- arr_i4 = np.arange(i, stop, type=np.Int32)
+ arr_f8 = np.arange(i, stop, type=np.float64)
+ arr_i4 = np.arange(i, stop, type=np.int32)
if userandom:
arr_f8 += np.random.normal(0, stop * scale, shape=[stop - i])
- arr_i4 = np.array(arr_f8, type=np.Int32)
+ arr_i4 = np.array(arr_f8, type=np.int32)
recarr = np.rec.fromarrays([arr_i4, arr_i4, arr_f8, arr_f8])
table.append(recarr)
j += 1
diff --git a/bench/recarray2-test.py b/bench/recarray2-test.py
index a8602d80..bf55389d 100644
--- a/bench/recarray2-test.py
+++ b/bench/recarray2-test.py
@@ -22,7 +22,7 @@ delta = 0.000001
# Creation of recarrays objects for test
x1 = np.array(np.arange(reclen))
x2 = chararray.array(None, itemsize=7, shape=reclen)
-x3 = np.array(np.arange(reclen, reclen * 3, 2), np.Float64)
+x3 = np.array(np.arange(reclen, reclen * 3, 2), np.float64)
r1 = recarray.fromarrays([x1, x2, x3], names='a,b,c')
r2 = recarray2.fromarrays([x1, x2, x3], names='a,b,c')
diff --git a/bench/shelve-bench.py b/bench/shelve-bench.py
index d30739d8..a591ed1e 100644
--- a/bench/shelve-bench.py
+++ b/bench/shelve-bench.py
@@ -65,8 +65,8 @@ def createFile(filename, totalrows, recsize):
# Get the record object associated with the new table
if recsize == "big":
d = Big()
- arr = NA.array(NA.arange(32), type=NA.Float64)
- arr2 = NA.array(NA.arange(32), type=NA.Float64)
+ arr = NA.array(NA.arange(32), type=NA.float64)
+ arr2 = NA.array(NA.arange(32), type=NA.float64)
elif recsize == "medium":
d = Medium()
else:
@@ -87,15 +87,15 @@ def createFile(filename, totalrows, recsize):
#d.TDCcount = i % 256
d.ADCcount = (i * 256) % (1 << 16)
if recsize == "big":
- #d.float1 = NA.array([i]*32, NA.Float64)
- #d.float2 = NA.array([i**2]*32, NA.Float64)
+ #d.float1 = NA.array([i]*32, NA.float64)
+ #d.float2 = NA.array([i**2]*32, NA.float64)
arr[0] = 1.1
d.float1 = arr
arr2[0] = 2.2
d.float2 = arr2
pass
else:
- d.float1 = NA.array([i ** 2] * 2, NA.Float64)
+ d.float1 = NA.array([i ** 2] * 2, NA.float64)
#d.float1 = float(i)
#d.float2 = float(i)
d.grid_i = i
diff --git a/bench/sqlite-search-bench.py b/bench/sqlite-search-bench.py
index 76dc7c57..dc611695 100644
--- a/bench/sqlite-search-bench.py
+++ b/bench/sqlite-search-bench.py
@@ -136,10 +136,10 @@ CREATE INDEX ivar3 ON small(var3);
if randomvalues:
var3 = np.random.uniform(minimum, maximum, shape=[j - i])
else:
- var3 = np.arange(i, j, type=np.Float64)
+ var3 = np.arange(i, j, type=np.float64)
if noise:
var3 += np.random.uniform(-3, 3, shape=[j - i])
- var2 = np.array(var3, type=np.Int32)
+ var2 = np.array(var3, type=np.int32)
var1 = np.array(None, shape=[j - i], dtype='s4')
if not heavy:
for n in range(j - i):
diff --git a/tables/atom.py b/tables/atom.py
index f92e16ad..f93d915b 100644
--- a/tables/atom.py
+++ b/tables/atom.py
@@ -338,7 +338,7 @@ class Atom(metaclass=MetaAtom):
Traceback (most recent call last):
...
ValueError: unknown NumPy scalar type: 'S5'
- >>> Atom.from_sctype('Float64')
+ >>> Atom.from_sctype('float64')
Float64Atom(shape=(), dflt=0.0)
"""
--
2.32.0
|
GitWeb