Skip to content

Commit 1dc62b0

Browse files
committed
Merge branch 'azamat/chrysalis/rm-python4nbfb' (PR #7062)
Fix python module conflicts on Chrysalis. Also, avoid possible python-cime_env-conda conflicts on Anvil, Aurora. Fixes #7047 [BFB]
2 parents c5cfa4e + 181eaa3 commit 1dc62b0

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

cime_config/machines/config_machines.xml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2393,17 +2393,15 @@
23932393
<arg name="placement">-m plane={{ tasks_per_node }}</arg>
23942394
</arguments>
23952395
</mpirun>
2396-
<module_system type="module">
2396+
<module_system type="module" allow_error="true">
23972397
<init_path lang="sh">/home/software/spack-0.10.1/opt/spack/linux-centos7-x86_64/gcc-4.8.5/lmod-7.4.9-ic63herzfgw5u3na5mdtvp3nwxy6oj2z/lmod/lmod/init/sh;export MODULEPATH=$MODULEPATH:/software/centos7/spack-latest/share/spack/lmod/linux-centos7-x86_64/Core</init_path>
23982398
<init_path lang="csh">/home/software/spack-0.10.1/opt/spack/linux-centos7-x86_64/gcc-4.8.5/lmod-7.4.9-ic63herzfgw5u3na5mdtvp3nwxy6oj2z/lmod/lmod/init/csh;setenv MODULEPATH $MODULEPATH\:/software/centos7/spack-latest/share/spack/lmod/linux-centos7-x86_64/Core</init_path>
23992399
<init_path lang="python">/home/software/spack-0.10.1/opt/spack/linux-centos7-x86_64/gcc-4.8.5/lmod-7.4.9-ic63herzfgw5u3na5mdtvp3nwxy6oj2z/lmod/lmod/init/env_modules_python.py</init_path>
24002400
<cmd_path lang="python">export MODULEPATH=$MODULEPATH:/software/centos7/spack-latest/share/spack/lmod/linux-centos7-x86_64/Core;/home/software/spack-0.10.1/opt/spack/linux-centos7-x86_64/gcc-4.8.5/lmod-7.4.9-ic63herzfgw5u3na5mdtvp3nwxy6oj2z/lmod/lmod/libexec/lmod python</cmd_path>
24012401
<cmd_path lang="sh">module</cmd_path>
24022402
<cmd_path lang="csh">module</cmd_path>
24032403
<modules>
2404-
<command name="purge"/>
24052404
<command name="use">/lcrc/group/e3sm/soft/modulefiles/anvil</command>
2406-
<command name="load">python/3.9.16-gm6ql7v</command>
24072405
<command name="load">cmake/3.26.3-nszudya</command>
24082406
</modules>
24092407
<modules compiler="intel">
@@ -2528,16 +2526,14 @@
25282526
<arg name="placement">-m plane={{ tasks_per_node }}</arg>
25292527
</arguments>
25302528
</mpirun>
2531-
<module_system type="module">
2529+
<module_system type="module" allow_error="true">
25322530
<init_path lang="sh">/gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-9.3.0/lmod-8.3-5be73rg/lmod/lmod/init/sh</init_path>
25332531
<init_path lang="csh">/gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-9.3.0/lmod-8.3-5be73rg/lmod/lmod/init/csh</init_path>
25342532
<init_path lang="python">/gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-9.3.0/lmod-8.3-5be73rg/lmod/lmod/init/env_modules_python.py</init_path>
25352533
<cmd_path lang="python">/gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-9.3.0/lmod-8.3-5be73rg/lmod/lmod/libexec/lmod python</cmd_path>
25362534
<cmd_path lang="sh">module</cmd_path>
25372535
<cmd_path lang="csh">module</cmd_path>
25382536
<modules>
2539-
<command name="purge"/>
2540-
<command name="load">python/3.11.7-iexc6vq</command>
25412537
<command name="load">subversion/1.14.0-e4smcy3</command>
25422538
<command name="load">perl/5.32.0-bsnc6lt</command>
25432539
<command name="load">cmake/3.24.2-whgdv7y</command>
@@ -3458,7 +3454,6 @@
34583454
<cmd_path lang="csh">module</cmd_path>
34593455
<cmd_path lang="python">/usr/share/lmod/lmod/libexec/lmod python</cmd_path>
34603456
<modules>
3461-
<command name="load">python</command>
34623457
<command name="load">cmake</command>
34633458
</modules>
34643459
<modules compiler="!gnu">

0 commit comments

Comments
 (0)