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

Comparing ray/test/renders/Makefile (file contents):
Revision 1.16 by greg, Sat Jan 5 00:34:21 2019 UTC vs.
Revision 1.37 by greg, Fri Nov 17 22:03:14 2023 UTC

# Line 3 | Line 3
3   # Render and primitive type testing
4   #
5  
6 < # Number of processes to use on tests that test multi-core
7 < NPROC = 2
6 > # Number of processes to use on tests that run multi-core
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-rfluxmtx \
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 \
18 – test-trans2-def test-trans2-fish test-dielectric-def \
19 – 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
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} combined.rad rfmirror.mtx
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 +
44 + batch3: test-inst-def test-inst-fish test-trans2-def test-trans2-fish test-trans2-win \
45 + test-dielectric-def test-dielectric-fish
46 +
47 + batch4: test-rtrace test-prism1-fish test-prism2-fish test-mirror-fish \
48 + test-mesh-def test-mesh-cyl test-mesh-cyl2 test-tfunc-def test-tfunc-fish \
49 + test-trans-def test-trans-fish test-patterns-def test-patterns-plan
50 +
51 + ### Test Aliases ###
52 +
53 + test-rpict:     test-mirror-fish
54 +
55 + test-rpiece test-mkpmap:        test-mixtex-def
56 +
57   ### Special test of xform ###
58  
59 < test-xform:     combined_scene.rad
60 <        xform -f combined_scene.rad | grep -v '^[       ]*#' > combined.rad
33 <        radcompare -max 0.04 ref/combined.rad combined.rad
59 > test-xform:     combined.rad
60 >        radcompare "-c#" -max 0.04 ref/combined.rad combined.rad
61  
62 + combined.rad:   combined_scene.rad
63 +        xform -f combined_scene.rad > combined.rad
64 +
65 + ### Special test of rad ###
66 +
67 + test-rad:       inst.oct
68 +        rad -n -s -e inst.rif > inst_rad.txt
69 +        radcompare ref/inst_rad.txt inst_rad.txt
70 +
71 + ### Special tests of oconv and obj2mesh ###
72 +
73 + test-oconv:     inst.oct
74 +        radcompare ref/inst.oct inst.oct
75 +
76 + test-obj2mesh:  cab.obj
77 +        obj2mesh -w cab.obj | radcompare ref/cab.rtm -
78 +
79   ### Special test of rtrace ###
80  
81 < test-rtrace:    ref/mirror_fish.hdr  rtmirror_fish.hdr
81 > test-rtrace:    ref/mirror_fish.hdr rtmirror_fish.hdr
82          $(RDU_PFILT) rtmirror_fish.hdr | $(IMG_CMP) -h ref/mirror_fish.hdr -
83  
84   rtmirror_fish.hdr:      mirror.oct
85          rad -v 0 mirror.rif OPT=mirror.opt
86 <        vwrays -ff -vf fish.vf -x 2048 -y 2048 | rtrace -n $(NPROC) @mirror.opt \
87 < -ffc -x 2048 -y 2048 mirror.oct | pfilt -1 -e +3 -r .6 -x /2 -y /2 \
86 >        vwrays -ff -vf fish.vf -x 2048 -y 1991 | rtrace -n $(NPROC) @mirror.opt \
87 > -ffc -x 2048 -y 1991 mirror.oct | pfilt -1 -e +3 -r .6 -x /2 -y /2 \
88   > rtmirror_fish.hdr
89          rm -f mirror.opt
90  
91   ### Special test for rfluxmtx (and rcontrib) ###
92  
93   test-rfluxmtx:  ref/rfmirror.mtx rfmirror.mtx
94 <        radcompare -max .4 -rms .05 ref/rfmirror.mtx rfmirror.mtx
94 >        radcompare -max .4 -rms .05 -rel 1e-4 ref/rfmirror.mtx rfmirror.mtx
95  
96   rfmirror.mtx:   mirror.rad dummysky.rad basic.mat diorama_walls.rad \
97   closed_end.rad front_cap.rad glass_pane.rad antimatter_portal.rad
# Line 234 | Line 278 | mirror_fish.hdr:       mirror.oct
278  
279   ### End  mirror-fish  tests
280  
237 – ### Octree for    mist ###
238 –
239 – mist.oct:       mist.rif
240 –        rad -v 0    mist.rif
241 –
281   ### Reference and test for    mist view   def ###
282  
283   test-mist-def:  ref/mist_def.hdr    mist_def.hdr
# Line 248 | Line 287 | ref/mist_def.hdr:
287          make    mist_def.hdr
288          $(RDU_PFILT)    mist_def.hdr > ref/mist_def.hdr
289  
290 < mist_def.hdr:   mist.oct
291 <        rad -v   def    mist.rif
290 > mist_def.hdr:   mist.rif
291 >        rad -N $(NPROC) mist.rif
292  
293   ### End    mist-def   tests
294  
# Line 293 | Line 332 | prism2_fish.hdr:       prism2.oct
332  
333   ### Octree for   tfunc ###
334  
335 < tfunc.oct:      tfunc.rif
335 > tfunc1.oct:     tfunc.rif
336          rad -v 0   tfunc.rif
337  
338   ### Reference and test for   tfunc view   def ###
# Line 305 | Line 344 | ref/tfunc_def.hdr:
344          make   tfunc_def.hdr
345          $(RDU_PFILT)   tfunc_def.hdr > ref/tfunc_def.hdr
346  
347 < tfunc_def.hdr:  tfunc.oct
347 > tfunc_def.hdr:  tfunc1.oct
348          rad -v   def   tfunc.rif
349  
350   ### End   tfunc-def   tests
# Line 319 | Line 358 | ref/tfunc_fish.hdr:
358          make   tfunc_fish.hdr
359          $(RDU_PFILT)   tfunc_fish.hdr > ref/tfunc_fish.hdr
360  
361 < tfunc_fish.hdr: tfunc.oct
361 > tfunc_fish.hdr: tfunc1.oct
362          rad -v  fish   tfunc.rif
363  
364   ### End   tfunc-fish  tests
# Line 359 | Line 398 | trans_fish.hdr:        trans.oct
398  
399   ### Octree for  trans2 ###
400  
401 < trans2.oct:     trans2.rif
401 > trans21.oct:    trans2.rif
402          rad -v 0  trans2.rif
403  
404   ### Reference and test for  trans2 view   def ###
# Line 371 | Line 410 | ref/trans2_def.hdr:
410          make  trans2_def.hdr
411          $(RDU_PFILT)  trans2_def.hdr > ref/trans2_def.hdr
412  
413 < trans2_def.hdr: trans2.oct
413 > trans2_def.hdr: trans21.oct
414          rad -v   def  trans2.rif
415  
416   ### End  trans2-def   tests
# Line 385 | Line 424 | ref/trans2_fish.hdr:
424          make  trans2_fish.hdr
425          $(RDU_PFILT)  trans2_fish.hdr > ref/trans2_fish.hdr
426  
427 < trans2_fish.hdr:        trans2.oct
427 > trans2_fish.hdr:        trans21.oct
428          rad -v  fish  trans2.rif
429  
430   ### End  trans2-fish  tests
# Line 399 | Line 438 | ref/trans2_win.hdr:
438          make  trans2_win.hdr
439          $(RDU_PFILT)  trans2_win.hdr > ref/trans2_win.hdr
440  
441 < trans2_win.hdr: trans2.oct
441 > trans2_win.hdr: trans21.oct
442          rad -v   win  trans2.rif
443  
444   ### End  trans2-win   tests
# Line 440 | Line 479 | patterns_plan.hdr:     patterns.oct
479   ### Octree for  mixtex ###
480  
481   mixtex.oct:     mixtex.rif
482 <        rad -v 0  mixtex.rif
482 >        rad -v 0 -N $(NPROC) mixtex.rif
483  
484   ### Reference and test for  mixtex view   def ###
485  
# Line 452 | Line 491 | ref/mixtex_def.hdr:
491          $(RDU_PFILT)  mixtex_def.hdr > ref/mixtex_def.hdr
492  
493   mixtex_def.hdr: mixtex.oct
494 <        rad -v   def  mixtex.rif
494 >        rad -v def -N $(NPROC) mixtex.rif
495  
496   ### End  mixtex-def   tests
497  
# Line 497 | Line 536 | mixtex_rplan.hdr:      mixtex.oct
536          rad -v rplan  mixtex.rif
537  
538   ### End  mixtex-rplan tests
539 +
540 + ### Octree for spectra
541 +
542 + spectra.oct:    spectra.rif
543 +        rad -v 0 spectra.rif
544 +
545 + ### Reference and test for spectra fish ###
546 +
547 + test-spectra-fish:      ref/spectra_fish.hdr spectra_fish.hdr
548 +        $(RDU_PFILT) spectra_fish.hdr | $(IMG_CMP) ref/spectra_fish.hdr -
549 +
550 + ref/spectra_fish.hdr:
551 +        make spectra_fish.hdr
552 +        $(RDU_PFILT) spectra_fish.hdr > ref/spectra_fish.hdr
553 +
554 + spectra_fish.hdr:       spectra.oct
555 +        rad -v fish spectra.rif
556 +
557 + ### End spectra-fish tests

Diff Legend

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