Skip to content

Commit 7a114ec

Browse files
lgritzlgritz
committed
testing: improve Ptex testing (AcademySoftwareFoundation#4573)
* Ptex testsuite entry had been accidentally disabled somewhat recently when we switched to using Ptex exported cmake config instead of our own find module, because the "found" variable changed from PTEX_FOUND to Ptex_FOUND. * Change the test to print stats, thus forcing the ptex test to read pixels instead of just header info, which improves the testing coverage of ptexinput.cpp. Signed-off-by: Larry Gritz <[email protected]>
1 parent 86fabd5 commit 7a114ec

File tree

3 files changed

+281
-2
lines changed

3 files changed

+281
-2
lines changed

‎src/cmake/testing.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ macro (oiio_add_all_tests)
322322
ENABLEVAR ENABLE_PSD
323323
IMAGEDIR oiio-images/psd)
324324
oiio_add_tests (ptex
325-
FOUNDVAR PTEX_FOUND ENABLEVAR ENABLE_PTEX)
325+
FOUNDVAR Ptex_FOUND ENABLEVAR ENABLE_PTEX)
326326
oiio_add_tests (raw
327327
FOUNDVAR LIBRAW_FOUND ENABLEVAR ENABLE_LIBRAW
328328
IMAGEDIR oiio-images/raw)

‎testsuite/ptex/ref/out.txt‎

Lines changed: 279 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,59 +8,338 @@ src/triangle.ptx : 4 x 4, 3 channel, float ptex
88
tile size: 4 x 4
99
wrapmode: "clamp,clamp"
1010
ptex:meshType: "triangle"
11+
MIP 0 of 3 (4 x 4):
12+
Stats Min: 0.108809 0.137232 0.016301 (float)
13+
Stats Max: 0.916195 0.998924 0.952230 (float)
14+
Stats Avg: 0.455336 0.657517 0.507940 (float)
15+
Stats StdDev: 0.250882 0.234866 0.294000 (float)
16+
Stats NanCount: 0 0 0
17+
Stats InfCount: 0 0 0
18+
Stats FiniteCount: 16 16 16
19+
Constant: No
20+
Monochrome: No
21+
MIP 1 of 3 (2 x 2):
22+
Stats Min: 0.318420 0.497457 0.352619 (float)
23+
Stats Max: 0.588968 0.750976 0.712977 (float)
24+
Stats Avg: 0.455336 0.657517 0.507940 (float)
25+
Stats StdDev: 0.109168 0.098600 0.134781 (float)
26+
Stats NanCount: 0 0 0
27+
Stats InfCount: 0 0 0
28+
Stats FiniteCount: 4 4 4
29+
Constant: No
30+
Monochrome: No
31+
MIP 2 of 3 (1 x 1):
32+
Stats Min: 0.455336 0.657517 0.507940 (float)
33+
Stats Max: 0.455336 0.657517 0.507940 (float)
34+
Stats Avg: 0.455336 0.657517 0.507940 (float)
35+
Stats StdDev: 0.000000 0.000000 0.000000 (float)
36+
Stats NanCount: 0 0 0
37+
Stats InfCount: 0 0 0
38+
Stats FiniteCount: 1 1 1
39+
Constant: Yes
40+
Constant Color: 0.455336 0.657517 0.507940 (float)
41+
Monochrome: No
1142
subimage 1: 4 x 4, 3 channel, float ptex
1243
MIP-map levels: 4x4 2x2 1x1
1344
SHA-1: 2E813D8DAA6013C7DFE8EF84E56B6BD9BEA7F93B
1445
channel list: R, G, B
1546
tile size: 4 x 4
1647
wrapmode: "clamp,clamp"
1748
ptex:meshType: "triangle"
49+
MIP 0 of 3 (4 x 4):
50+
Stats Min: 0.020023 0.192214 0.039280 (float)
51+
Stats Max: 0.956468 0.970634 0.930810 (float)
52+
Stats Avg: 0.543779 0.512279 0.565279 (float)
53+
Stats StdDev: 0.328615 0.248004 0.301121 (float)
54+
Stats NanCount: 0 0 0
55+
Stats InfCount: 0 0 0
56+
Stats FiniteCount: 16 16 16
57+
Constant: No
58+
Monochrome: No
59+
MIP 1 of 3 (2 x 2):
60+
Stats Min: 0.313192 0.412365 0.169771 (float)
61+
Stats Max: 0.720291 0.637934 0.753850 (float)
62+
Stats Avg: 0.543779 0.512279 0.565279 (float)
63+
Stats StdDev: 0.157645 0.082725 0.231522 (float)
64+
Stats NanCount: 0 0 0
65+
Stats InfCount: 0 0 0
66+
Stats FiniteCount: 4 4 4
67+
Constant: No
68+
Monochrome: No
69+
MIP 2 of 3 (1 x 1):
70+
Stats Min: 0.543779 0.512279 0.565279 (float)
71+
Stats Max: 0.543779 0.512279 0.565279 (float)
72+
Stats Avg: 0.543779 0.512279 0.565279 (float)
73+
Stats StdDev: 0.000000 0.000000 0.000000 (float)
74+
Stats NanCount: 0 0 0
75+
Stats InfCount: 0 0 0
76+
Stats FiniteCount: 1 1 1
77+
Constant: Yes
78+
Constant Color: 0.543779 0.512279 0.565279 (float)
79+
Monochrome: No
1880
subimage 2: 4 x 4, 3 channel, float ptex
1981
MIP-map levels: 4x4 2x2 1x1
2082
SHA-1: 79B3511C35A63D9AD8EF2691E76DE191103CF450
2183
channel list: R, G, B
2284
tile size: 4 x 4
2385
wrapmode: "clamp,clamp"
2486
ptex:meshType: "triangle"
87+
MIP 0 of 3 (4 x 4):
88+
Stats Min: 0.103171 0.052529 0.074530 (float)
89+
Stats Max: 0.950252 0.984752 0.935004 (float)
90+
Stats Avg: 0.563713 0.436754 0.494340 (float)
91+
Stats StdDev: 0.281871 0.289231 0.282866 (float)
92+
Stats NanCount: 0 0 0
93+
Stats InfCount: 0 0 0
94+
Stats FiniteCount: 16 16 16
95+
Constant: No
96+
Monochrome: No
97+
MIP 1 of 3 (2 x 2):
98+
Stats Min: 0.381167 0.370179 0.320667 (float)
99+
Stats Max: 0.719777 0.501763 0.594077 (float)
100+
Stats Avg: 0.563713 0.436754 0.494340 (float)
101+
Stats StdDev: 0.122539 0.051085 0.104512 (float)
102+
Stats NanCount: 0 0 0
103+
Stats InfCount: 0 0 0
104+
Stats FiniteCount: 4 4 4
105+
Constant: No
106+
Monochrome: No
107+
MIP 2 of 3 (1 x 1):
108+
Stats Min: 0.563713 0.436754 0.494341 (float)
109+
Stats Max: 0.563713 0.436754 0.494341 (float)
110+
Stats Avg: 0.563713 0.436754 0.494341 (float)
111+
Stats StdDev: 0.000000 0.000000 0.000000 (float)
112+
Stats NanCount: 0 0 0
113+
Stats InfCount: 0 0 0
114+
Stats FiniteCount: 1 1 1
115+
Constant: Yes
116+
Constant Color: 0.563713 0.436754 0.494341 (float)
117+
Monochrome: No
25118
subimage 3: 4 x 4, 3 channel, float ptex
26119
MIP-map levels: 4x4 2x2 1x1
27120
SHA-1: E5AEE2FB805B38C351034D4FECEF603AD8042ABE
28121
channel list: R, G, B
29122
tile size: 4 x 4
30123
wrapmode: "clamp,clamp"
31124
ptex:meshType: "triangle"
125+
MIP 0 of 3 (4 x 4):
126+
Stats Min: 0.051939 0.004162 0.078232 (float)
127+
Stats Max: 0.997799 0.913027 0.999994 (float)
128+
Stats Avg: 0.451218 0.483004 0.557300 (float)
129+
Stats StdDev: 0.312809 0.289888 0.347698 (float)
130+
Stats NanCount: 0 0 0
131+
Stats InfCount: 0 0 0
132+
Stats FiniteCount: 16 16 16
133+
Constant: No
134+
Monochrome: No
135+
MIP 1 of 3 (2 x 2):
136+
Stats Min: 0.257657 0.324523 0.324294 (float)
137+
Stats Max: 0.584017 0.606003 0.776059 (float)
138+
Stats Avg: 0.451218 0.483004 0.557300 (float)
139+
Stats StdDev: 0.119579 0.116249 0.164337 (float)
140+
Stats NanCount: 0 0 0
141+
Stats InfCount: 0 0 0
142+
Stats FiniteCount: 4 4 4
143+
Constant: No
144+
Monochrome: No
145+
MIP 2 of 3 (1 x 1):
146+
Stats Min: 0.451218 0.483004 0.557300 (float)
147+
Stats Max: 0.451218 0.483004 0.557300 (float)
148+
Stats Avg: 0.451218 0.483004 0.557300 (float)
149+
Stats StdDev: 0.000000 0.000000 0.000000 (float)
150+
Stats NanCount: 0 0 0
151+
Stats InfCount: 0 0 0
152+
Stats FiniteCount: 1 1 1
153+
Constant: Yes
154+
Constant Color: 0.451218 0.483004 0.557300 (float)
155+
Monochrome: No
32156
subimage 4: 4 x 4, 3 channel, float ptex
33157
MIP-map levels: 4x4 2x2 1x1
34158
SHA-1: 749BBBD8B925A6F78B9A307AFDF56ACAE8E0B7E1
35159
channel list: R, G, B
36160
tile size: 4 x 4
37161
wrapmode: "clamp,clamp"
38162
ptex:meshType: "triangle"
163+
MIP 0 of 3 (4 x 4):
164+
Stats Min: 0.229137 0.003231 0.035421 (float)
165+
Stats Max: 0.873271 0.971466 0.983596 (float)
166+
Stats Avg: 0.591404 0.590163 0.475037 (float)
167+
Stats StdDev: 0.174450 0.289065 0.354256 (float)
168+
Stats NanCount: 0 0 0
169+
Stats InfCount: 0 0 0
170+
Stats FiniteCount: 16 16 16
171+
Constant: No
172+
Monochrome: No
173+
MIP 1 of 3 (2 x 2):
174+
Stats Min: 0.471063 0.345994 0.203815 (float)
175+
Stats Max: 0.690243 0.698163 0.727344 (float)
176+
Stats Avg: 0.591404 0.590163 0.475037 (float)
177+
Stats StdDev: 0.079742 0.142186 0.211749 (float)
178+
Stats NanCount: 0 0 0
179+
Stats InfCount: 0 0 0
180+
Stats FiniteCount: 4 4 4
181+
Constant: No
182+
Monochrome: No
183+
MIP 2 of 3 (1 x 1):
184+
Stats Min: 0.591404 0.590163 0.475037 (float)
185+
Stats Max: 0.591404 0.590163 0.475037 (float)
186+
Stats Avg: 0.591404 0.590163 0.475037 (float)
187+
Stats StdDev: 0.000000 0.000000 0.000000 (float)
188+
Stats NanCount: 0 0 0
189+
Stats InfCount: 0 0 0
190+
Stats FiniteCount: 1 1 1
191+
Constant: Yes
192+
Constant Color: 0.591404 0.590163 0.475037 (float)
193+
Monochrome: No
39194
subimage 5: 4 x 4, 3 channel, float ptex
40195
MIP-map levels: 4x4 2x2 1x1
41196
SHA-1: 2125A335891CB63F42574D4CDE73B00A81530D00
42197
channel list: R, G, B
43198
tile size: 4 x 4
44199
wrapmode: "clamp,clamp"
45200
ptex:meshType: "triangle"
201+
MIP 0 of 3 (4 x 4):
202+
Stats Min: 0.111276 0.040864 0.003579 (float)
203+
Stats Max: 0.877384 0.984363 0.920914 (float)
204+
Stats Avg: 0.565089 0.502832 0.405740 (float)
205+
Stats StdDev: 0.219740 0.287309 0.260266 (float)
206+
Stats NanCount: 0 0 0
207+
Stats InfCount: 0 0 0
208+
Stats FiniteCount: 16 16 16
209+
Constant: No
210+
Monochrome: No
211+
MIP 1 of 3 (2 x 2):
212+
Stats Min: 0.441011 0.392536 0.171864 (float)
213+
Stats Max: 0.685750 0.584574 0.557451 (float)
214+
Stats Avg: 0.565089 0.502832 0.405740 (float)
215+
Stats StdDev: 0.088632 0.069489 0.159387 (float)
216+
Stats NanCount: 0 0 0
217+
Stats InfCount: 0 0 0
218+
Stats FiniteCount: 4 4 4
219+
Constant: No
220+
Monochrome: No
221+
MIP 2 of 3 (1 x 1):
222+
Stats Min: 0.565089 0.502832 0.405740 (float)
223+
Stats Max: 0.565089 0.502832 0.405740 (float)
224+
Stats Avg: 0.565089 0.502832 0.405740 (float)
225+
Stats StdDev: 0.000000 0.000000 0.000000 (float)
226+
Stats NanCount: 0 0 0
227+
Stats InfCount: 0 0 0
228+
Stats FiniteCount: 1 1 1
229+
Constant: Yes
230+
Constant Color: 0.565089 0.502832 0.405740 (float)
231+
Monochrome: No
46232
subimage 6: 4 x 4, 3 channel, float ptex
47233
MIP-map levels: 4x4 2x2 1x1
48234
SHA-1: F4F98B602AC70B7FD5021A1493E769526927AB04
49235
channel list: R, G, B
50236
tile size: 4 x 4
51237
wrapmode: "clamp,clamp"
52238
ptex:meshType: "triangle"
239+
MIP 0 of 3 (4 x 4):
240+
Stats Min: 0.162757 0.121259 0.121143 (float)
241+
Stats Max: 0.943051 0.916273 0.931895 (float)
242+
Stats Avg: 0.594799 0.511685 0.570391 (float)
243+
Stats StdDev: 0.240079 0.239136 0.314564 (float)
244+
Stats NanCount: 0 0 0
245+
Stats InfCount: 0 0 0
246+
Stats FiniteCount: 16 16 16
247+
Constant: No
248+
Monochrome: No
249+
MIP 1 of 3 (2 x 2):
250+
Stats Min: 0.450439 0.366167 0.347403 (float)
251+
Stats Max: 0.777456 0.620979 0.780870 (float)
252+
Stats Avg: 0.594799 0.511685 0.570391 (float)
253+
Stats StdDev: 0.126109 0.108686 0.156181 (float)
254+
Stats NanCount: 0 0 0
255+
Stats InfCount: 0 0 0
256+
Stats FiniteCount: 4 4 4
257+
Constant: No
258+
Monochrome: No
259+
MIP 2 of 3 (1 x 1):
260+
Stats Min: 0.594799 0.511685 0.570391 (float)
261+
Stats Max: 0.594799 0.511685 0.570391 (float)
262+
Stats Avg: 0.594799 0.511685 0.570391 (float)
263+
Stats StdDev: 0.000000 0.000000 0.000000 (float)
264+
Stats NanCount: 0 0 0
265+
Stats InfCount: 0 0 0
266+
Stats FiniteCount: 1 1 1
267+
Constant: Yes
268+
Constant Color: 0.594799 0.511685 0.570391 (float)
269+
Monochrome: No
53270
subimage 7: 4 x 4, 3 channel, float ptex
54271
MIP-map levels: 4x4 2x2 1x1
55272
SHA-1: EAC7068342FC9F973BE55178218E9B6191154C95
56273
channel list: R, G, B
57274
tile size: 4 x 4
58275
wrapmode: "clamp,clamp"
59276
ptex:meshType: "triangle"
277+
MIP 0 of 3 (4 x 4):
278+
Stats Min: 0.107848 0.005409 0.049162 (float)
279+
Stats Max: 0.865535 0.986467 0.984845 (float)
280+
Stats Avg: 0.460912 0.516886 0.469019 (float)
281+
Stats StdDev: 0.198808 0.289930 0.321561 (float)
282+
Stats NanCount: 0 0 0
283+
Stats InfCount: 0 0 0
284+
Stats FiniteCount: 16 16 16
285+
Constant: No
286+
Monochrome: No
287+
MIP 1 of 3 (2 x 2):
288+
Stats Min: 0.377302 0.242403 0.386407 (float)
289+
Stats Max: 0.549650 0.728992 0.513476 (float)
290+
Stats Avg: 0.460912 0.516886 0.469019 (float)
291+
Stats StdDev: 0.081255 0.199093 0.048943 (float)
292+
Stats NanCount: 0 0 0
293+
Stats InfCount: 0 0 0
294+
Stats FiniteCount: 4 4 4
295+
Constant: No
296+
Monochrome: No
297+
MIP 2 of 3 (1 x 1):
298+
Stats Min: 0.460912 0.516886 0.469018 (float)
299+
Stats Max: 0.460912 0.516886 0.469018 (float)
300+
Stats Avg: 0.460912 0.516886 0.469018 (float)
301+
Stats StdDev: 0.000000 0.000000 0.000000 (float)
302+
Stats NanCount: 0 0 0
303+
Stats InfCount: 0 0 0
304+
Stats FiniteCount: 1 1 1
305+
Constant: Yes
306+
Constant Color: 0.460912 0.516886 0.469018 (float)
307+
Monochrome: No
60308
subimage 8: 4 x 4, 3 channel, float ptex
61309
MIP-map levels: 4x4 2x2 1x1
62310
SHA-1: 36A0877272CDB3322250E4097CCF09CDFCEA3F1C
63311
channel list: R, G, B
64312
tile size: 4 x 4
65313
wrapmode: "clamp,clamp"
66314
ptex:meshType: "triangle"
315+
MIP 0 of 3 (4 x 4):
316+
Stats Min: 0.036327 0.051508 0.053422 (float)
317+
Stats Max: 0.578635 0.923728 0.888723 (float)
318+
Stats Avg: 0.316691 0.450849 0.591512 (float)
319+
Stats StdDev: 0.164422 0.282466 0.271684 (float)
320+
Stats NanCount: 0 0 0
321+
Stats InfCount: 0 0 0
322+
Stats FiniteCount: 16 16 16
323+
Constant: No
324+
Monochrome: No
325+
MIP 1 of 3 (2 x 2):
326+
Stats Min: 0.199711 0.342857 0.372131 (float)
327+
Stats Max: 0.443723 0.671889 0.727743 (float)
328+
Stats Avg: 0.316691 0.450849 0.591512 (float)
329+
Stats StdDev: 0.089302 0.129479 0.136447 (float)
330+
Stats NanCount: 0 0 0
331+
Stats InfCount: 0 0 0
332+
Stats FiniteCount: 4 4 4
333+
Constant: No
334+
Monochrome: No
335+
MIP 2 of 3 (1 x 1):
336+
Stats Min: 0.316691 0.450849 0.591512 (float)
337+
Stats Max: 0.316691 0.450849 0.591512 (float)
338+
Stats Avg: 0.316691 0.450849 0.591512 (float)
339+
Stats StdDev: 0.000000 0.000000 0.000000 (float)
340+
Stats NanCount: 0 0 0
341+
Stats InfCount: 0 0 0
342+
Stats FiniteCount: 1 1 1
343+
Constant: Yes
344+
Constant Color: 0.316691 0.450849 0.591512 (float)
345+
Monochrome: No

‎testsuite/ptex/run.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
imagedir = "src"
99
files = [ "triangle.ptx" ]
1010
for f in files:
11-
command += info_command (imagedir + "/" + f)
11+
command += info_command (imagedir + "/" + f, extraargs="--stats")

0 commit comments

Comments
 (0)