-
Notifications
You must be signed in to change notification settings - Fork 479
Machines: rename oneapi to intel everywhere #8652
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,39 +1,3 @@ | ||
| if (CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") | ||
| string(APPEND CMAKE_C_FLAGS " -mcmodel=small") | ||
| string(APPEND CMAKE_Fortran_FLAGS " -mcmodel=small") | ||
| elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "arm64") | ||
| string(APPEND CMAKE_C_FLAGS " -mcmodel=large") | ||
| string(APPEND CMAKE_Fortran_FLAGS " -mcmodel=large") | ||
| else() | ||
| string(APPEND CMAKE_C_FLAGS " -mcmodel=medium") | ||
| string(APPEND CMAKE_Fortran_FLAGS " -mcmodel=medium") | ||
| endif() | ||
| string(APPEND CMAKE_Fortran_FLAGS " -fconvert=big-endian -ffree-line-length-none -ffixed-line-length-none") | ||
| if (CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER_EQUAL 10) | ||
| string(APPEND CMAKE_Fortran_FLAGS " -fallow-argument-mismatch") | ||
| endif() | ||
| string(APPEND CPPDEFS " -DFORTRANUNDERSCORE -DNO_R16 -DCPRGNU") | ||
| if (compile_threaded) | ||
| string(APPEND CMAKE_C_FLAGS " -fopenmp") | ||
| string(APPEND CMAKE_CXX_FLAGS " -fopenmp") | ||
| string(APPEND CMAKE_Fortran_FLAGS " -fopenmp") | ||
| string(APPEND CMAKE_EXE_LINKER_FLAGS " -fopenmp") | ||
| endif() | ||
| string(APPEND CMAKE_C_FLAGS_DEBUG " -O0 -g -Wall -fcheck=bounds -ffpe-trap=invalid,zero,overflow") | ||
| string(APPEND CMAKE_Fortran_FLAGS_DEBUG " -O0 -g -Wall -fbacktrace -fcheck=bounds -ffpe-trap=zero,overflow") | ||
| string(APPEND CMAKE_CXX_FLAGS_DEBUG " -O0 -g -Wall") | ||
| string(APPEND CPPDEFS_DEBUG " -DYAKL_DEBUG") | ||
| string(APPEND CMAKE_C_FLAGS_RELEASE " -O") | ||
| string(APPEND CMAKE_CXX_FLAGS_RELEASE " -O") | ||
| string(APPEND CMAKE_Fortran_FLAGS_RELEASE " -O") | ||
| if (COMP_NAME STREQUAL csm_share) | ||
| string(APPEND CMAKE_C_FLAGS " -std=c99") | ||
| endif() | ||
| string(APPEND CMAKE_Fortran_FORMAT_FIXED_FLAG " -ffixed-form") | ||
| string(APPEND CMAKE_Fortran_FORMAT_FREE_FLAG " -ffree-form") | ||
| set(MPICC "mpicc") | ||
| set(MPICXX "mpicxx") | ||
| set(MPIFC "mpif90") | ||
| set(SCC "gcc") | ||
| set(SCXX "g++") | ||
| set(SFC "gfortran") | ||
| include (${CMAKE_CURRENT_LIST_DIR}/gnu.cmake) | ||
|
|
||
| string(APPEND CMAKE_Fortran_FLAGS_DEBUG " -fcheck=bounds") |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| string(APPEND CMAKE_C_FLAGS " -fp-model precise -std=gnu99") | ||
| if (compile_threaded) | ||
| string(APPEND CMAKE_C_FLAGS " -qopenmp") | ||
| string(APPEND CMAKE_CXX_FLAGS " -qopenmp") | ||
| string(APPEND CMAKE_Fortran_FLAGS " -qopenmp") | ||
| string(APPEND CMAKE_EXE_LINKER_FLAGS " -qopenmp") | ||
| endif() | ||
| string(APPEND CMAKE_C_FLAGS_RELEASE " -O2 -debug minimal") | ||
| string(APPEND CMAKE_CXX_FLAGS_RELEASE " -O2") | ||
| string(APPEND CMAKE_Fortran_FLAGS_RELEASE " -O2 -debug minimal") | ||
| string(APPEND CMAKE_C_FLAGS_DEBUG " -O0 -g") | ||
| string(APPEND CMAKE_CXX_FLAGS_DEBUG " -O0 -g") | ||
| string(APPEND CMAKE_Fortran_FLAGS_DEBUG " -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created -init=snan,arrays") | ||
| string(APPEND CMAKE_CXX_FLAGS " -fp-model source") | ||
| if (COMP_NAME STREQUAL cice) | ||
| string(APPEND CMAKE_Fortran_FLAGS_DEBUG " -init=nosnan,arrays") | ||
| endif() | ||
| string(APPEND CPPDEFS " -DFORTRANUNDERSCORE -DNO_R16 -DCPRINTEL") | ||
| string(APPEND CMAKE_Fortran_FLAGS " -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs -fp-model source") | ||
| string(APPEND CMAKE_Fortran_FORMAT_FIXED_FLAG " -fixed -132") | ||
| string(APPEND CMAKE_Fortran_FORMAT_FREE_FLAG " -free") | ||
| set(HAS_F2008_CONTIGUOUS "TRUE") | ||
| set(MPICC "mpicc") | ||
| set(MPICXX "mpicxx") | ||
| set(MPIFC "mpif90") | ||
| set(SCC "icc") | ||
| set(SCXX "icpc") | ||
| set(SFC "ifort") | ||
|
|
||
| # Intel has to link fortran mains with fortran | ||
| set(E3SM_LINK_WITH_FORTRAN "TRUE") |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,32 +1,6 @@ | ||
| # Get common intel flags | ||
| include (${CMAKE_CURRENT_SOURCE_DIR}/intel.cmake) | ||
|
|
||
| string(APPEND CMAKE_EXE_LINKER_FLAGS " -lmkl_intel_lp64 -lmkl_sequential -lmkl_core") | ||
| string(APPEND CMAKE_C_FLAGS " -fp-model precise -std=gnu99") | ||
| if (compile_threaded) | ||
| string(APPEND CMAKE_C_FLAGS " -qopenmp") | ||
| string(APPEND CMAKE_CXX_FLAGS " -qopenmp") | ||
| string(APPEND CMAKE_Fortran_FLAGS " -qopenmp") | ||
| string(APPEND CMAKE_EXE_LINKER_FLAGS " -qopenmp") | ||
| endif() | ||
| string(APPEND CMAKE_C_FLAGS_RELEASE " -O2 -debug minimal") | ||
| string(APPEND CMAKE_CXX_FLAGS_RELEASE " -O2") | ||
| string(APPEND CMAKE_Fortran_FLAGS_RELEASE " -O2 -debug minimal") | ||
| string(APPEND CMAKE_C_FLAGS_DEBUG " -O0 -g") | ||
| string(APPEND CMAKE_CXX_FLAGS_DEBUG " -O0 -g") | ||
| string(APPEND CMAKE_Fortran_FLAGS_DEBUG " -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created -init=snan,arrays") | ||
| string(APPEND CMAKE_CXX_FLAGS " -fp-model source") | ||
| if (COMP_NAME STREQUAL cice) | ||
| string(APPEND CMAKE_Fortran_FLAGS_DEBUG " -init=nosnan,arrays") | ||
| endif() | ||
| string(APPEND CPPDEFS " -DFORTRANUNDERSCORE -DNO_R16 -DCPRINTEL") | ||
| string(APPEND CMAKE_Fortran_FLAGS " -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs -fp-model source") | ||
| string(APPEND CMAKE_Fortran_FORMAT_FIXED_FLAG " -fixed -132") | ||
| string(APPEND CMAKE_Fortran_FORMAT_FREE_FLAG " -free") | ||
| set(HAS_F2008_CONTIGUOUS "TRUE") | ||
| set(MPICC "mpicc") | ||
| set(MPICXX "mpicxx") | ||
| set(MPIFC "mpif90") | ||
| set(SCC "icc") | ||
| set(SCXX "icpc") | ||
| set(SFC "ifort") | ||
|
|
||
| # Intel has to link fortran mains with fortran | ||
| set(E3SM_LINK_WITH_FORTRAN "TRUE") | ||
| string(APPEND CMAKE_CXX_FLAGS_RELEASE " --offload-compress") | ||
This file was deleted.
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2869,7 +2869,7 @@ | |
| <env name="SZ_ROOT">$SHELL{if [ -z "$SZ_ROOT" ]; then echo /lcrc/soft/climate/sz/2.1.12.5/gcc-11.2.0; else echo "$SZ_ROOT"; fi}</env> | ||
| <env name="ZFP_ROOT">$SHELL{if [ -z "$ZFP_ROOT" ]; then echo /lcrc/soft/climate/zfp/1.0.1/gcc-11.2.0; else echo "$ZFP_ROOT"; fi}</env> | ||
| </environment_variables> | ||
| <environment_variables compiler="oneapi-ifx" mpilib="openmpi"> | ||
| <environment_variables compiler="intel" mpilib="openmpi"> | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This seems like its left over from when we changed oneapi to intel on chrysalis. Just delete this and the MOAB_ROOT setting. Right @vijaysm ?
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yeah, I can reinstall to "intel" folder if we want to make that the oneapi default now, and use "intel-classic" for the older one? Do we need the classic version?
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I also see line 2854 repeats this. Need to check this more.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. will moving the folder work? A symlink also works probably. |
||
| <env name="MOAB_ROOT">$SHELL{if [ -z "$MOAB_ROOT" ]; then echo /lcrc/soft/climate/moab/chrysalis/intel-oneapi-compilers-2025.2.0; else echo "$MOAB_ROOT"; fi}</env> | ||
| </environment_variables> | ||
| </machine> | ||
|
|
@@ -3150,7 +3150,7 @@ | |
| <machine MACH="dane"> | ||
| <DESC>LLNL Linux Cluster, 112 pes/node, batch system is Slurm</DESC> | ||
| <OS>LINUX</OS> | ||
| <COMPILERS>oneapi-ifx</COMPILERS> | ||
| <COMPILERS>intel</COMPILERS> | ||
| <MPILIBS>mpich</MPILIBS> | ||
| <PROJECT>e3smtest</PROJECT> | ||
| <CIME_OUTPUT_ROOT>/p/lustre2/$USER/e3sm_scratch/dane</CIME_OUTPUT_ROOT> | ||
|
|
@@ -3192,7 +3192,7 @@ | |
| <command name="load">cmake/3.26.3</command> | ||
| <command name="load">mkl/2022.1.0</command> | ||
| </modules> | ||
| <modules compiler="oneapi-ifx"> | ||
| <modules compiler="intel"> | ||
| <command name="load">intel/2023.2.1-magic</command> | ||
| <command name="use">/usr/workspace/e3sm/spack/dane/intel/modules/Core</command> | ||
| <command name="load">intel-oneapi-runtime/2023.2.0</command> | ||
|
|
@@ -3210,7 +3210,7 @@ | |
| <environment_variables> | ||
| <env name="OMP_STACKSIZE">128M</env> | ||
| </environment_variables> | ||
| <environment_variables compiler="oneapi-ifx"> | ||
| <environment_variables compiler="intel"> | ||
| <env name="HDF5_ROOT">$ENV{HDF5_ROOT}</env> | ||
| <env name="NETCDF_C_PATH">$ENV{NETCDF_C_PATH}</env> | ||
| <env name="NETCDF_FORTRAN_PATH">$ENV{NETCDF_FORTRAN_PATH}</env> | ||
|
|
@@ -3317,7 +3317,7 @@ | |
| <DESC>ANL experimental/evaluation cluster, batch system is cobalt</DESC> | ||
| <NODENAME_REGEX>jlse.*</NODENAME_REGEX> | ||
| <OS>LINUX</OS> | ||
| <COMPILERS>oneapi-ifx,oneapi-ifxgpu,gnu</COMPILERS> | ||
| <COMPILERS>intel,intelgpu,gnu</COMPILERS> | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @abagusetty I'm going to ignore this, since from what you said we may remove this machine altogether.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same here |
||
| <MPILIBS>mpich,impi,openmpi</MPILIBS> | ||
| <CIME_OUTPUT_ROOT>/gpfs/jlse-fs0/projects/climate/$USER/scratch</CIME_OUTPUT_ROOT> | ||
| <DIN_LOC_ROOT>/gpfs/jlse-fs0/projects/climate/inputdata</DIN_LOC_ROOT> | ||
|
|
@@ -3331,11 +3331,11 @@ | |
| <BATCH_SYSTEM>cobalt_theta</BATCH_SYSTEM> | ||
| <SUPPORTED_BY>e3sm</SUPPORTED_BY> | ||
| <MAX_TASKS_PER_NODE>112</MAX_TASKS_PER_NODE> | ||
| <MAX_TASKS_PER_NODE compiler="oneapi-ifx">96</MAX_TASKS_PER_NODE> | ||
| <MAX_TASKS_PER_NODE compiler="oneapi-ifxgpu">96</MAX_TASKS_PER_NODE> | ||
| <MAX_TASKS_PER_NODE compiler="intel">96</MAX_TASKS_PER_NODE> | ||
| <MAX_TASKS_PER_NODE compiler="intelgpu">96</MAX_TASKS_PER_NODE> | ||
| <MAX_MPITASKS_PER_NODE>112</MAX_MPITASKS_PER_NODE> | ||
| <MAX_MPITASKS_PER_NODE compiler="oneapi-ifx">48</MAX_MPITASKS_PER_NODE> | ||
| <MAX_MPITASKS_PER_NODE compiler="oneapi-ifxgpu">48</MAX_MPITASKS_PER_NODE> | ||
| <MAX_MPITASKS_PER_NODE compiler="intel">48</MAX_MPITASKS_PER_NODE> | ||
| <MAX_MPITASKS_PER_NODE compiler="intelgpu">48</MAX_MPITASKS_PER_NODE> | ||
| <PROJECT_REQUIRED>FALSE</PROJECT_REQUIRED> | ||
| <mpirun mpilib="default"> | ||
| <executable>mpirun</executable> | ||
|
|
@@ -3409,14 +3409,14 @@ | |
| <env name="NETCDF_PATH">/home/azamat/soft/netcdf/4.4.1c-4.2cxx-4.4.4f/gcc8.2.0-openmpi2.1.6</env> | ||
| <env name="PNETCDF_PATH">/home/azamat/soft/pnetcdf/1.12.1/gcc8.2.0-openmpi2.1.6</env> | ||
| </environment_variables> | ||
| <environment_variables compiler="oneapi-ifxgpu"> | ||
| <environment_variables compiler="intelgpu"> | ||
| <env name="SYCL_DEVICE_FILTER">opencl</env> | ||
| <env name="ONEAPI_MPICH_GPU">NO_GPU</env> | ||
| <env name="SYCL_CACHE_PERSISTENT">0</env> | ||
| <env name="GATOR_INITIAL_MB">4000MB</env> | ||
| <env name="GATOR_DISABLE">0</env> | ||
| </environment_variables> | ||
| <environment_variables compiler="oneapi-ifx"> | ||
| <environment_variables compiler="intel"> | ||
| <env name="LIBOMPTARGET_DEBUG">0</env><!--default 0, max 5 --> | ||
| <env name="OMP_TARGET_OFFLOAD">DISABLED</env><!--default OMP_TARGET_OFFLOAD=MANDATORY--> | ||
| </environment_variables> | ||
|
|
@@ -3532,7 +3532,7 @@ | |
| <DESC>ANL Sunspot Test and Development System (TDS), batch system is pbspro</DESC> | ||
| <NODENAME_REGEX>uan-.*</NODENAME_REGEX> | ||
| <OS>LINUX</OS> | ||
| <COMPILERS>oneapi-ifx,oneapi-ifxgpu,gnu</COMPILERS> | ||
| <COMPILERS>intel,intelgpu,gnu</COMPILERS> | ||
| <MPILIBS>mpich</MPILIBS> | ||
| <CHARGE_ACCOUNT>CSC249ADSE15_CNDA</CHARGE_ACCOUNT> | ||
| <SAVE_TIMING_DIR>/gila/CSC249ADSE15_CNDA/performance_archive</SAVE_TIMING_DIR> | ||
|
|
@@ -3549,9 +3549,9 @@ | |
| <BATCH_SYSTEM>pbspro</BATCH_SYSTEM> | ||
| <SUPPORTED_BY>e3sm</SUPPORTED_BY> | ||
| <MAX_TASKS_PER_NODE>208</MAX_TASKS_PER_NODE> | ||
| <MAX_TASKS_PER_NODE compiler="oneapi-ifxgpu">96</MAX_TASKS_PER_NODE> | ||
| <MAX_TASKS_PER_NODE compiler="intelgpu">96</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> | ||
| <MAX_MPITASKS_PER_NODE compiler="intelgpu">48</MAX_MPITASKS_PER_NODE> | ||
| <PROJECT_REQUIRED>FALSE</PROJECT_REQUIRED> | ||
| <mpirun mpilib="default"> | ||
| <executable>mpiexec</executable> | ||
|
|
@@ -3577,7 +3577,7 @@ | |
| <modules compiler="!gnu"> | ||
| <command name="load">oneapi/eng-compiler/2024.07.30.002</command> | ||
| </modules> | ||
| <modules compiler="oneapi-ifxgpu"> | ||
| <modules compiler="intelgpu"> | ||
| <command name="load">kokkos/4.4.01-omp-sycl</command> | ||
| </modules> | ||
| <modules compiler="gnu"> | ||
|
|
@@ -3597,7 +3597,7 @@ | |
| <environment_variables mpilib="mpich" DEBUG="TRUE"> | ||
| <env name="HYDRA_TOPO_DEBUG">1</env> | ||
| </environment_variables> | ||
| <environment_variables compiler="oneapi-ifxgpu"> | ||
| <environment_variables compiler="intelgpu"> | ||
| <env name="ONEAPI_MPICH_GPU">NO_GPU</env> | ||
| <env name="MPIR_CVAR_ENABLE_GPU">0</env> | ||
| <env name="romio_cb_read">disable</env> | ||
|
|
@@ -3610,7 +3610,7 @@ | |
| <env name="ZES_ENABLE_SYSMAN">1</env> | ||
| <env name="ZEX_NUMBER_OF_CCS">0:4,1:4,2:4,3:4:4:4,5:4,6:4,7:4,8:4,9:4,10:4,11:4</env> | ||
| </environment_variables> | ||
| <environment_variables compiler="oneapi-ifx"> | ||
| <environment_variables compiler="intel"> | ||
| <env name="LIBOMPTARGET_DEBUG">0</env><!--default 0, max 5 --> | ||
| <env name="OMP_TARGET_OFFLOAD">DISABLED</env><!--default OMP_TARGET_OFFLOAD=MANDATORY--> | ||
| <env name="MPIR_CVAR_ENABLE_GPU">0</env> | ||
|
|
@@ -3633,7 +3633,7 @@ | |
| <DESC>ALCF Aurora, 10624 nodes, 2x52c SPR, 6x2s PVC, 2x512GB DDR5, 2x64GB CPU-HBM, 6x128GB GPU-HBM, Slingshot 11, PBSPro</DESC> | ||
| <NODENAME_REGEX>aurora-uan-.*</NODENAME_REGEX> | ||
| <OS>LINUX</OS> | ||
| <COMPILERS>oneapi-ifxgpu,oneapi-ifx</COMPILERS> | ||
| <COMPILERS>intel,intelgpu</COMPILERS> | ||
|
bartgol marked this conversation as resolved.
|
||
| <MPILIBS>mpich</MPILIBS> | ||
| <PROJECT>E3SM_Dec</PROJECT> | ||
| <SAVE_TIMING_DIR>/lus/flare/projects/E3SMinput/baselines</SAVE_TIMING_DIR> | ||
|
|
@@ -3650,9 +3650,9 @@ | |
| <BATCH_SYSTEM>pbspro</BATCH_SYSTEM> | ||
| <SUPPORTED_BY>e3sm</SUPPORTED_BY> | ||
| <MAX_TASKS_PER_NODE>102</MAX_TASKS_PER_NODE> | ||
| <MAX_TASKS_PER_NODE compiler="oneapi-ifxgpu">96</MAX_TASKS_PER_NODE> | ||
| <MAX_TASKS_PER_NODE compiler="intelgpu">96</MAX_TASKS_PER_NODE> | ||
| <MAX_MPITASKS_PER_NODE>102</MAX_MPITASKS_PER_NODE> | ||
| <MAX_MPITASKS_PER_NODE compiler="oneapi-ifxgpu">12</MAX_MPITASKS_PER_NODE> | ||
| <MAX_MPITASKS_PER_NODE compiler="intelgpu">12</MAX_MPITASKS_PER_NODE> | ||
| <PROJECT_REQUIRED>TRUE</PROJECT_REQUIRED> | ||
| <mpirun mpilib="default"> | ||
| <executable>mpiexec</executable> | ||
|
|
@@ -3699,7 +3699,7 @@ | |
| <env name="PALS_RPC_TIMEOUT">240</env> | ||
| <env name="RLIMITS"> </env> | ||
| </environment_variables> | ||
| <environment_variables compiler="oneapi-ifxgpu"> | ||
| <environment_variables compiler="intelgpu"> | ||
| <env name="MPIR_CVAR_ENABLE_GPU">1</env> | ||
| <env name="romio_cb_read">disable</env> | ||
| <env name="romio_cb_write">disable</env> | ||
|
|
@@ -3714,7 +3714,7 @@ | |
| <!-- <env name="ZE_FLAT_DEVICE_HIERARCHY">FLAT</env> | ||
| <env name="ZEX_NUMBER_OF_CCS">0:4,1:4,2:4,3:4:4:4,5:4,6:4,7:4,8:4,9:4,10:4,11:4</env>--> | ||
| </environment_variables> | ||
| <environment_variables compiler="oneapi-ifx"> | ||
| <environment_variables compiler="intel"> | ||
| <env name="LIBOMPTARGET_DEBUG">0</env><!--default 0, max 5 --> | ||
| <env name="OMP_TARGET_OFFLOAD">DISABLED</env><!--default OMP_TARGET_OFFLOAD=MANDATORY--> | ||
| <env name="MPIR_CVAR_ENABLE_GPU">0</env> | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.