Skip to content

Commit

Permalink
Merge branch 'jgfouca/mappy_rhel9' into master (PR #6620)
Browse files Browse the repository at this point in the history 
Get mappy working again with RHEL9

[BFB]

* jgfouca/mappy_rhel9:
  Get mappy working again with RHEL9
  • Loading branch information
@jgfouca
jgfouca committed Sep 19, 2024
2 parents 4c88cca + 67a5f9a commit 38f75c1
Showing 1 changed file with 26 additions and 19 deletions.
45 changes: 26 additions & 19 deletions cime_config/machines/config_machines.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1861,31 +1861,33 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
</arguments>
</mpirun>
<module_system type="module" allow_error="false">
<init_path lang="python">/projects/sems/install/rhel7-x86_64/sems/v2/lmod/lmod/8.3/gcc/10.1.0/zbzzu7k/lmod/lmod/init/env_modules_python.py</init_path>
<init_path lang="perl">/projects/sems/install/rhel7-x86_64/sems/v2/lmod/lmod/8.3/gcc/10.1.0/zbzzu7k/lmod/lmod/init/perl</init_path>
<init_path lang="sh">/projects/sems/install/rhel7-x86_64/sems/v2/lmod/lmod/8.3/gcc/10.1.0/zbzzu7k/lmod/lmod/init/sh</init_path>
<init_path lang="csh">/projects/sems/install/rhel7-x86_64/sems/v2/lmod/lmod/8.3/gcc/10.1.0/zbzzu7k/lmod/lmod/init/csh</init_path>
<cmd_path lang="python">/projects/sems/install/rhel7-x86_64/sems/v2/lmod/lmod/8.3/gcc/10.1.0/zbzzu7k/lmod/lmod/libexec/lmod python</cmd_path>
<cmd_path lang="perl">/projects/sems/install/rhel7-x86_64/sems/v2/lmod/lmod/8.3/gcc/10.1.0/zbzzu7k/lmod/lmod/libexec/lmod perl</cmd_path>
<init_path lang="python">/projects/sems/install/rhel9-x86_64/sems/lmod/lmod/8.7.24/gcc/11.4.1/base/lnirq74/lmod/lmod/init/env_modules_python.py</init_path>
<init_path lang="perl">/projects/sems/install/rhel9-x86_64/sems/lmod/lmod/8.7.24/gcc/11.4.1/base/lnirq74/lmod/lmod/init/perl</init_path>
<init_path lang="sh">/projects/sems/install/rhel9-x86_64/sems/lmod/lmod/8.7.24/gcc/11.4.1/base/lnirq74/lmod/lmod/init/sh</init_path>
<init_path lang="csh">/projects/sems/install/rhel9-x86_64/sems/lmod/lmod/8.7.24/gcc/11.4.1/base/lnirq74/lmod/lmod/init/csh</init_path>
<cmd_path lang="python">/projects/sems/install/rhel9-x86_64/sems/lmod/lmod/8.7.24/gcc/11.4.1/base/lnirq74/lmod/lmod/libexec/lmod python</cmd_path>
<cmd_path lang="perl">/projects/sems/install/rhel9-x86_64/sems/lmod/lmod/8.7.24/gcc/11.4.1/base/lnirq74/lmod/lmod/libexec/lmod perl</cmd_path>
<cmd_path lang="csh">module</cmd_path>
<cmd_path lang="sh">module</cmd_path>
<modules>
<command name="purge"/>
<command name="load">sems-archive-env</command>
<command name="load">acme-env</command>
<command name="load">sems-archive-git</command>
<command name="load">acme-cmake/3.26.3</command>
<command name="load">sems-git/2.42.0</command>
<command name="load">sems-cmake/3.27.9</command>
</modules>
<modules compiler="gnu">
<command name="load">acme-gcc/11.2.0</command>
<command name="load">sems-gcc/11.4.0</command>
<command name="load">sems-openblas</command>
</modules>
<modules mpilib="mpi-serial">
<command name="load">acme-netcdf/4.4.1/exo_acme</command>
<command name="load">acme-pfunit/3.2.8/base</command>
<command name="load">sems-netcdf-c-serial/4.9.2</command>
<command name="load">sems-netcdf-fortran-serial/4.6.1</command>
</modules>
<modules mpilib="!mpi-serial">
<command name="load">acme-openmpi/4.1.4</command>
<command name="load">acme-netcdf/4.7.4/acme</command>
<command name="load">sems-openmpi-no-cuda/4.1.6</command>
<command name="load">sems-netcdf-c/4.9.2</command>
<command name="load">sems-netcdf-cxx/4.2</command>
<command name="load">sems-netcdf-fortran/4.6.1</command>
<command name="load">sems-parallel-netcdf/1.12.3</command>
</modules>
</module_system>
<RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>
Expand All @@ -1894,13 +1896,18 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
<MAX_GB_OLD_TEST_DATA>0</MAX_GB_OLD_TEST_DATA>
<!-- <GMAKE>make</GMAKE> <- this doesn't actually work! -->
<environment_variables>
<env name="NETCDF_PATH">$ENV{SEMS_NETCDF_ROOT}</env>
<env name="NETCDF_C_PATH">$ENV{NETCDF_C_ROOT}</env>
<env name="NETCDF_FORTRAN_PATH">$ENV{NETCDF_FORTRAN_ROOT}</env>
<env name="BLAS_ROOT">$ENV{OPENBLAS_ROOT}</env>
<env name="OMP_STACKSIZE">64M</env>
<env name="OMP_PROC_BIND">spread</env>
<env name="OMP_PLACES">threads</env>
<env name="BLA_VENDOR">Generic</env>
<env name="BLA_VENDOR">OpenBLAS</env>
<env name="GATOR_INITIAL_MB">4000MB</env>
</environment_variables>
<environment_variables mpilib="!mpi-serial">
<env name="PNETCDF_PATH">$ENV{PARALLEL_NETCDF_ROOT}</env>
</environment_variables>
</machine>

<machine MACH="weaver">
Expand Down Expand Up @@ -3493,7 +3500,7 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
<MAX_TASKS_PER_NODE compiler="oneapi-ifxgpu">104</MAX_TASKS_PER_NODE>
<MAX_MPITASKS_PER_NODE>104</MAX_MPITASKS_PER_NODE>
<MAX_MPITASKS_PER_NODE compiler="oneapi-ifxgpu">48</MAX_MPITASKS_PER_NODE>
<PROJECT_REQUIRED>FALSE</PROJECT_REQUIRED>
<PROJECT_REQUIRED>FALSE</PROJECT_REQUIRED>
<mpirun mpilib="default">
<executable>mpiexec</executable>
<!--executable>numactl -m 2-3 mpiexec</executable--><!--for HBM runs-->
Expand Down Expand Up @@ -4286,7 +4293,7 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
</machine>

<machine MACH="chicoma-gpu">
<DESC>Chicoma GPU nodes at LANL IC. Each GPU node has single
<DESC>Chicoma GPU nodes at LANL IC. Each GPU node has single
AMD EPYC 7713 64-Core (Milan) (256GB) and 4 nvidia A100'</DESC>
<NODENAME_REGEX>ch-fe*</NODENAME_REGEX>
<OS>Linux</OS>
Expand Down

0 comments on commit 38f75c1

Please sign in to comment.