ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/util/genBSDF.pl
(Generate patch)

Comparing ray/src/util/genBSDF.pl (file contents):
Revision 2.22 by greg, Fri Jun 24 00:41:51 2011 UTC vs.
Revision 2.27 by greg, Thu Oct 27 16:35:54 2011 UTC

# Line 16 | Line 16 | chomp $td;
16   my @savedARGV = @ARGV;
17   my $tensortree = 0;
18   my $ttlog2 = 4;
19 < my $nsamp = 1000;
19 > my $nsamp = 2000;
20   my $rtargs = "-w -ab 5 -ad 700 -lw 3e-6";
21   my $mgfin = 0;
22   my $geout = 1;
23   my $nproc = 1;
24   my $doforw = 0;
25   my $doback = 1;
26 + my $pctcull = 95;
27   my $gunit = "Meter";
28   my @dim;
29   # Get options
# Line 43 | Line 44 | while ($#ARGV >= 0) {
44                  $doforw = ("$ARGV[0]" =~ /^\+/);
45          } elsif ("$ARGV[0]" =~ /^[-+]b/) {
46                  $doback = ("$ARGV[0]" =~ /^\+/);
47 +        } elsif ("$ARGV[0]" eq "-t") {
48 +                $pctcull = $ARGV[1];
49 +                shift @ARGV;
50          } elsif ("$ARGV[0]" =~ /^-t[34]$/) {
51                  $tensortree = substr($ARGV[0], 2, 1);
52                  $ttlog2 = $ARGV[1];
# Line 149 | Line 153 | print
153   </WindowElement>
154   ';
155   # Clean up temporary files and exit
152 if ( $persistfile && open(PFI, "< $persistfile") ) {
153        while (<PFI>) {
154                s/^[^ ]* //;
155                kill('ALRM', $_);
156                last;
157        }
158        close PFI;
159 }
156   exec("rm -rf $td");
157  
158   #-------------- End of main program segment --------------#
159  
160 + #++++++++++++++ Kill persistent rtrace +++++++++++++++++++#
161 + sub persist_end {
162 +        if ( $persistfile && open(PFI, "< $persistfile") ) {
163 +                while (<PFI>) {
164 +                        s/^[^ ]* //;
165 +                        kill('ALRM', $_);
166 +                        last;
167 +                }
168 +                close PFI;
169 +        }
170 + }
171 +
172   #++++++++++++++ Tensor tree BSDF generation ++++++++++++++#
173   sub do_tree_bsdf {
174   # Get sampling rate and subdivide task
175   my $ns2 = $ns;
176   $ns2 /= 2 if ( $tensortree == 3 );
177 < @pdiv = (0, int($ns2/$nproc));
178 < my $nrem = $ns2 % $nproc;
179 < for (my $i = 1; $i < $nproc; $i++) {
177 > my $nsplice = $nproc;
178 > $nsplice *= 10 if ($nproc > 1);
179 > $nsplice = $ns2 if ($nsplice > $ns2);
180 > $nsplice = 999 if ($nsplice > 999);
181 > @pdiv = (0, int($ns2/$nsplice));
182 > my $nrem = $ns2 % $nsplice;
183 > for (my $i = 1; $i < $nsplice; $i++) {
184          my $nv = $pdiv[$i] + $pdiv[1];
185          ++$nv if ( $nrem-- > 0 );
186          push @pdiv, $nv;
# Line 217 | Line 229 | print "\t<DataDefinition>\n";
229   print "\t\t<IncidentDataStructure>TensorTree$tensortree</IncidentDataStructure>\n";
230   print "\t</DataDefinition>\n";
231   # Fork parallel rtcontrib processes to compute each side
232 + my $npleft = $nproc;
233   if ( $doback ) {
234 <        for (my $proc = 0; $proc < $nproc; $proc++) {
235 <                bg_tree_rtcontrib(0, $proc);
234 >        for (my $splice = 0; $splice < $nsplice; $splice++) {
235 >                if (! $npleft ) {
236 >                        wait();
237 >                        die "rtcontrib process reported error" if ( $? );
238 >                        $npleft++;
239 >                }
240 >                bg_tree_rtcontrib(0, $splice);
241 >                $npleft--;
242          }
243          while (wait() >= 0) {
244                  die "rtcontrib process reported error" if ( $? );
245 +                $npleft++;
246          }
247 +        persist_end();
248          ttree_out(0);
249   }
250   if ( $doforw ) {
251 <        for (my $proc = 0; $proc < $nproc; $proc++) {
252 <                bg_tree_rtcontrib(1, $proc);
251 >        for (my $splice = 0; $splice < $nsplice; $splice++) {
252 >                if (! $npleft ) {
253 >                        wait();
254 >                        die "rtcontrib process reported error" if ( $? );
255 >                        $npleft++;
256 >                }
257 >                bg_tree_rtcontrib(1, $splice);
258 >                $npleft--;
259          }
260          while (wait() >= 0) {
261                  die "rtcontrib process reported error" if ( $? );
262 +                $npleft++;
263          }
264 +        persist_end();
265          ttree_out(1);
266   }
267   }       # end of sub do_tree_bsdf()
268  
269 < # Run i'th rtcontrib process for generating tensor tree samples
269 > # Run rtcontrib process in background to generate tensor tree samples
270   sub bg_tree_rtcontrib {
271          my $pid = fork();
272          die "Cannot fork new process" unless defined $pid;
# Line 309 | Line 338 | print
338   system "rcalc -if3 -e 'Omega:PI/($ns*$ns)' " .
339          q{-e '$1=(0.265*$1+0.670*$2+0.065*$3)/Omega' -of } .
340          "$td/" . ($bmodnm,$fmodnm)[$forw] . "_???.flt " .
341 <        "| rttree_reduce -h -ff -r $tensortree -g $ttlog2";
341 >        "| rttree_reduce -h -ff -t $pctcull -r $tensortree -g $ttlog2";
342   die "Failure running rttree_reduce" if ( $? );
343   print
344   '                       </ScatteringData>
# Line 335 | Line 364 | print
364   system "rcalc -if3 -e 'Omega:PI/($ns*$ns)' " .
365          q{-e '$1=(0.265*$1+0.670*$2+0.065*$3)/Omega' -of } .
366          "$td/" . ($fmodnm,$bmodnm)[$forw] . "_???.flt " .
367 <        "| rttree_reduce -h -ff -r $tensortree -g $ttlog2";
367 >        "| rttree_reduce -h -ff -t $pctcull -r $tensortree -g $ttlog2";
368   die "Failure running rttree_reduce" if ( $? );
369   print
370   '                       </ScatteringData>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines