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.15 by greg, Fri Jan 4 22:45:37 2019 UTC vs.
Revision 1.19 by greg, Fri Jan 25 23:49:41 2019 UTC

# Line 3 | Line 3
3   # Render and primitive type testing
4   #
5  
6 + # Number of processes to use on tests that run multi-core
7 + NPROC = 2
8 +
9   # Image reduction for comparisons
10   RDU_PFILT = pfilt -1 -r 1 -x 128 -y 128 -pa 1
11  
# Line 10 | Line 13 | RDU_PFILT = pfilt -1 -r 1 -x 128 -y 128 -pa 1
13   IMG_CMP = radcompare -rms 0.07 -max 1.5
14  
15   # Default target is to test everything
16 < all:    test-xform test-rfluxmtx \
16 > all:    test-xform test-oconv test-rad test-rfluxmtx test-rpiece \
17 > test-rpict test-mkpmap \
18   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 \
# Line 21 | Line 25 | test-rtrace
25  
26   clean:
27          rm -f *.oct *.amb *_ill.dat blinds_ill?.dat *_*.hdr *.unf \
28 < *.[cg]pm{,.leaf} combined.rad rfmirror.mtx
28 > *.[cg]pm{,.leaf} inst_rad.txt combined.rad rfmirror.mtx
29  
30 + ### Test Aliases ###
31 +
32 + test-rpict:     test-mirror-fish
33 +
34 + test-rpiece test-mkpmap:        test-mixtex-def
35 +
36   ### Special test of xform ###
37  
38   test-xform:     combined_scene.rad
39          xform -f combined_scene.rad | grep -v '^[       ]*#' > combined.rad
40          radcompare -max 0.04 ref/combined.rad combined.rad
41  
42 + ### Special test of rad ###
43 +
44 + test-rad:       inst.rif
45 +        rad -n -s -e inst.rif > inst_rad.txt
46 +        radcompare ref/inst_rad.txt inst_rad.txt
47 +
48 + ### Special test of oconv ###
49 +
50 + test-oconv:     inst.oct
51 +        radcompare ref/inst.oct inst.oct
52 +
53   ### Special test of rtrace ###
54  
55   test-rtrace:    ref/mirror_fish.hdr  rtmirror_fish.hdr
# Line 36 | Line 57 | test-rtrace:   ref/mirror_fish.hdr  rtmirror_fish.hdr
57  
58   rtmirror_fish.hdr:      mirror.oct
59          rad -v 0 mirror.rif OPT=mirror.opt
60 <        vwrays -ff -vf fish.vf -x 2048 -y 2048 | rtrace -n 2 @mirror.opt \
60 >        vwrays -ff -vf fish.vf -x 2048 -y 2048 | rtrace -n $(NPROC) @mirror.opt \
61   -ffc -x 2048 -y 2048 mirror.oct | pfilt -1 -e +3 -r .6 -x /2 -y /2 \
62   > rtmirror_fish.hdr
63          rm -f mirror.opt
# Line 48 | Line 69 | test-rfluxmtx: ref/rfmirror.mtx rfmirror.mtx
69  
70   rfmirror.mtx:   mirror.rad dummysky.rad basic.mat diorama_walls.rad \
71   closed_end.rad front_cap.rad glass_pane.rad antimatter_portal.rad
72 <        rfluxmtx -ab 2 -lw 1e-4 mirror.rad dummysky.rad basic.mat \
73 < diorama_walls.rad closed_end.rad front_cap.rad glass_pane.rad \
74 < antimatter_portal.rad > rfmirror.mtx
72 >        rfluxmtx -n $(NPROC) -ab 2 -lw 1e-4 mirror.rad dummysky.rad \
73 > basic.mat diorama_walls.rad closed_end.rad front_cap.rad \
74 > glass_pane.rad antimatter_portal.rad > rfmirror.mtx
75  
76   ### Octree for dielectric ###
77  
# Line 231 | Line 252 | mirror_fish.hdr:       mirror.oct
252  
253   ### End  mirror-fish  tests
254  
234 ### Octree for    mist ###
235
236 mist.oct:       mist.rif
237        rad -v 0    mist.rif
238
255   ### Reference and test for    mist view   def ###
256  
257   test-mist-def:  ref/mist_def.hdr    mist_def.hdr
# Line 245 | Line 261 | ref/mist_def.hdr:
261          make    mist_def.hdr
262          $(RDU_PFILT)    mist_def.hdr > ref/mist_def.hdr
263  
264 < mist_def.hdr:   mist.oct
265 <        rad -v   def    mist.rif
264 > mist_def.hdr:   mist.rif
265 >        rad -N $(NPROC) mist.rif
266  
267   ### End    mist-def   tests
268  
# Line 437 | Line 453 | patterns_plan.hdr:     patterns.oct
453   ### Octree for  mixtex ###
454  
455   mixtex.oct:     mixtex.rif
456 <        rad -v 0  mixtex.rif
456 >        rad -v 0 -N $(NPROC) mixtex.rif
457  
458   ### Reference and test for  mixtex view   def ###
459  
# Line 449 | Line 465 | ref/mixtex_def.hdr:
465          $(RDU_PFILT)  mixtex_def.hdr > ref/mixtex_def.hdr
466  
467   mixtex_def.hdr: mixtex.oct
468 <        rad -v   def  mixtex.rif
468 >        rad -v def -N $(NPROC) mixtex.rif
469  
470   ### End  mixtex-def   tests
471  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines