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.35 by greg, Wed May 9 17:40:17 2012 UTC vs.
Revision 2.36 by greg, Thu Jun 14 18:35:03 2012 UTC

# Line 71 | Line 71 | while ($#ARGV >= 0) {
71   }
72   # Check that we're actually being asked to do something
73   die "Must have at least one of +forward or +backward\n" if (!$doforw && !$doback);
74 # Name our own persist file?
75 my $persistfile;
76 if ( $tensortree && $nproc > 1 && "$rtargs" !~ /-PP /) {
77        $persistfile = "$td/pfile.txt";
78        $rtargs = "-PP $persistfile $rtargs";
79 }
74   # Get scene description and dimensions
75   my $radscn = "$td/device.rad";
76   my $mgfscn = "$td/device.mgf";
# Line 158 | Line 152 | exec("rm -rf $td");
152  
153   #-------------- End of main program segment --------------#
154  
161 #++++++++++++++ Kill persistent rtrace +++++++++++++++++++#
162 sub persist_end {
163        if ( $persistfile && open(PFI, "< $persistfile") ) {
164                while (<PFI>) {
165                        s/^[^ ]* //;
166                        kill('ALRM', $_);
167                        last;
168                }
169                close PFI;
170        }
171 }
172
155   #++++++++++++++ Tensor tree BSDF generation ++++++++++++++#
156   sub do_tree_bsdf {
175 # Get sampling rate and subdivide task
176 my $ns2 = $ns;
177 $ns2 /= 2 if ( $tensortree == 3 );
178 my $nsplice = $nproc;
179 $nsplice *= 10 if ($nproc > 1);
180 $nsplice = $ns2 if ($nsplice > $ns2);
181 $nsplice = 999 if ($nsplice > 999);
182 @pdiv = (0, int($ns2/$nsplice));
183 my $nrem = $ns2 % $nsplice;
184 for (my $i = 1; $i < $nsplice; $i++) {
185        my $nv = $pdiv[$i] + $pdiv[1];
186        ++$nv if ( $nrem-- > 0 );
187        push @pdiv, $nv;
188 }
189 die "Script error 1" if ($pdiv[-1] != $ns2);
157   # Shirley-Chiu mapping from unit square to disk
158   $sq2disk = '
159   in_square_a = 2*in_square_x - 1;
# Line 229 | Line 196 | out_square_y = (out_square_b + 1)/2;
196   print "\t<DataDefinition>\n";
197   print "\t\t<IncidentDataStructure>TensorTree$tensortree</IncidentDataStructure>\n";
198   print "\t</DataDefinition>\n";
199 < # Fork parallel rtcontrib processes to compute each side
200 < my $npleft = $nproc;
201 < if ( $doback ) {
202 <        for (my $splice = 0; $splice < $nsplice; $splice++) {
203 <                if (! $npleft ) {
237 <                        wait();
238 <                        die "rtcontrib process reported error" if ( $? );
239 <                        $npleft++;
240 <                }
241 <                bg_tree_rtcontrib(0, $splice);
242 <                $npleft--;
243 <        }
244 <        while (wait() >= 0) {
245 <                die "rtcontrib process reported error" if ( $? );
246 <                $npleft++;
247 <        }
248 <        persist_end();
249 <        ttree_out(0);
250 < }
251 < if ( $doforw ) {
252 <        for (my $splice = 0; $splice < $nsplice; $splice++) {
253 <                if (! $npleft ) {
254 <                        wait();
255 <                        die "rtcontrib process reported error" if ( $? );
256 <                        $npleft++;
257 <                }
258 <                bg_tree_rtcontrib(1, $splice);
259 <                $npleft--;
260 <        }
261 <        while (wait() >= 0) {
262 <                die "rtcontrib process reported error" if ( $? );
263 <                $npleft++;
264 <        }
265 <        persist_end();
266 <        ttree_out(1);
267 < }
199 >
200 > # Start rtcontrib processes for compute each side
201 > do_tree_rtcontrib(0) if ( $doback );
202 > do_tree_rtcontrib(1) if ( $doforw );
203 >
204   }       # end of sub do_tree_bsdf()
205  
206   # Run rtcontrib process in background to generate tensor tree samples
207 < sub bg_tree_rtcontrib {
272 <        my $pid = fork();
273 <        die "Cannot fork new process" unless defined $pid;
274 <        if ($pid > 0) { return $pid; }
207 > sub do_tree_rtcontrib {
208          my $forw = shift;
276        my $pn = shift;
277        my $pbeg = $pdiv[$pn];
278        my $plen = $pdiv[$pn+1] - $pbeg;
209          my $matargs = "-m $bmodnm";
210          if ( !$forw || !$doback ) { $matargs .= " -m $fmodnm"; }
211 <        my $cmd = "rtcontrib $rtargs -h -ff -fo -c $nsamp " .
211 >        my $cmd = "rcontrib $rtargs -h -ff -fo -n $nproc -c $nsamp " .
212                  "-e '$disk2sq' -bn '$ns*$ns' " .
213                  "-b '$ns*floor(out_square_x*$ns)+floor(out_square_y*$ns)' " .
214 <                "-o $td/%s_" . sprintf("%03d", $pn) . ".flt $matargs $octree";
214 >                "-o $td/%s.flt $matargs $octree";
215          if ( $tensortree == 3 ) {
216                  # Isotropic BSDF
217 <                $cmd = "cnt $plen $ny $nx " .
218 <                        "| rcalc -e 'r1=rand(($pn+.8681)*recno-.673892)' " .
219 <                        "-e 'r2=rand(($pn-5.37138)*recno+67.1737811)' " .
220 <                        "-e 'r3=rand(($pn+3.17603772)*recno+83.766771)' " .
221 <                        "-e 'Dx=1-2*($pbeg+\$1+r1)/$ns;Dy:0;Dz=sqrt(1-Dx*Dx)' " .
217 >                my $ns2 = $ns / 2;
218 >                $cmd = "cnt $ns2 $ny $nx " .
219 >                        "| rcalc -e 'r1=rand(.8681*recno-.673892)' " .
220 >                        "-e 'r2=rand(-5.37138*recno+67.1737811)' " .
221 >                        "-e 'r3=rand(+3.17603772*recno+83.766771)' " .
222 >                        "-e 'Dx=1-2*(\$1+r1)/$ns;Dy:0;Dz=sqrt(1-Dx*Dx)' " .
223                          "-e 'xp=(\$3+r2)*(($dim[1]-$dim[0])/$nx)+$dim[0]' " .
224                          "-e 'yp=(\$2+r3)*(($dim[3]-$dim[2])/$ny)+$dim[2]' " .
225                          "-e 'zp=$dim[5-$forw]' -e 'myDz=Dz*($forw*2-1)' " .
# Line 299 | Line 230 | sub bg_tree_rtcontrib {
230                  # Anisotropic BSDF
231                  # Sample area vertically to improve load balance, since
232                  # shading systems usually have bilateral symmetry (L-R)
233 <                $cmd = "cnt $plen $ns $ny $nx " .
234 <                        "| rcalc -e 'r1=rand(($pn+.8681)*recno-.673892)' " .
235 <                        "-e 'r2=rand(($pn-5.37138)*recno+67.1737811)' " .
236 <                        "-e 'r3=rand(($pn+3.17603772)*recno+83.766771)' " .
237 <                        "-e 'r4=rand(($pn-2.3857833)*recno-964.72738)' " .
238 <                        "-e 'in_square_x=($pbeg+\$1+r1)/$ns' " .
233 >                $cmd = "cnt $ns $ns $ny $nx " .
234 >                        "| rcalc -e 'r1=rand(.8681*recno-.673892)' " .
235 >                        "-e 'r2=rand(-5.37138*recno+67.1737811)' " .
236 >                        "-e 'r3=rand(3.17603772*recno+83.766771)' " .
237 >                        "-e 'r4=rand(-2.3857833*recno-964.72738)' " .
238 >                        "-e 'in_square_x=(\$1+r1)/$ns' " .
239                          "-e 'in_square_y=(\$2+r2)/$ns' -e '$sq2disk' " .
240                          "-e 'xp=(\$4+r3)*(($dim[1]-$dim[0])/$nx)+$dim[0]' " .
241                          "-e 'yp=(\$3+r4)*(($dim[3]-$dim[2])/$ny)+$dim[2]' " .
# Line 314 | Line 245 | sub bg_tree_rtcontrib {
245                          "| $cmd";
246          }
247   # print STDERR "Starting: $cmd\n";
248 <        exec($cmd);             # no return; status report to parent via wait
249 <        die "Cannot exec: $cmd\n";
250 < }       # end of bg_tree_rtcontrib()
248 >        system "$cmd" || die "Failure running rtcontrib";
249 >        ttree_out($forw);
250 > }       # end of do_tree_rtcontrib()
251  
252   # Simplify and output tensor tree results
253   sub ttree_out {
# Line 340 | Line 271 | print
271   $cmd = "rcalc -if3 -e 'Omega:PI/($ns*$ns)' " .
272          q{-e '$1=(0.265*$1+0.670*$2+0.065*$3)/Omega' };
273   if ($pctcull >= 0) {
274 <        $cmd .= "-of $td/" . ($bmodnm,$fmodnm)[$forw] . "_???.flt " .
274 >        $cmd .= "-of $td/" . ($bmodnm,$fmodnm)[$forw] . ".flt " .
275          "| rttree_reduce -a -h -ff -t $pctcull -r $tensortree -g $ttlog2";
276          system "$cmd" || die "Failure running rttree_reduce";
277   } else {
278 <        $cmd .= "$td/" . ($bmodnm,$fmodnm)[$forw] . "_???.flt";
278 >        $cmd .= "$td/" . ($bmodnm,$fmodnm)[$forw] . ".flt";
279          print "{\n";
280          system "$cmd" || die "Failure running rcalc";
281          for (my $i = ($tensortree==3)*$ns*$ns*$ns/2; $i-- > 0; ) {
# Line 376 | Line 307 | print
307   $cmd = "rcalc -if3 -e 'Omega:PI/($ns*$ns)' " .
308          q{-e '$1=(0.265*$1+0.670*$2+0.065*$3)/Omega' };
309   if ($pctcull >= 0) {
310 <        $cmd .= "-of $td/" . ($fmodnm,$bmodnm)[$forw] . "_???.flt " .
310 >        $cmd .= "-of $td/" . ($fmodnm,$bmodnm)[$forw] . ".flt " .
311          "| rttree_reduce -a -h -ff -t $pctcull -r $tensortree -g $ttlog2";
312          system "$cmd" || die "Failure running rttree_reduce";
313   } else {
314 <        $cmd .= "$td/" . ($fmodnm,$bmodnm)[$forw] . "_???.flt";
314 >        $cmd .= "$td/" . ($fmodnm,$bmodnm)[$forw] . ".flt";
315          print "{\n";
316          system "$cmd" || die "Failure running rcalc";
317          for (my $i = ($tensortree==3)*$ns*$ns*$ns/2; $i-- > 0; ) {
# Line 454 | Line 385 | my @rfarr;
385   my @tbarr;
386   my @rbarr;
387   my $cmd;
388 < my $rtcmd = "rtcontrib $rtargs -h -ff -fo -n $nproc -c $nsamp " .
388 > my $rtcmd = "rcontrib $rtargs -h -ff -fo -n $nproc -c $nsamp " .
389          "-e '$kcal' -b kbin -bn $ndiv " .
390          "-o '$td/%s.flt' -m $fmodnm -m $bmodnm $octree";
391   my $rccmd = "rcalc -e '$tcal' " .

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines