Skip to content

Commit 75e9329

Browse files
committed
Adds missing modules and removes hard coded paths
1 parent ca0b689 commit 75e9329

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

cime_config/machines/cmake_macros/oneapi-ifx_dane.cmake

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
list(APPEND CMAKE_BUILD_RPATH "/usr/workspace/e3sm/spack/dane/intel/libs/linux-sapphirerapids/hdf5-1.14.5-oq4xvuvma5emdmqlrhhugf5f2fbl2miq/lib" )
2-
list(APPEND CMAKE_BUILD_RPATH "/usr/workspace/e3sm/spack/dane/intel/libs/linux-sapphirerapids/netcdf-c-4.9.2-3a4qa33n36d4ryrne2des3653ka4rsfa/lib" )
3-
list(APPEND CMAKE_BUILD_RPATH "/usr/workspace/e3sm/spack/dane/intel/libs/linux-sapphirerapids/netcdf-fortran-4.6.1-7mybbfylyzezbv2sc2rjhnkewhnyx3ge/lib" )
4-
list(APPEND CMAKE_BUILD_RPATH "/usr/workspace/e3sm/spack/dane/intel/libs/linux-sapphirerapids/parallel-netcdf-1.14.0-d6xfqf4wccp4eiohquw3idjppqff7mtj/lib" )
1+
list(APPEND CMAKE_BUILD_RPATH "$ENV{HDF5_ROOT}/lib" )
2+
list(APPEND CMAKE_BUILD_RPATH "$ENV{NETCDF_C_PATH}/lib" )
3+
list(APPEND CMAKE_BUILD_RPATH "$ENV{NETCDF_FORTRAN_PATH}/lib" )
4+
list(APPEND CMAKE_BUILD_RPATH "$ENV{PNETCDF_PATH}/lib" )
55

66
# get_cmake_property(_variableNames VARIABLES)
77
# foreach (_variableName ${_variableNames})

cime_config/machines/config_machines.xml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3080,6 +3080,9 @@
30803080
<modules compiler="oneapi-ifx">
30813081
<command name="load">intel/2023.2.1-magic</command>
30823082
<command name="use">/usr/workspace/e3sm/spack/dane/intel/modules/Core</command>
3083+
<command name="load">intel-oneapi-runtime/2023.2.0</command>
3084+
<command name="load">gcc-runtime/12.1.1</command>
3085+
<command name="load">glibc/2.28</command>
30833086
<command name="load">mvapich2/2.3.7</command>
30843087
<command name="load">hdf5/1.14.5</command>
30853088
<command name="load">netcdf-c/4.9.2</command>
@@ -3093,11 +3096,10 @@
30933096
<env name="OMP_STACKSIZE">128M</env>
30943097
</environment_variables>
30953098
<environment_variables compiler="oneapi-ifx">
3096-
<env name="HDF5_ROOT">/usr/workspace/e3sm/spack/dane/intel/libs/linux-sapphirerapids/hdf5-1.14.5-oq4xvuvma5emdmqlrhhugf5f2fbl2miq</env>
3097-
<env name="NETCDF_C_PATH">/usr/workspace/e3sm/spack/dane/intel/libs/linux-sapphirerapids/netcdf-c-4.9.2-3a4qa33n36d4ryrne2des3653ka4rsfa</env>
3098-
<env name="NETCDF_FORTRAN_PATH">/usr/workspace/e3sm/spack/dane/intel/libs/linux-sapphirerapids/netcdf-fortran-4.6.1-7mybbfylyzezbv2sc2rjhnkewhnyx3ge</env>
3099-
<env name="PNETCDF_PATH">/usr/workspace/e3sm/spack/dane/intel/libs/linux-sapphirerapids/parallel-netcdf-1.14.0-d6xfqf4wccp4eiohquw3idjppqff7mtj</env>
3100-
<env name="LD_LIBRARY_PATH">/usr/tce/packages/intel/intel-2023.2.1-magic/lib:$ENV{LD_LIBRARY_PATH}</env>
3099+
<env name="HDF5_ROOT">$ENV{HDF5_ROOT}</env>
3100+
<env name="NETCDF_C_PATH">$ENV{NETCDF_C_PATH}</env>
3101+
<env name="NETCDF_FORTRAN_PATH">$ENV{NETCDF_FORTRAN_PATH}</env>
3102+
<env name="PNETCDF_PATH">$ENV{PNETCDF_PATH}</env>
31013103
<env name="PATH">/usr/tce/packages/intel/intel-2023.2.1/compiler/2023.2.1/linux/bin/intel64:$ENV{PATH}"</env>
31023104
</environment_variables>
31033105
</machine>

0 commit comments

Comments
 (0)