Skip to content

Commit 5dc44fe

Browse files
E3SM-BotE3SM-Bot
authored
Merge Pull Request #2364 from E3SM-Project/scream/elynn/parallel-netcdf-toss4
Automatically Merged using E3SM Pull Request AutoTester PR Title: Use parallel-netcdf on TOSS4 machines PR Author: elynnwu
2 parents e51b15c + cba8e50 commit 5dc44fe

File tree

5 files changed

+16
-12
lines changed

5 files changed

+16
-12
lines changed

‎cime_config/machines/cmake_macros/intel_quartz.cmake‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ string(APPEND SLIBS " -llapack -lblas")
66
string(APPEND LDFLAGS " -L/usr/tce/packages/gcc/gcc-10.3.1-magic/lib/gcc/x86_64-redhat-linux/10/")
77
set(KOKKOS_OPTIONS "--with-serial --ldflags='-L/usr/tce/packages/gcc/gcc-10.3.1-magic/lib/gcc/x86_64-redhat-linux/10/'")
88
set(MPI_LIB_NAME "mpich")
9-
set(MPI_PATH "/usr/tce/packages/mvapich2/mvapich2-2.3.6-intel-classic-2021.6.0/")
9+
set(MPI_PATH "/usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-classic-2021.6.0/")
1010
set(NETCDF_PATH "$ENV{NETCDFROOT}")
11-
execute_process(COMMAND /usr/tce/packages/netcdf-fortran/netcdf-fortran-4.6.0-mvapich2-2.3.6-intel-classic-2021.6.0/bin/nf-config --flibs OUTPUT_VARIABLE SHELL_CMD_OUTPUT_BUILD_INTERNAL_IGNORE0 OUTPUT_STRIP_TRAILING_WHITESPACE)
11+
set(PNETCDF_PATH "$ENV{PNETCDFROOT}")
12+
execute_process(COMMAND /usr/tce/packages/netcdf-fortran/netcdf-fortran-4.6.0-mvapich2-2.3.7-intel-classic-2021.6.0/bin/nf-config --flibs OUTPUT_VARIABLE SHELL_CMD_OUTPUT_BUILD_INTERNAL_IGNORE0 OUTPUT_STRIP_TRAILING_WHITESPACE)
1213
string(APPEND SLIBS " ${SHELL_CMD_OUTPUT_BUILD_INTERNAL_IGNORE0}")

‎cime_config/machines/cmake_macros/intel_ruby.cmake‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ string(APPEND SLIBS " -llapack -lblas")
66
string(APPEND LDFLAGS " -L/usr/tce/packages/gcc/gcc-10.3.1-magic/lib/gcc/x86_64-redhat-linux/10/")
77
set(KOKKOS_OPTIONS "--with-serial --ldflags='-L/usr/tce/packages/gcc/gcc-10.3.1-magic/lib/gcc/x86_64-redhat-linux/10/'")
88
set(MPI_LIB_NAME "mpich")
9-
set(MPI_PATH "/usr/tce/packages/mvapich2/mvapich2-2.3.6-intel-classic-2021.6.0/")
9+
set(MPI_PATH "/usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-classic-2021.6.0/")
1010
set(NETCDF_PATH "$ENV{NETCDFROOT}")
11-
execute_process(COMMAND /usr/tce/packages/netcdf-fortran/netcdf-fortran-4.6.0-mvapich2-2.3.6-intel-classic-2021.6.0/bin/nf-config --flibs OUTPUT_VARIABLE SHELL_CMD_OUTPUT_BUILD_INTERNAL_IGNORE0 OUTPUT_STRIP_TRAILING_WHITESPACE)
11+
set(PNETCDF_PATH "$ENV{PNETCDFROOT}")
12+
execute_process(COMMAND /usr/tce/packages/netcdf-fortran/netcdf-fortran-4.6.0-mvapich2-2.3.7-intel-classic-2021.6.0/bin/nf-config --flibs OUTPUT_VARIABLE SHELL_CMD_OUTPUT_BUILD_INTERNAL_IGNORE0 OUTPUT_STRIP_TRAILING_WHITESPACE)
1213
string(APPEND SLIBS " ${SHELL_CMD_OUTPUT_BUILD_INTERNAL_IGNORE0}")

‎cime_config/machines/config_machines.xml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2864,13 +2864,15 @@
28642864
<command name="load">cmake/3.19.2</command>
28652865
<command name="load">netcdf-fortran-parallel/4.6.0</command>
28662866
<command name="load">netcdf-c-parallel/4.9.0</command>
2867+
<command name="load">parallel-netcdf/1.12.3</command>
28672868
</modules>
28682869
</module_system>
28692870
<RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>
28702871
<EXEROOT>$CIME_OUTPUT_ROOT/$CASE/bld</EXEROOT>
28712872
<environment_variables compiler="intel">
2872-
<env name="NETCDFROOT">/usr/tce/packages/netcdf-fortran/netcdf-fortran-4.6.0-mvapich2-2.3.6-intel-classic-2021.6.0/</env>
2873-
<env name="NETCDF_PATH">/usr/tce/packages/netcdf-fortran/netcdf-fortran-4.6.0-mvapich2-2.3.6-intel-classic-2021.6.0/</env>
2873+
<env name="NETCDFROOT">/usr/tce/packages/netcdf-fortran/netcdf-fortran-4.6.0-mvapich2-2.3.7-intel-classic-2021.6.0/</env>
2874+
<env name="NETCDF_PATH">/usr/tce/packages/netcdf-fortran/netcdf-fortran-4.6.0-mvapich2-2.3.7-intel-classic-2021.6.0/</env>
2875+
<env name="PNETCDFROOT">/usr/tce/packages/parallel-netcdf/parallel-netcdf-1.12.3-mvapich2-2.3.7-intel-classic-2021.6.0/</env>
28742876
</environment_variables>
28752877
</machine>
28762878

@@ -2915,13 +2917,15 @@
29152917
<command name="load">cmake/3.19.2</command>
29162918
<command name="load">netcdf-fortran-parallel/4.6.0</command>
29172919
<command name="load">netcdf-c-parallel/4.9.0</command>
2920+
<command name="load">parallel-netcdf/1.12.3</command>
29182921
</modules>
29192922
</module_system>
29202923
<RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>
29212924
<EXEROOT>$CIME_OUTPUT_ROOT/$CASE/bld</EXEROOT>
29222925
<environment_variables compiler="intel">
2923-
<env name="NETCDFROOT">/usr/tce/packages/netcdf-fortran/netcdf-fortran-4.6.0-mvapich2-2.3.6-intel-classic-2021.6.0/</env>
2924-
<env name="NETCDF_PATH">/usr/tce/packages/netcdf-fortran/netcdf-fortran-4.6.0-mvapich2-2.3.6-intel-classic-2021.6.0/</env>
2926+
<env name="NETCDFROOT">/usr/tce/packages/netcdf-fortran/netcdf-fortran-4.6.0-mvapich2-2.3.7-intel-classic-2021.6.0/</env>
2927+
<env name="NETCDF_PATH">/usr/tce/packages/netcdf-fortran/netcdf-fortran-4.6.0-mvapich2-2.3.7-intel-classic-2021.6.0/</env>
2928+
<env name="PNETCDFROOT">/usr/tce/packages/parallel-netcdf/parallel-netcdf-1.12.3-mvapich2-2.3.7-intel-classic-2021.6.0</env>
29252929
</environment_variables>
29262930
</machine>
29272931

‎cime_config/machines/config_pio.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@
6868
<value mach="chicoma-cpu">netcdf</value>
6969
<value mach="bebop" mpilib="impi" compset=".*CAM5.+MPAS.*">netcdf</value>
7070
<value mach="fugaku" compiler="gnu">netcdf</value>
71-
<value mach="quartz">netcdf</value>
72-
<value mach="ruby">netcdf</value>
7371
</values>
7472
</entry>
7573

‎components/eamxx/scripts/machines_specs.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@
3434
["mpicxx","mpifort","mpicc"],
3535
"bsub -Ip -qpdebug",
3636
""),
37-
"ruby-intel" : (["module --force purge", "module load StdEnv cmake/3.19.2 mkl/2022.1.0 intel-classic/2021.6.0-magic netcdf-c-parallel/4.9.0 netcdf-fortran-parallel/4.6.0 mvapich2/2.3.7 python/3.9.12"],
37+
"ruby-intel" : (["module --force purge", "module load StdEnv cmake/3.19.2 mkl/2022.1.0 intel-classic/2021.6.0-magic netcdf-c-parallel/4.9.0 netcdf-fortran-parallel/4.6.0 mvapich2/2.3.7 parallel-netcdf/1.12.3 python/3.9.12"],
3838
["mpicxx","mpifort","mpicc"],
3939
"salloc --partition=pdebug",
4040
""),
41-
"quartz-intel" : (["module --force purge", "module load StdEnv cmake/3.19.2 mkl/2022.1.0 intel-classic/2021.6.0-magic netcdf-c-parallel/4.9.0 netcdf-fortran-parallel/4.6.0 mvapich2/2.3.7 python/3.9.12"],
41+
"quartz-intel" : (["module --force purge", "module load StdEnv cmake/3.19.2 mkl/2022.1.0 intel-classic/2021.6.0-magic netcdf-c-parallel/4.9.0 netcdf-fortran-parallel/4.6.0 mvapich2/2.3.7 parallel-netcdf/1.12.3 python/3.9.12"],
4242
["mpicxx","mpifort","mpicc"],
4343
"salloc --partition=pdebug",
4444
""),

0 commit comments

Comments
 (0)