Config: Fix some errors in the splash2 config file.
--HG-- extra : convert_revision : 7bcb0f039e0609f95a081ef3aba2edb1ffa742f2
This commit is contained in:
parent
7c8e4ca3a3
commit
185f0eb134
1 changed files with 16 additions and 16 deletions
|
@ -51,11 +51,11 @@ parser.add_option("-f", "--frequency",
|
||||||
parser.add_option("--l1size",
|
parser.add_option("--l1size",
|
||||||
default = "32kB")
|
default = "32kB")
|
||||||
parser.add_option("--l1latency",
|
parser.add_option("--l1latency",
|
||||||
default = 1)
|
default = "1ns")
|
||||||
parser.add_option("--l2size",
|
parser.add_option("--l2size",
|
||||||
default = "256kB")
|
default = "256kB")
|
||||||
parser.add_option("--l2latency",
|
parser.add_option("--l2latency",
|
||||||
default = 10)
|
default = "10ns")
|
||||||
parser.add_option("--rootdir",
|
parser.add_option("--rootdir",
|
||||||
help="Root directory of Splash2",
|
help="Root directory of Splash2",
|
||||||
default="/dist/splash2/codes")
|
default="/dist/splash2/codes")
|
||||||
|
@ -78,38 +78,38 @@ if not options.numcpus:
|
||||||
class Cholesky(LiveProcess):
|
class Cholesky(LiveProcess):
|
||||||
cwd = options.rootdir + '/kernels/cholesky'
|
cwd = options.rootdir + '/kernels/cholesky'
|
||||||
executable = options.rootdir + '/kernels/cholesky/CHOLESKY'
|
executable = options.rootdir + '/kernels/cholesky/CHOLESKY'
|
||||||
cmd = 'CHOLESKY -p' + str(options.numcpus) + ' '\
|
cmd = ['CHOLESKY', '-p', str(options.numcpus),
|
||||||
+ options.rootdir + '/kernels/cholesky/inputs/tk23.O'
|
options.rootdir + '/kernels/cholesky/inputs/tk23.O']
|
||||||
|
|
||||||
class FFT(LiveProcess):
|
class FFT(LiveProcess):
|
||||||
cwd = options.rootdir + '/kernels/fft'
|
cwd = options.rootdir + '/kernels/fft'
|
||||||
executable = options.rootdir + '/kernels/fft/FFT'
|
executable = options.rootdir + '/kernels/fft/FFT'
|
||||||
cmd = 'FFT -p' + str(options.numcpus) + ' -m18'
|
cmd = ['FFT', '-p', str(options.numcpus), '-m18']
|
||||||
|
|
||||||
class LU_contig(LiveProcess):
|
class LU_contig(LiveProcess):
|
||||||
executable = options.rootdir + '/kernels/lu/contiguous_blocks/LU'
|
executable = options.rootdir + '/kernels/lu/contiguous_blocks/LU'
|
||||||
cmd = 'LU -p' + str(options.numcpus)
|
cmd = ['LU', '-p', str(options.numcpus)]
|
||||||
cwd = options.rootdir + '/kernels/lu/contiguous_blocks'
|
cwd = options.rootdir + '/kernels/lu/contiguous_blocks'
|
||||||
|
|
||||||
class LU_noncontig(LiveProcess):
|
class LU_noncontig(LiveProcess):
|
||||||
executable = options.rootdir + '/kernels/lu/non_contiguous_blocks/LU'
|
executable = options.rootdir + '/kernels/lu/non_contiguous_blocks/LU'
|
||||||
cmd = 'LU -p' + str(options.numcpus)
|
cmd = ['LU', '-p', str(options.numcpus)]
|
||||||
cwd = options.rootdir + '/kernels/lu/non_contiguous_blocks'
|
cwd = options.rootdir + '/kernels/lu/non_contiguous_blocks'
|
||||||
|
|
||||||
class Radix(LiveProcess):
|
class Radix(LiveProcess):
|
||||||
executable = options.rootdir + '/kernels/radix/RADIX'
|
executable = options.rootdir + '/kernels/radix/RADIX'
|
||||||
cmd = 'RADIX -n524288 -p' + str(options.numcpus)
|
cmd = ['RADIX', '-n524288', '-p', str(options.numcpus)]
|
||||||
cwd = options.rootdir + '/kernels/radix'
|
cwd = options.rootdir + '/kernels/radix'
|
||||||
|
|
||||||
class Barnes(LiveProcess):
|
class Barnes(LiveProcess):
|
||||||
executable = options.rootdir + '/apps/barnes/BARNES'
|
executable = options.rootdir + '/apps/barnes/BARNES'
|
||||||
cmd = 'BARNES'
|
cmd = ['BARNES']
|
||||||
input = options.rootdir + '/apps/barnes/input.p' + str(options.numcpus)
|
input = options.rootdir + '/apps/barnes/input.p' + str(options.numcpus)
|
||||||
cwd = options.rootdir + '/apps/barnes'
|
cwd = options.rootdir + '/apps/barnes'
|
||||||
|
|
||||||
class FMM(LiveProcess):
|
class FMM(LiveProcess):
|
||||||
executable = options.rootdir + '/apps/fmm/FMM'
|
executable = options.rootdir + '/apps/fmm/FMM'
|
||||||
cmd = 'FMM'
|
cmd = ['FMM']
|
||||||
if str(options.numcpus) == '1':
|
if str(options.numcpus) == '1':
|
||||||
input = options.rootdir + '/apps/fmm/inputs/input.2048'
|
input = options.rootdir + '/apps/fmm/inputs/input.2048'
|
||||||
else:
|
else:
|
||||||
|
@ -118,23 +118,23 @@ class FMM(LiveProcess):
|
||||||
|
|
||||||
class Ocean_contig(LiveProcess):
|
class Ocean_contig(LiveProcess):
|
||||||
executable = options.rootdir + '/apps/ocean/contiguous_partitions/OCEAN'
|
executable = options.rootdir + '/apps/ocean/contiguous_partitions/OCEAN'
|
||||||
cmd = 'OCEAN -p' + str(options.numcpus)
|
cmd = ['OCEAN', '-p', str(options.numcpus)]
|
||||||
cwd = options.rootdir + '/apps/ocean/contiguous_partitions'
|
cwd = options.rootdir + '/apps/ocean/contiguous_partitions'
|
||||||
|
|
||||||
class Ocean_noncontig(LiveProcess):
|
class Ocean_noncontig(LiveProcess):
|
||||||
executable = options.rootdir + '/apps/ocean/non_contiguous_partitions/OCEAN'
|
executable = options.rootdir + '/apps/ocean/non_contiguous_partitions/OCEAN'
|
||||||
cmd = 'OCEAN -p' + str(options.numcpus)
|
cmd = ['OCEAN', '-p', str(options.numcpus)]
|
||||||
cwd = options.rootdir + '/apps/ocean/non_contiguous_partitions'
|
cwd = options.rootdir + '/apps/ocean/non_contiguous_partitions'
|
||||||
|
|
||||||
class Raytrace(LiveProcess):
|
class Raytrace(LiveProcess):
|
||||||
executable = options.rootdir + '/apps/raytrace/RAYTRACE'
|
executable = options.rootdir + '/apps/raytrace/RAYTRACE'
|
||||||
cmd = 'RAYTRACE -p' + str(options.numcpus) + ' ' \
|
cmd = ['RAYTRACE', '-p', str(options.numcpus),
|
||||||
+ options.rootdir + '/apps/raytrace/inputs/teapot.env'
|
options.rootdir + '/apps/raytrace/inputs/teapot.env']
|
||||||
cwd = options.rootdir + '/apps/raytrace'
|
cwd = options.rootdir + '/apps/raytrace'
|
||||||
|
|
||||||
class Water_nsquared(LiveProcess):
|
class Water_nsquared(LiveProcess):
|
||||||
executable = options.rootdir + '/apps/water-nsquared/WATER-NSQUARED'
|
executable = options.rootdir + '/apps/water-nsquared/WATER-NSQUARED'
|
||||||
cmd = 'WATER-NSQUARED'
|
cmd = ['WATER-NSQUARED']
|
||||||
if options.numcpus==1:
|
if options.numcpus==1:
|
||||||
input = options.rootdir + '/apps/water-nsquared/input'
|
input = options.rootdir + '/apps/water-nsquared/input'
|
||||||
else:
|
else:
|
||||||
|
@ -143,7 +143,7 @@ class Water_nsquared(LiveProcess):
|
||||||
|
|
||||||
class Water_spatial(LiveProcess):
|
class Water_spatial(LiveProcess):
|
||||||
executable = options.rootdir + '/apps/water-spatial/WATER-SPATIAL'
|
executable = options.rootdir + '/apps/water-spatial/WATER-SPATIAL'
|
||||||
cmd = 'WATER-SPATIAL'
|
cmd = ['WATER-SPATIAL']
|
||||||
if options.numcpus==1:
|
if options.numcpus==1:
|
||||||
input = options.rootdir + '/apps/water-spatial/input'
|
input = options.rootdir + '/apps/water-spatial/input'
|
||||||
else:
|
else:
|
||||||
|
|
Loading…
Reference in a new issue