diff --git a/conf/dine.py b/conf/dine.py index 610252bdfcb15da4344b99ab6e32e1c2b0ad8b97..f4218bbc5ca22f187650a9e576d6577575af85f4 100644 --- a/conf/dine.py +++ b/conf/dine.py @@ -20,7 +20,7 @@ site_configuration = { 'scheduler': 'slurm', 'launcher': 'local', 'access': ['-p bluefield1', '-A durham'], - 'environs': ['intel'], + 'environs': ['scorep'], 'max_jobs': 100, }, { @@ -57,7 +57,19 @@ site_configuration = { 'ftn': '', 'target_systems': ['dine'], 'variables': [['SCOREP_ENABLE_PROFILING','1'],['SCOREP_EXPERIMENT_DIRECTORY','scorep_profiler_output'],['MPICC','mpiicc'],['I_MPI_FABRICS','shm:tcp'],['MPS_STAT_LEVEL','2']] - } + }, + { + 'modules': ['intel_comp/2018', 'intel_mpi/2018', + 'parmetis/4.0.3', 'parallel_hdf5/1.10.3', 'gsl/2.4', + 'fftw/3.3.8epyc', 'python/3.6.5', + 'scorep/6.0', 'cube/4.5'], + 'name': 'scorep', + 'cc': 'icc', + 'cxx': 'icpc', + 'ftn': '', + 'target_systems': ['dine'], + 'variables': [['SCOREP_ENABLE_PROFILING','1'],['SCOREP_EXPERIMENT_DIRECTORY','scorep_profiler_output'],['MPICC','mpiicc'],['I_MPI_FABRICS','shm:tcp'],['MPS_STAT_LEVEL','2']] + } ], 'logging': [ { diff --git a/env.sh b/env.sh index d73ca1bc4aa5dd2beabecc04b0d0839517475f95..a91ddc815157fe50e8fd9fe5104b67f671ded118 100755 --- a/env.sh +++ b/env.sh @@ -3,8 +3,8 @@ module purge module load python/3.6.5 source ~/reframe_env/bin/activate -export STAGE_DIR=$HOME/reframe_stage -export OUTPUT_DIR=$HOME/reframe_output +export STAGE_DIR=/cosma5/data/durham/dc-turn5/reframe_stage +export OUTPUT_DIR=/cosma5/data/durham/dc-turn5/reframe_output export RFM_SAVE_LOG_FILES=1 export PYTHONPATH=$PYTHONPATH:`pwd`/src diff --git a/run.sh b/run.sh index 889b0503e030b93311d5478ea2ba2b1862402faa..e565fb4db54028454c2188df3772565c65fb0fcf 100755 --- a/run.sh +++ b/run.sh @@ -8,13 +8,13 @@ source env.sh --stage $STAGE_DIR \ --purge-env \ -C conf/dine.py \ - -c src \ + -c src/sodshock_scalasca.py \ -r \ -v \ --performance-report \ -n \ - 'PMillenniumTest' \ + 'swift_scorep_tests' \ --output \ $OUTPUT_DIR \ - --report-file=pmill_768.log + --report-file=swift_scorep_tests.log diff --git a/src/common.py b/src/common.py index 9163a41461cc8163109b0ee2d038f39aed394838..2ccd53e8f39170044a21a554ae87a7807618c20e 100644 --- a/src/common.py +++ b/src/common.py @@ -5,7 +5,7 @@ import reframe.utility.sanity as sn def setup(test, launcher, num_tasks, num_tasks_per_node=1): test.time_limit = '1h' - test.num_tasks = num_tasks + test.num_tasks = 1 # num_tasks test.num_tasks_per_node = 1 test.valid_prog_environs = ['*'] diff --git a/src/sodshock_scalasca.py b/src/sodshock_scalasca.py index 2945294e505d71da71d97ee7416c1205b22cfe99..df4d1e14c92fe582f082da780cff6c51a0fc3fe0 100644 --- a/src/sodshock_scalasca.py +++ b/src/sodshock_scalasca.py @@ -14,21 +14,22 @@ class SodShock3dTest(rfm.RegressionTest): ic_dir = common.setup(self, launcher, num_tasks, num_tasks_per_node=num_tasks) test_dir = 'swiftsim/examples/HydroTests/SodShock_3D' - self.cpus_per_task = 32 # added + # self.cpus_per_task = 32 # added print(f'Running with threads : <{num_threads}>') self.keep_files = [test_dir] self.build_system.config_opts = [ - '--disable-ipo', + '--disable-ipo', #temporary disable - support is forthcoming '--with-tbbmalloc', '--with-parmetis' ] self.prerun_cmds = [f'pushd {test_dir}'] - num_iterations = 10000 + num_iterations = 1 # self.build_system.options = ['CC=scorep mpicc', 'CFLAGS=-fopenmp'] #Added for scalasca + #self.build_system.make_opts = ['CC="scorep --user --thread=pthread mpicc"'] #change mpicc to icc for non-mpi self.build_system.make_opts = ['CC="scorep --user --thread=pthread icc"'] - + if launcher == 'scalasca': self.executable = '../../swift'