From 3886c4a8f2e1bfe17cbf7a5a76ba0fc978c6bb48 Mon Sep 17 00:00:00 2001 From: Brandon Potter Date: Wed, 9 Nov 2016 14:27:40 -0600 Subject: syscall_emul: [patch 5/22] remove LiveProcess class and use Process instead The EIOProcess class was removed recently and it was the only other class which derived from Process. Since every Process invocation is also a LiveProcess invocation, it makes sense to simplify the organization by combining the fields from LiveProcess into Process. --- configs/splash2/cluster.py | 24 ++++++++++++------------ configs/splash2/run.py | 24 ++++++++++++------------ 2 files changed, 24 insertions(+), 24 deletions(-) (limited to 'configs/splash2') diff --git a/configs/splash2/cluster.py b/configs/splash2/cluster.py index a2abc7e48..a0423e6e3 100644 --- a/configs/splash2/cluster.py +++ b/configs/splash2/cluster.py @@ -76,56 +76,56 @@ if args: # -------------------- # Define Splash2 Benchmarks # ==================== -class Cholesky(LiveProcess): +class Cholesky(Process): executable = options.rootdir + '/kernels/cholesky/CHOLESKY' cmd = 'CHOLESKY -p' + str(options.numcpus) + ' '\ + options.rootdir + '/kernels/cholesky/inputs/tk23.O' -class FFT(LiveProcess): +class FFT(Process): executable = options.rootdir + 'kernels/fft/FFT' cmd = 'FFT -p' + str(options.numcpus) + ' -m18' -class LU_contig(LiveProcess): +class LU_contig(Process): executable = options.rootdir + 'kernels/lu/contiguous_blocks/LU' cmd = 'LU -p' + str(options.numcpus) -class LU_noncontig(LiveProcess): +class LU_noncontig(Process): executable = options.rootdir + 'kernels/lu/non_contiguous_blocks/LU' cmd = 'LU -p' + str(options.numcpus) -class Radix(LiveProcess): +class Radix(Process): executable = options.rootdir + 'kernels/radix/RADIX' cmd = 'RADIX -n524288 -p' + str(options.numcpus) -class Barnes(LiveProcess): +class Barnes(Process): executable = options.rootdir + 'apps/barnes/BARNES' cmd = 'BARNES' input = options.rootdir + 'apps/barnes/input.p' + str(options.numcpus) -class FMM(LiveProcess): +class FMM(Process): executable = options.rootdir + 'apps/fmm/FMM' cmd = 'FMM' input = options.rootdir + 'apps/fmm/inputs/input.2048.p' + str(options.numcpus) -class Ocean_contig(LiveProcess): +class Ocean_contig(Process): executable = options.rootdir + 'apps/ocean/contiguous_partitions/OCEAN' cmd = 'OCEAN -p' + str(options.numcpus) -class Ocean_noncontig(LiveProcess): +class Ocean_noncontig(Process): executable = options.rootdir + 'apps/ocean/non_contiguous_partitions/OCEAN' cmd = 'OCEAN -p' + str(options.numcpus) -class Raytrace(LiveProcess): +class Raytrace(Process): executable = options.rootdir + 'apps/raytrace/RAYTRACE' cmd = 'RAYTRACE -p' + str(options.numcpus) + ' ' \ + options.rootdir + 'apps/raytrace/inputs/teapot.env' -class Water_nsquared(LiveProcess): +class Water_nsquared(Process): executable = options.rootdir + 'apps/water-nsquared/WATER-NSQUARED' cmd = 'WATER-NSQUARED' input = options.rootdir + 'apps/water-nsquared/input.p' + str(options.numcpus) -class Water_spatial(LiveProcess): +class Water_spatial(Process): executable = options.rootdir + 'apps/water-spatial/WATER-SPATIAL' cmd = 'WATER-SPATIAL' input = options.rootdir + 'apps/water-spatial/input.p' + str(options.numcpus) diff --git a/configs/splash2/run.py b/configs/splash2/run.py index d6427b7f5..0f374c17d 100644 --- a/configs/splash2/run.py +++ b/configs/splash2/run.py @@ -77,39 +77,39 @@ if not options.numcpus: # -------------------- # Define Splash2 Benchmarks # ==================== -class Cholesky(LiveProcess): +class Cholesky(Process): cwd = options.rootdir + '/kernels/cholesky' executable = options.rootdir + '/kernels/cholesky/CHOLESKY' cmd = ['CHOLESKY', '-p' + str(options.numcpus), options.rootdir + '/kernels/cholesky/inputs/tk23.O'] -class FFT(LiveProcess): +class FFT(Process): cwd = options.rootdir + '/kernels/fft' executable = options.rootdir + '/kernels/fft/FFT' cmd = ['FFT', '-p', str(options.numcpus), '-m18'] -class LU_contig(LiveProcess): +class LU_contig(Process): executable = options.rootdir + '/kernels/lu/contiguous_blocks/LU' cmd = ['LU', '-p', str(options.numcpus)] cwd = options.rootdir + '/kernels/lu/contiguous_blocks' -class LU_noncontig(LiveProcess): +class LU_noncontig(Process): executable = options.rootdir + '/kernels/lu/non_contiguous_blocks/LU' cmd = ['LU', '-p', str(options.numcpus)] cwd = options.rootdir + '/kernels/lu/non_contiguous_blocks' -class Radix(LiveProcess): +class Radix(Process): executable = options.rootdir + '/kernels/radix/RADIX' cmd = ['RADIX', '-n524288', '-p', str(options.numcpus)] cwd = options.rootdir + '/kernels/radix' -class Barnes(LiveProcess): +class Barnes(Process): executable = options.rootdir + '/apps/barnes/BARNES' cmd = ['BARNES'] input = options.rootdir + '/apps/barnes/input.p' + str(options.numcpus) cwd = options.rootdir + '/apps/barnes' -class FMM(LiveProcess): +class FMM(Process): executable = options.rootdir + '/apps/fmm/FMM' cmd = ['FMM'] if str(options.numcpus) == '1': @@ -118,23 +118,23 @@ class FMM(LiveProcess): input = options.rootdir + '/apps/fmm/inputs/input.2048.p' + str(options.numcpus) cwd = options.rootdir + '/apps/fmm' -class Ocean_contig(LiveProcess): +class Ocean_contig(Process): executable = options.rootdir + '/apps/ocean/contiguous_partitions/OCEAN' cmd = ['OCEAN', '-p', str(options.numcpus)] cwd = options.rootdir + '/apps/ocean/contiguous_partitions' -class Ocean_noncontig(LiveProcess): +class Ocean_noncontig(Process): executable = options.rootdir + '/apps/ocean/non_contiguous_partitions/OCEAN' cmd = ['OCEAN', '-p', str(options.numcpus)] cwd = options.rootdir + '/apps/ocean/non_contiguous_partitions' -class Raytrace(LiveProcess): +class Raytrace(Process): executable = options.rootdir + '/apps/raytrace/RAYTRACE' cmd = ['RAYTRACE', '-p' + str(options.numcpus), options.rootdir + '/apps/raytrace/inputs/teapot.env'] cwd = options.rootdir + '/apps/raytrace' -class Water_nsquared(LiveProcess): +class Water_nsquared(Process): executable = options.rootdir + '/apps/water-nsquared/WATER-NSQUARED' cmd = ['WATER-NSQUARED'] if options.numcpus==1: @@ -143,7 +143,7 @@ class Water_nsquared(LiveProcess): input = options.rootdir + '/apps/water-nsquared/input.p' + str(options.numcpus) cwd = options.rootdir + '/apps/water-nsquared' -class Water_spatial(LiveProcess): +class Water_spatial(Process): executable = options.rootdir + '/apps/water-spatial/WATER-SPATIAL' cmd = ['WATER-SPATIAL'] if options.numcpus==1: -- cgit v1.2.3