-
Notifications
You must be signed in to change notification settings - Fork 360
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'jgfouca/cime/fixes_for_titan' (PR #1321) into next
Restore Titan support after CIME5.2 merge. A number of issues prevented successful create, set-up, build and run phases on Titan after the merge of CIME5.2. Even with these resolved, some functionality was lost, e.g. support for using a different number of MPI tasks per node for nonoverlapping components and support for more than one compiler. Finally, support for netcdf4 files was missing when using PGI.
Remove CESM_REPO.
Add better support for netcdf and pnetcdf in config*.xml .
Use findNetcdf.cmake from pio2 in pio1.
Use newer cmake, required by pio2.
Fix aprun command construction.
Fix Macro maker, to enable multiple compiler support.
Update modules and paths to enable netcdf4 support and multiple compiler support.
Fixes #1327
Fixes #1330
Fixes #1344
Also, (already fixed, but verified here)
Fixes #1239
Testing has focused on production-like cases, including low resolution water cycle and high resolution GMPAS, both with and without the v3 MPAS meshes and with a number of different PE layouts. acme_developer is not yet working, for reasons distinct from the pull request, and without these changes, progress will not be possible on getting the acme_developer to work again.
A unit test was added for the updated aprun command construction capability, and this was passed.
[BFB]- Loading branch information
Showing
7 changed files
with
184 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,133 @@ | ||
| """ | ||
| Aprun is far too complex to handle purely through XML. We need python | ||
| code to compute and assemble aprun commands. | ||
| """ | ||
|
|
||
| from CIME.XML.standard_module_setup import * | ||
|
|
||
| import math | ||
|
|
||
| logger = logging.getLogger(__name__) | ||
|
|
||
| ############################################################################### | ||
| def _get_aprun_cmd_for_case_impl(ntasks, nthreads, rootpes, pstrids, | ||
| max_tasks_per_node, pes_per_node, | ||
| pio_numtasks, pio_async_interface, | ||
| compiler, machine, run_exe): | ||
| ############################################################################### | ||
| """ | ||
| No one really understands this code, but we can at least test it. | ||
| >>> ntasks = [512, 675, 168, 512, 128, 168, 168, 512, 1] | ||
| >>> nthreads = [2, 2, 2, 2, 4, 2, 2, 2, 1] | ||
| >>> rootpes = [0, 0, 512, 0, 680, 512, 512, 0, 0] | ||
| >>> pstrids = [1, 1, 1, 1, 1, 1, 1, 1, 1] | ||
| >>> max_tasks_per_node = 16 | ||
| >>> pes_per_node = 16 | ||
| >>> pio_numtasks = -1 | ||
| >>> pio_async_interface = False | ||
| >>> compiler = "pgi" | ||
| >>> machine = "titan" | ||
| >>> run_exe = "acme.exe" | ||
| >>> _get_aprun_cmd_for_case_impl(ntasks, nthreads, rootpes, pstrids, max_tasks_per_node, pes_per_node, pio_numtasks, pio_async_interface, compiler, machine, run_exe) | ||
| 'aprun -S 4 -n 680 -N 8 -d 2 acme.exe : -S 2 -n 128 -N 4 -d 4 acme.exe ' | ||
| >>> compiler = "intel" | ||
| >>> _get_aprun_cmd_for_case_impl(ntasks, nthreads, rootpes, pstrids, max_tasks_per_node, pes_per_node, pio_numtasks, pio_async_interface, compiler, machine, run_exe) | ||
| 'aprun -S 4 -cc numa_node -n 680 -N 8 -d 2 acme.exe : -S 2 -cc numa_node -n 128 -N 4 -d 4 acme.exe ' | ||
| """ | ||
| max_tasks_per_node = 1 if max_tasks_per_node < 1 else max_tasks_per_node | ||
|
|
||
| total_tasks = 0 | ||
| for ntask, rootpe, pstrid in zip(ntasks, rootpes, pstrids): | ||
| tt = rootpe + (ntask - 1) * pstrid + 1 | ||
| total_tasks = max(tt, total_tasks) | ||
|
|
||
| # Check if we need to add pio's tasks to the total task count | ||
| if pio_async_interface: | ||
| total_tasks += pio_numtasks if pio_numtasks > 0 else pes_per_node | ||
|
|
||
| # Compute max threads for each mpi task | ||
| maxt = [0] * total_tasks | ||
| for ntask, nthrd, rootpe, pstrid in zip(ntasks, nthreads, rootpes, pstrids): | ||
| c2 = 0 | ||
| while c2 < ntask: | ||
| s = rootpe + c2 * pstrid | ||
| if nthrd > maxt[s]: | ||
| maxt[s] = nthrd | ||
|
|
||
| c2 += 1 | ||
|
|
||
| logger.info("total tasks is: %s" % total_tasks) | ||
|
|
||
| # make sure all maxt values at least 1 | ||
| for c1 in xrange(0, total_tasks): | ||
| if maxt[c1] < 1: | ||
| maxt[c1] = 1 | ||
|
|
||
| # Compute task and thread settings for batch commands | ||
| tasks_per_node, task_count, thread_count, max_thread_count, aprun = \ | ||
| 0, 1, maxt[0], maxt[0], "aprun" | ||
| for c1 in xrange(1, total_tasks): | ||
| if maxt[c1] != thread_count: | ||
| tasks_per_node = min(pes_per_node, max_tasks_per_node / thread_count) | ||
|
|
||
| tasks_per_node = min(task_count, tasks_per_node) | ||
|
|
||
| # Compute for every subset | ||
| task_per_numa = int(math.ceil(tasks_per_node / 2.0)) | ||
| # Option for Titan | ||
| if machine == "titan" and tasks_per_node > 1: | ||
| aprun += " -S %d" % task_per_numa | ||
| if compiler == "intel": | ||
| aprun += " -cc numa_node" | ||
|
|
||
| aprun += " -n %d -N %d -d %d %s :" % (task_count, tasks_per_node, thread_count, run_exe) | ||
|
|
||
| thread_count = maxt[c1] | ||
| max_thread_count = max(max_thread_count, maxt[c1]) | ||
| task_count = 1 | ||
|
|
||
| else: | ||
| task_count += 1 | ||
|
|
||
| if pes_per_node > 0: | ||
| tasks_per_node = min(pes_per_node, max_tasks_per_node / thread_count) | ||
| else: | ||
| tasks_per_node = max_tasks_per_node / thread_count | ||
|
|
||
| tasks_per_node = min(task_count, tasks_per_node) | ||
|
|
||
| task_per_numa = int(math.ceil(tasks_per_node / 2.0)) | ||
|
|
||
| # Special option for Titan with intel compiler | ||
| if machine == "titan" and tasks_per_node > 1: | ||
| aprun += " -S %d" % task_per_numa | ||
| if compiler == "intel": | ||
| aprun += " -cc numa_node" | ||
|
|
||
| aprun += " -n %d -N %d -d %d %s " % (task_count, tasks_per_node, thread_count, run_exe) | ||
|
|
||
| return aprun | ||
|
|
||
| ############################################################################### | ||
| def get_aprun_cmd_for_case(case, run_exe): | ||
| ############################################################################### | ||
| """ | ||
| Given a case, construct and return the aprun command | ||
| """ | ||
| models = case.get_values("COMP_CLASSES") | ||
| ntasks, nthreads, rootpes, pstrids = [], [], [], [] | ||
| for model in models: | ||
| model = "CPL" if model == "DRV" else model | ||
| for the_list, item_name in zip([ntasks, nthreads, rootpes, pstrids], | ||
| ["NTASKS", "NTHRDS", "ROOTPE", "PSTRID"]): | ||
| the_list.append(case.get_value("_".join([item_name, model]))) | ||
|
|
||
| return _get_aprun_cmd_for_case_impl(ntasks, nthreads, rootpes, pstrids, | ||
| case.get_value("MAX_TASKS_PER_NODE"), | ||
| case.get_value("PES_PER_NODE"), | ||
| case.get_value("PIO_NUMTASKS"), | ||
| case.get_value("PIO_ASYNC_INTERFACE"), | ||
| case.get_value("COMPILER"), | ||
| case.get_value("MACH"), | ||
| run_exe) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters