Skip to content

Commit

Permalink
"Revert" Intel deprecation flag changes in spack's lib/spack/env/cc a…
Browse files Browse the repository at this point in the history 
…nd pull in improved solution from spack mainline (#1238)

This PR resolves #1230. Detailed information on what this PR does and why it is necessary is given in the issue. The improved solution does away with having to specify the diag-disable flags, since these are now set implicitly (and only during spack environment builds, not in downstream applications). Credits to Peter Scheibel from the spack core team for suggesting it and adding the spack unit tests to my implementation.
  • Loading branch information
@climbfuji
climbfuji authored Aug 16, 2024
1 parent 7168fec commit f4b2f7f
Show file tree
Hide file tree
Showing 11 changed files with 11 additions and 38 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/ubuntu-ci-x86_64-intel.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,7 @@ jobs:
echo " cxx: /opt/intel/oneapi/compiler/2023.2.3/linux/bin/intel64/icpc" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
echo " f77: /opt/intel/oneapi/compiler/2023.2.3/linux/bin/intel64/ifort" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
echo " fc: /opt/intel/oneapi/compiler/2023.2.3/linux/bin/intel64/ifort" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
echo " flags:" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
echo " cflags: -diag-disable=10441" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
echo " cxxflags: -diag-disable=10441" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
echo " fflags: -diag-disable=10448" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
echo " flags: {}" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
echo " operating_system: ubuntu22.04" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
echo " target: x86_64" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
echo " modules: []" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/ubuntu-ci-x86_64-oneapi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,7 @@ jobs:
echo " cxx: /opt/intel/oneapi/compiler/2024.2/bin/icpx" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
echo " f77: /opt/intel/oneapi/compiler/2024.2/bin/ifort" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
echo " fc: /opt/intel/oneapi/compiler/2024.2/bin/ifort" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
echo " flags:" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
echo " cflags: -diag-disable=10441" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
echo " cxxflags: -diag-disable=10441" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
echo " fflags: -diag-disable=10448" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
echo " flags: {}" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
echo " operating_system: ubuntu22.04" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
echo " target: x86_64" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
echo " modules: []" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
Expand Down
4 changes: 1 addition & 3 deletions configs/sites/tier1/aws-pcluster/compilers.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ compilers:
cxx: /opt/intel/oneapi/compiler/2023.2.3/linux/bin/intel64/icpc
f77: /opt/intel/oneapi/compiler/2023.2.3/linux/bin/intel64/ifort
fc: /opt/intel/oneapi/compiler/2023.2.3/linux/bin/intel64/ifort
flags:
cflags: "-diag-disable=10441"
cxxflags: "-diag-disable=10441"
flags: {}
operating_system: ubuntu22.04
target: x86_64
modules: []
Expand Down
5 changes: 1 addition & 4 deletions configs/sites/tier1/derecho/compilers.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@ compilers::
cxx: /glade/u/apps/common/23.08/spack/opt/spack/intel-oneapi-compilers/2023.2.1/compiler/2023.2.1/linux/bin/intel64/icpc
f77: /glade/u/apps/common/23.08/spack/opt/spack/intel-oneapi-compilers/2023.2.1/compiler/2023.2.1/linux/bin/intel64/ifort
fc: /glade/u/apps/common/23.08/spack/opt/spack/intel-oneapi-compilers/2023.2.1/compiler/2023.2.1/linux/bin/intel64/ifort
flags:
cflags: -diag-disable=10441
cxxflags: -diag-disable=10441
fflags: -diag-disable=10448
flags: {}
operating_system: sles15
target: x86_64
modules:
Expand Down
5 changes: 1 addition & 4 deletions configs/sites/tier1/discover-scu17/compilers.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@ compilers:
cxx: /usr/local/intel/oneapi/2021/compiler/2023.2.1/linux/bin/intel64/icpc
f77: /usr/local/intel/oneapi/2021/compiler/2023.2.1/linux/bin/intel64/ifort
fc: /usr/local/intel/oneapi/2021/compiler/2023.2.1/linux/bin/intel64/ifort
flags:
cflags: -diag-disable=10441
cxxflags: -diag-disable=10441
fflags: -diag-disable=10448
flags: {}
operating_system: sles15
target: x86_64
modules:
Expand Down
5 changes: 1 addition & 4 deletions configs/sites/tier1/hercules/compilers.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@ compilers:
cxx: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2023.1.0-sb753366rvywq75zeg4ml5k5c72xgj72/compiler/2023.1.0/linux/bin/intel64/icpc
f77: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2023.1.0-sb753366rvywq75zeg4ml5k5c72xgj72/compiler/2023.1.0/linux/bin/intel64/ifort
fc: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2023.1.0-sb753366rvywq75zeg4ml5k5c72xgj72/compiler/2023.1.0/linux/bin/intel64/ifort
flags:
cflags: -diag-disable=10441
cxxflags: -diag-disable=10441
fflags: -diag-disable=10448
flags: {}
operating_system: rocky9
target: x86_64
modules:
Expand Down
3 changes: 1 addition & 2 deletions configs/sites/tier1/nautilus/compilers.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ compilers:
cxx: /p/app/projects/NEPTUNE/spack-stack/oneapi-2024.1.2/compiler/2024.1/bin/icpx
f77: /p/app/projects/NEPTUNE/spack-stack/oneapi-2024.1.2/compiler/2024.1/bin/ifort
fc: /p/app/projects/NEPTUNE/spack-stack/oneapi-2024.1.2/compiler/2024.1/bin/ifort
flags:
fflags: -diag-disable=10448
flags: {}
operating_system: rhel8
target: x86_64
modules: []
Expand Down
5 changes: 1 addition & 4 deletions configs/sites/tier1/orion/compilers.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@ compilers:
cxx: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2023.1.0-sb753366rvywq75zeg4ml5k5c72xgj72/compiler/2023.1.0/linux/bin/intel64/icpc
f77: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2023.1.0-sb753366rvywq75zeg4ml5k5c72xgj72/compiler/2023.1.0/linux/bin/intel64/ifort
fc: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2023.1.0-sb753366rvywq75zeg4ml5k5c72xgj72/compiler/2023.1.0/linux/bin/intel64/ifort
flags:
cflags: -diag-disable=10441
cxxflags: -diag-disable=10441
fflags: -diag-disable=10448
flags: {}
operating_system: rocky9
target: x86_64
modules:
Expand Down
5 changes: 1 addition & 4 deletions configs/sites/tier2/blackpearl/compilers.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,7 @@ compilers:
fc: /opt/intel/oneapi/compiler/2024.1/bin/ifort
#f77: /opt/intel/oneapi/compiler/2024.1/bin/ifx
#fc: /opt/intel/oneapi/compiler/2024.1/bin/ifx
flags:
cflags: -diag-disable=10441
cxxflags: -diag-disable=10441
fflags: -diag-disable=10448
flags: {}
operating_system: oracle9
target: x86_64
modules: []
Expand Down
5 changes: 1 addition & 4 deletions configs/sites/tier2/frontera/compilers.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@ compilers::
cxx: /opt/intel/oneapi/compiler/2023.1.0/linux/bin/intel64/icpc
f77: /opt/intel/oneapi/compiler/2023.1.0/linux/bin/intel64/ifort
fc: /opt/intel/oneapi/compiler/2023.1.0/linux/bin/intel64/ifort
flags:
cflags: -diag-disable=10441
cxxflags: -diag-disable=10441
fflags: -diag-disable=10448
flags: {}
operating_system: centos7
target: x86_64
modules:
Expand Down
2 changes: 1 addition & 1 deletion spack
Submodule spack updated 7 files
+58 −61 lib/spack/env/cc
+11 −0 lib/spack/spack/compilers/intel.py
+11 −0 lib/spack/spack/compilers/oneapi.py
+20 −0 lib/spack/spack/test/build_environment.py
+9 −0 lib/spack/spack/test/cc.py
+2 −0 var/spack/repos/builtin/packages/g2/package.py
+1 −0 var/spack/repos/builtin/packages/g2tmpl/package.py

0 comments on commit f4b2f7f

Please sign in to comment.