ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/test/renders/Makefile
(Generate patch)

Comparing ray/test/renders/Makefile (file contents):
Revision 1.22 by greg, Tue Jun 30 18:51:30 2020 UTC vs.
Revision 1.39 by greg, Wed Jan 17 18:57:54 2024 UTC

# Line 4 | Line 4
4   #
5  
6   # Number of processes to use on tests that run multi-core
7 < NPROC = 2
7 > ifeq ($(OS),Windows_NT)  # is Windows
8 >        NPROC := 1
9 > else
10 >        NPROC := 2
11 > endif
12  
13   # Image reduction for comparisons
14   RDU_PFILT = pfilt -1 -r 1 -x 128 -y 128 -pa 1
15  
16   # Image comparison command
17 < IMG_CMP = radcompare -rms 0.07 -max 1.5
17 > IMG_CMP = radcompare -rel 0.007 -rms 0.1 -max 1.5
18  
19   # Default target is to test everything
20   all:    test-xform test-oconv test-rad test-rfluxmtx test-rpiece \
21   test-rpict test-mkpmap \
22 + test-trans2-def test-trans2-fish test-trans2-win \
23   test-mixtex-def test-mixtex-fish test-mixtex-plan test-mixtex-rplan \
19 – test-trans2-def test-trans2-fish test-dielectric-def \
20 – test-dielectric-fish test-glass-def test-glass-fish test-glass-up \
24   test-tfunc-def test-tfunc-fish test-inst-def test-inst-fish \
25 < test-mesh-def test-mesh-cyl test-mirror-fish test-mist-def \
26 < test-trans-def test-trans-fish test-patterns-def test-patterns-plan \
27 < test-rtrace test-obj2mesh
25 > test-mesh-def test-mesh-cyl test-mesh-cyl2 test-mist-def \
26 > test-dielectric-def test-dielectric-fish test-trans-def \
27 > test-glass-def test-glass-fish test-glass-up \
28 > test-trans-fish test-patterns-def test-patterns-plan \
29 > test-rtrace test-mirror-fish test-obj2mesh \
30 > test-prism1-fish test-prism2-fish test-spectra-fish
31  
32   clean:
33          rm -f *.oct *.amb *_ill.dat blinds_ill?.dat *_*.hdr *.unf \
34   *.[cg]pm{,.leaf} inst_rad.txt combined.rad rfmirror.mtx
35  
36 + ######
37 + # More-or-less evenly divided batches for NPROC=1 (redundancies removed)
38 +
39 + batch1: test-mixtex-def test-mixtex-fish test-mixtex-plan test-mixtex-rplan \
40 + test-xform test-oconv test-rad test-obj2mesh
41 +
42 + batch2: test-rfluxmtx test-mist-def test-glass-def test-glass-fish test-glass-up \
43 + test-spectra-fish
44 +
45 + batch3: test-inst-def test-inst-fish test-trans2-def test-trans2-fish test-trans2-win \
46 + test-dielectric-def test-dielectric-fish
47 +
48 + batch4: test-rtrace test-prism1-fish test-prism2-fish test-mirror-fish \
49 + test-mesh-def test-mesh-cyl test-mesh-cyl2 test-tfunc-def test-tfunc-fish \
50 + test-trans-def test-trans-fish test-patterns-def test-patterns-plan
51 +
52   ### Test Aliases ###
53  
54   test-rpict:     test-mirror-fish
# Line 36 | Line 58 | test-rpiece test-mkpmap:       test-mixtex-def
58   ### Special test of xform ###
59  
60   test-xform:     combined.rad
61 <        radcompare -max 0.04 ref/combined.rad combined.rad
61 >        radcompare "-c#" -max 0.04 ref/combined.rad combined.rad
62  
63   combined.rad:   combined_scene.rad
64 <        xform -f combined_scene.rad | grep -v '^[       ]*#' > combined.rad
64 >        xform -f combined_scene.rad > combined.rad
65  
66   ### Special test of rad ###
67  
68 < test-rad:       inst.rif
68 > test-rad:       inst.oct
69          rad -n -s -e inst.rif > inst_rad.txt
70          radcompare ref/inst_rad.txt inst_rad.txt
71  
# Line 57 | Line 79 | test-obj2mesh: cab.obj
79  
80   ### Special test of rtrace ###
81  
82 < test-rtrace:    ref/mirror_fish.hdr  rtmirror_fish.hdr
82 > test-rtrace:    ref/mirror_fish.hdr rtmirror_fish.hdr
83          $(RDU_PFILT) rtmirror_fish.hdr | $(IMG_CMP) -h ref/mirror_fish.hdr -
84  
85   rtmirror_fish.hdr:      mirror.oct
86          rad -v 0 mirror.rif OPT=mirror.opt
87 <        vwrays -ff -vf fish.vf -x 2048 -y 2048 | rtrace -n $(NPROC) @mirror.opt \
88 < -ffc -x 2048 -y 2048 mirror.oct | pfilt -1 -e +3 -r .6 -x /2 -y /2 \
87 >        vwrays -ff -vf fish.vf -x 2048 -y 1991 | rtrace -n $(NPROC) @mirror.opt \
88 > -ffc -x 2048 -y 1991 mirror.oct | pfilt -1 -e +3 -r .6 -x /2 -y /2 \
89   > rtmirror_fish.hdr
90          rm -f mirror.opt
91  
# Line 88 | Line 110 | dielectric.oct:        dielectric.rif
110   test-dielectric-def:    ref/dielectric_def.hdr dielectric_def.hdr
111          $(RDU_PFILT) dielectric_def.hdr | $(IMG_CMP) ref/dielectric_def.hdr -
112  
113 < ref/dielectric_def.hdr:
92 <        make dielectric_def.hdr
113 > ref/dielectric_def.hdr: dielectric_def.hdr
114          $(RDU_PFILT) dielectric_def.hdr > ref/dielectric_def.hdr
115  
116   dielectric_def.hdr:     dielectric.oct
# Line 102 | Line 123 | dielectric_def.hdr:    dielectric.oct
123   test-dielectric-fish:   ref/dielectric_fish.hdr dielectric_fish.hdr
124          $(RDU_PFILT) dielectric_fish.hdr | $(IMG_CMP) ref/dielectric_fish.hdr -
125  
126 < ref/dielectric_fish.hdr:
106 <        make dielectric_fish.hdr
126 > ref/dielectric_fish.hdr:        dielectric_fish.hdr
127          $(RDU_PFILT) dielectric_fish.hdr > ref/dielectric_fish.hdr
128  
129   dielectric_fish.hdr:    dielectric.oct
# Line 121 | Line 141 | glass.oct:     glass.rif
141   test-glass-def: ref/glass_def.hdr   glass_def.hdr
142          $(RDU_PFILT)   glass_def.hdr | $(IMG_CMP) ref/glass_def.hdr -
143  
144 < ref/glass_def.hdr:
125 <        make   glass_def.hdr
144 > ref/glass_def.hdr:      glass_def.hdr
145          $(RDU_PFILT)   glass_def.hdr > ref/glass_def.hdr
146  
147   glass_def.hdr:  glass.oct
# Line 135 | Line 154 | glass_def.hdr: glass.oct
154   test-glass-fish:        ref/glass_fish.hdr   glass_fish.hdr
155          $(RDU_PFILT)   glass_fish.hdr | $(IMG_CMP) ref/glass_fish.hdr -
156  
157 < ref/glass_fish.hdr:
139 <        make   glass_fish.hdr
157 > ref/glass_fish.hdr:     glass_fish.hdr
158          $(RDU_PFILT)   glass_fish.hdr > ref/glass_fish.hdr
159  
160   glass_fish.hdr: glass.oct
# Line 149 | Line 167 | glass_fish.hdr:        glass.oct
167   test-glass-up:  ref/glass_up.hdr   glass_up.hdr
168          $(RDU_PFILT)   glass_up.hdr | $(IMG_CMP) ref/glass_up.hdr -
169  
170 < ref/glass_up.hdr:
153 <        make   glass_up.hdr
170 > ref/glass_up.hdr:       glass_up.hdr
171          $(RDU_PFILT)   glass_up.hdr > ref/glass_up.hdr
172  
173   glass_up.hdr:   glass.oct
# Line 168 | Line 185 | inst.oct:      inst.rif
185   test-inst-def:  ref/inst_def.hdr    inst_def.hdr
186          $(RDU_PFILT)    inst_def.hdr | $(IMG_CMP) ref/inst_def.hdr -
187  
188 < ref/inst_def.hdr:
172 <        make    inst_def.hdr
188 > ref/inst_def.hdr:       inst_def.hdr
189          $(RDU_PFILT)    inst_def.hdr > ref/inst_def.hdr
190  
191   inst_def.hdr:   inst.oct
# Line 182 | Line 198 | inst_def.hdr:  inst.oct
198   test-inst-fish: ref/inst_fish.hdr    inst_fish.hdr
199          $(RDU_PFILT)    inst_fish.hdr | $(IMG_CMP) ref/inst_fish.hdr -
200  
201 < ref/inst_fish.hdr:
186 <        make    inst_fish.hdr
201 > ref/inst_fish.hdr:      inst_fish.hdr
202          $(RDU_PFILT)    inst_fish.hdr > ref/inst_fish.hdr
203  
204   inst_fish.hdr:  inst.oct
# Line 201 | Line 216 | mesh.oct:      mesh.rif
216   test-mesh-def:  ref/mesh_def.hdr    mesh_def.hdr
217          $(RDU_PFILT)    mesh_def.hdr | $(IMG_CMP) ref/mesh_def.hdr -
218  
219 < ref/mesh_def.hdr:
205 <        make    mesh_def.hdr
219 > ref/mesh_def.hdr:       mesh_def.hdr
220          $(RDU_PFILT)    mesh_def.hdr > ref/mesh_def.hdr
221  
222   mesh_def.hdr:   mesh.oct
# Line 215 | Line 229 | mesh_def.hdr:  mesh.oct
229   test-mesh-cyl:  ref/mesh_cyl.hdr    mesh_cyl.hdr
230          $(RDU_PFILT)    mesh_cyl.hdr | $(IMG_CMP) ref/mesh_cyl.hdr -
231  
232 < ref/mesh_cyl.hdr:
219 <        make    mesh_cyl.hdr
232 > ref/mesh_cyl.hdr:       mesh_cyl.hdr
233          $(RDU_PFILT)    mesh_cyl.hdr > ref/mesh_cyl.hdr
234  
235   mesh_cyl.hdr:   mesh.oct
# Line 229 | Line 242 | mesh_cyl.hdr:  mesh.oct
242   test-mesh-cyl2: ref/mesh_cyl2.hdr    mesh_cyl2.hdr
243          $(RDU_PFILT)    mesh_cyl2.hdr | $(IMG_CMP) ref/mesh_cyl2.hdr -
244  
245 < ref/mesh_cyl2.hdr:
233 <        make    mesh_cyl2.hdr
245 > ref/mesh_cyl2.hdr:      mesh_cyl2.hdr
246          $(RDU_PFILT)    mesh_cyl2.hdr > ref/mesh_cyl2.hdr
247  
248   mesh_cyl2.hdr:  mesh.oct
# Line 248 | Line 260 | mirror.oct:    mirror.rif
260   test-mirror-fish:       ref/mirror_fish.hdr  mirror_fish.hdr
261          $(RDU_PFILT)  mirror_fish.hdr | $(IMG_CMP) ref/mirror_fish.hdr -
262  
263 < ref/mirror_fish.hdr:
252 <        make  mirror_fish.hdr
263 > ref/mirror_fish.hdr:    mirror_fish.hdr
264          $(RDU_PFILT)  mirror_fish.hdr > ref/mirror_fish.hdr
265  
266   mirror_fish.hdr:        mirror.oct
# Line 262 | Line 273 | mirror_fish.hdr:       mirror.oct
273   test-mist-def:  ref/mist_def.hdr    mist_def.hdr
274          $(RDU_PFILT)    mist_def.hdr | $(IMG_CMP) ref/mist_def.hdr -
275  
276 < ref/mist_def.hdr:
266 <        make    mist_def.hdr
276 > ref/mist_def.hdr:       mist_def.hdr
277          $(RDU_PFILT)    mist_def.hdr > ref/mist_def.hdr
278  
279   mist_def.hdr:   mist.rif
# Line 281 | Line 291 | prism1.oct:    prism1.rif
291   test-prism1-fish:       ref/prism1_fish.hdr  prism1_fish.hdr
292          $(RDU_PFILT)  prism1_fish.hdr | $(IMG_CMP) ref/prism1_fish.hdr -
293  
294 < ref/prism1_fish.hdr:
285 <        make  prism1_fish.hdr
294 > ref/prism1_fish.hdr:    prism1_fish.hdr
295          $(RDU_PFILT)  prism1_fish.hdr > ref/prism1_fish.hdr
296  
297   prism1_fish.hdr:        prism1.oct
# Line 300 | Line 309 | prism2.oct:    prism2.rif
309   test-prism2-fish:       ref/prism2_fish.hdr  prism2_fish.hdr
310          $(RDU_PFILT)  prism2_fish.hdr | $(IMG_CMP) ref/prism2_fish.hdr -
311  
312 < ref/prism2_fish.hdr:
304 <        make  prism2_fish.hdr
312 > ref/prism2_fish.hdr:    prism2_fish.hdr
313          $(RDU_PFILT)  prism2_fish.hdr > ref/prism2_fish.hdr
314  
315   prism2_fish.hdr:        prism2.oct
# Line 311 | Line 319 | prism2_fish.hdr:       prism2.oct
319  
320   ### Octree for   tfunc ###
321  
322 < tfunc.oct:      tfunc.rif
322 > tfunc1.oct:     tfunc.rif
323          rad -v 0   tfunc.rif
324  
325   ### Reference and test for   tfunc view   def ###
# Line 319 | Line 327 | tfunc.oct:     tfunc.rif
327   test-tfunc-def: ref/tfunc_def.hdr   tfunc_def.hdr
328          $(RDU_PFILT)   tfunc_def.hdr | $(IMG_CMP) ref/tfunc_def.hdr -
329  
330 < ref/tfunc_def.hdr:
323 <        make   tfunc_def.hdr
330 > ref/tfunc_def.hdr:      tfunc_def.hdr
331          $(RDU_PFILT)   tfunc_def.hdr > ref/tfunc_def.hdr
332  
333 < tfunc_def.hdr:  tfunc.oct
333 > tfunc_def.hdr:  tfunc1.oct
334          rad -v   def   tfunc.rif
335  
336   ### End   tfunc-def   tests
# Line 333 | Line 340 | tfunc_def.hdr: tfunc.oct
340   test-tfunc-fish:        ref/tfunc_fish.hdr   tfunc_fish.hdr
341          $(RDU_PFILT)   tfunc_fish.hdr | $(IMG_CMP) ref/tfunc_fish.hdr -
342  
343 < ref/tfunc_fish.hdr:
337 <        make   tfunc_fish.hdr
343 > ref/tfunc_fish.hdr:     tfunc_fish.hdr
344          $(RDU_PFILT)   tfunc_fish.hdr > ref/tfunc_fish.hdr
345  
346 < tfunc_fish.hdr: tfunc.oct
346 > tfunc_fish.hdr: tfunc1.oct
347          rad -v  fish   tfunc.rif
348  
349   ### End   tfunc-fish  tests
# Line 352 | Line 358 | trans.oct:     trans.rif
358   test-trans-def: ref/trans_def.hdr   trans_def.hdr
359          $(RDU_PFILT)   trans_def.hdr | $(IMG_CMP) ref/trans_def.hdr -
360  
361 < ref/trans_def.hdr:
356 <        make   trans_def.hdr
361 > ref/trans_def.hdr:       trans_def.hdr
362          $(RDU_PFILT)   trans_def.hdr > ref/trans_def.hdr
363  
364   trans_def.hdr:  trans.oct
# Line 366 | Line 371 | trans_def.hdr: trans.oct
371   test-trans-fish:        ref/trans_fish.hdr   trans_fish.hdr
372          $(RDU_PFILT)   trans_fish.hdr | $(IMG_CMP) ref/trans_fish.hdr -
373  
374 < ref/trans_fish.hdr:
370 <        make   trans_fish.hdr
374 > ref/trans_fish.hdr:     trans_fish.hdr
375          $(RDU_PFILT)   trans_fish.hdr > ref/trans_fish.hdr
376  
377   trans_fish.hdr: trans.oct
# Line 377 | Line 381 | trans_fish.hdr:        trans.oct
381  
382   ### Octree for  trans2 ###
383  
384 < trans2.oct:     trans2.rif
384 > trans21.oct:    trans2.rif
385          rad -v 0  trans2.rif
386  
387   ### Reference and test for  trans2 view   def ###
# Line 385 | Line 389 | trans2.oct:    trans2.rif
389   test-trans2-def:        ref/trans2_def.hdr  trans2_def.hdr
390          $(RDU_PFILT)  trans2_def.hdr | $(IMG_CMP) ref/trans2_def.hdr -
391  
392 < ref/trans2_def.hdr:
389 <        make  trans2_def.hdr
392 > ref/trans2_def.hdr:     trans2_def.hdr
393          $(RDU_PFILT)  trans2_def.hdr > ref/trans2_def.hdr
394  
395 < trans2_def.hdr: trans2.oct
395 > trans2_def.hdr: trans21.oct
396          rad -v   def  trans2.rif
397  
398   ### End  trans2-def   tests
# Line 399 | Line 402 | trans2_def.hdr:        trans2.oct
402   test-trans2-fish:       ref/trans2_fish.hdr  trans2_fish.hdr
403          $(RDU_PFILT)  trans2_fish.hdr | $(IMG_CMP) ref/trans2_fish.hdr -
404  
405 < ref/trans2_fish.hdr:
403 <        make  trans2_fish.hdr
405 > ref/trans2_fish.hdr:    trans2_fish.hdr
406          $(RDU_PFILT)  trans2_fish.hdr > ref/trans2_fish.hdr
407  
408 < trans2_fish.hdr:        trans2.oct
408 > trans2_fish.hdr:        trans21.oct
409          rad -v  fish  trans2.rif
410  
411   ### End  trans2-fish  tests
# Line 413 | Line 415 | trans2_fish.hdr:       trans2.oct
415   test-trans2-win:        ref/trans2_win.hdr  trans2_win.hdr
416          $(RDU_PFILT)  trans2_win.hdr | $(IMG_CMP) ref/trans2_win.hdr -
417  
418 < ref/trans2_win.hdr:
417 <        make  trans2_win.hdr
418 > ref/trans2_win.hdr:     trans2_win.hdr
419          $(RDU_PFILT)  trans2_win.hdr > ref/trans2_win.hdr
420  
421 < trans2_win.hdr: trans2.oct
421 > trans2_win.hdr: trans21.oct
422          rad -v   win  trans2.rif
423  
424   ### End  trans2-win   tests
# Line 432 | Line 433 | patterns.oct:  patterns.rif
433   test-patterns-def:      ref/patterns_def.hdr patterns_def.hdr
434          $(RDU_PFILT) patterns_def.hdr | $(IMG_CMP) ref/patterns_def.hdr -
435  
436 < ref/patterns_def.hdr:
436 <        make patterns_def.hdr
436 > ref/patterns_def.hdr:   patterns_def.hdr
437          $(RDU_PFILT) patterns_def.hdr > ref/patterns_def.hdr
438  
439   patterns_def.hdr:       patterns.oct
# Line 446 | Line 446 | patterns_def.hdr:      patterns.oct
446   test-patterns-plan:     ref/patterns_plan.hdr patterns_plan.hdr
447          $(RDU_PFILT) patterns_plan.hdr | $(IMG_CMP) ref/patterns_plan.hdr -
448  
449 < ref/patterns_plan.hdr:
450 <        make patterns_plan.hdr
449 > ref/patterns_plan.hdr:  patterns_plan.hdr
450          $(RDU_PFILT) patterns_plan.hdr > ref/patterns_plan.hdr
451  
452   patterns_plan.hdr:      patterns.oct
# Line 465 | Line 464 | mixtex.oct:    mixtex.rif
464   test-mixtex-def:        ref/mixtex_def.hdr  mixtex_def.hdr
465          $(RDU_PFILT)  mixtex_def.hdr | $(IMG_CMP) ref/mixtex_def.hdr -
466  
467 < ref/mixtex_def.hdr:
469 <        make  mixtex_def.hdr
467 > ref/mixtex_def.hdr:     mixtex_def.hdr
468          $(RDU_PFILT)  mixtex_def.hdr > ref/mixtex_def.hdr
469  
470   mixtex_def.hdr: mixtex.oct
# Line 479 | Line 477 | mixtex_def.hdr:        mixtex.oct
477   test-mixtex-fish:       ref/mixtex_fish.hdr  mixtex_fish.hdr
478          $(RDU_PFILT)  mixtex_fish.hdr | $(IMG_CMP) ref/mixtex_fish.hdr -
479  
480 < ref/mixtex_fish.hdr:
483 <        make  mixtex_fish.hdr
480 > ref/mixtex_fish.hdr:    mixtex_fish.hdr
481          $(RDU_PFILT)  mixtex_fish.hdr > ref/mixtex_fish.hdr
482  
483   mixtex_fish.hdr:        mixtex.oct
# Line 493 | Line 490 | mixtex_fish.hdr:       mixtex.oct
490   test-mixtex-plan:       ref/mixtex_plan.hdr  mixtex_plan.hdr
491          $(RDU_PFILT)  mixtex_plan.hdr | $(IMG_CMP) ref/mixtex_plan.hdr -
492  
493 < ref/mixtex_plan.hdr:
497 <        make  mixtex_plan.hdr
493 > ref/mixtex_plan.hdr:    mixtex_plan.hdr
494          $(RDU_PFILT)  mixtex_plan.hdr > ref/mixtex_plan.hdr
495  
496   mixtex_plan.hdr:        mixtex.oct
# Line 507 | Line 503 | mixtex_plan.hdr:       mixtex.oct
503   test-mixtex-rplan:      ref/mixtex_rplan.hdr  mixtex_rplan.hdr
504          $(RDU_PFILT)  mixtex_rplan.hdr | $(IMG_CMP) ref/mixtex_rplan.hdr -
505  
506 < ref/mixtex_rplan.hdr:
511 <        make  mixtex_rplan.hdr
506 > ref/mixtex_rplan.hdr:   mixtex_rplan.hdr
507          $(RDU_PFILT)  mixtex_rplan.hdr > ref/mixtex_rplan.hdr
508  
509   mixtex_rplan.hdr:       mixtex.oct
510          rad -v rplan  mixtex.rif
511  
512   ### End  mixtex-rplan tests
513 +
514 + ### Octree for spectra
515 +
516 + spectra.oct:    spectra.rif
517 +        rad -v 0 spectra.rif
518 +
519 + ### Reference and test for spectra fish ###
520 +
521 + test-spectra-fish:      ref/spectra_fish.hdr spectra_fish.hdr
522 +        $(RDU_PFILT) spectra_fish.hdr | $(IMG_CMP) ref/spectra_fish.hdr -
523 +
524 + ref/spectra_fish.hdr:   spectra_fish.hdr
525 +        $(RDU_PFILT) spectra_fish.hdr > ref/spectra_fish.hdr
526 +
527 + spectra_fish.hdr:       spectra.oct
528 +        rad -v fish spectra.rif
529 +
530 + ### End spectra-fish tests

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines