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.21 by greg, Mon Jun 29 23:41:32 2020 UTC vs.
Revision 1.36 by greg, Fri Nov 17 21:22:27 2023 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
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 +
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
# Line 36 | Line 57 | test-rpiece test-mkpmap:       test-mixtex-def
57   ### Special test of xform ###
58  
59   test-xform:     combined.rad
60 <        radcompare -max 0.04 ref/combined.rad 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 | grep -v '^[       ]*#' > combined.rad
63 >        xform -f combined_scene.rad > combined.rad
64  
65   ### Special test of rad ###
66  
67 < test-rad:       inst.rif
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 test of oconv ###
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  
# Line 308 | 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 320 | 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 334 | 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 374 | 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 386 | 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 400 | 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 414 | 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 512 | Line 536 | mixtex_rplan.hdr:      mixtex.oct
536          rad -v rplan  mixtex.rif
537  
538   ### End  mixtex-rplan tests
539 +
540 + ### Reference and test for spectra fish ###
541 +
542 + test-spectra-fish:      ref/spectra_fish.hdr spectra_fish.hdr
543 +        $(RDU_PFILT) spectra_fish.hdr | $(IMG_CMP) ref/spectra_fish.hdr -
544 +
545 + ref/spectra_fish.hdr:
546 +        make spectra_fish.hdr
547 +        $(RDU_PFILT) spectra_fish.hdr > ref/spectra_fish.hdr
548 +
549 + spectra_fish.hdr:       spectra.oct
550 +        rad -v fish spectra.rif
551 +
552 + ### End spectra-fish tests

Diff Legend

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