|
From: <son...@us...> - 2008-04-30 20:30:18
|
Revision: 319
http://cbench.svn.sourceforge.net/cbench/?rev=319&view=rev
Author: sonicsoft70
Date: 2008-04-30 13:30:04 -0700 (Wed, 30 Apr 2008)
Log Message:
-----------
updates for lammps that seem to get all the lammps
jobs running for me!
don't seem to need to copy input decks but do need
to symlink to the reference data files
i think that lammps_copy_files and lammps_file_substitute
might be unneeded at this point, but i'm not sure
Modified Paths:
--------------
trunk/cbench/tools/cbench_gen_jobs.pl
Modified: trunk/cbench/tools/cbench_gen_jobs.pl
===================================================================
--- trunk/cbench/tools/cbench_gen_jobs.pl 2008-04-30 20:21:22 UTC (rev 318)
+++ trunk/cbench/tools/cbench_gen_jobs.pl 2008-04-30 20:30:04 UTC (rev 319)
@@ -716,9 +716,22 @@
debug_print(3,"DEBUG: copying files to: $testset_path\/$ident\/$jobname\n");
+ # since the job templates point to the input deck with a path, we don't seem to need
+ # to copy it into the jobs working directory
+ #
#copy modified lammps in.* files to each jobdir
- $jobname !~ /scaled/ and lammps_copy_files("$testset_path\/$ident\/$jobname", $job);
+ #$jobname !~ /scaled/ and lammps_copy_files("$testset_path\/$ident\/$jobname", $job);
+ # symlink any data files into the jobs directory from the directory holding all the input
+ # decks and data files that only need to be read
+ #
+ # this way we don't have to muck with the input decks path to the data files, they just
+ # look in the CWD
+ my $jobbase = $job;
+ $jobbase =~ s/\.scaled//;
+ (-f "$testset_path\/$ident\/$jobname\/data.$jobbase") and
+ system("/bin/ln -sf $testset_path/bench/data.$jobbase $testset_path\/$ident\/$jobname\/data.$jobbase");
+
#set up the scaling parameters based on this jobsize
if ( $jobname =~ /scaled/ ) {
$scaling_params = lammps_get_scaling_params($numprocs, $scale_factor);
@@ -773,12 +786,9 @@
" --gazebohome <path> Where the Gazebo tree is located\n".
" --gazeboconfig <name> Name of the Gazebo submit_config that will be APPENDED to\n".
" --debug <level> Turn on debugging at the specified level\n";
- if ( defined $ENV{LAMMPSDIR} or $testset =~ /lammps/ ) {
- print " \nLAMMPS scaling options:\n".
- " --scaled Generate scaled jobs along with normal jobs\n".
- " --scaled-only Generate scaled jobs only\n".
- " --scaled-factor <factor> The additional factor by which you would like to \n".
- " scale the x,y,z values in the scaling benchmarks\n";
- }
-
+ print " \nLAMMPS scaling options:\n".
+ " --scaled Generate scaled jobs along with normal jobs\n".
+ " --scaled-only Generate scaled jobs only\n".
+ " --scaled-factor <factor> The additional factor by which you would like to \n".
+ " scale the x,y,z values in the scaling benchmarks\n";
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|