diff options
author | Greg Becker <becker33@llnl.gov> | 2024-04-03 15:34:23 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-03 15:34:23 -0700 |
commit | fb4e1cad4529d3d7583f7e083470e062491efc97 (patch) | |
tree | ba622606bf772e6051b225cf7274cd002b8169e8 /lib | |
parent | 3054b71e2ebf377b3973776a168a9c5f9429c94d (diff) | |
download | spack-fb4e1cad4529d3d7583f7e083470e062491efc97.tar.gz spack-fb4e1cad4529d3d7583f7e083470e062491efc97.tar.bz2 spack-fb4e1cad4529d3d7583f7e083470e062491efc97.tar.xz spack-fb4e1cad4529d3d7583f7e083470e062491efc97.zip |
remove dpcpp compiler and package (#43418)
`dpcpp` is deprecated by intel and has been superseded by `oneapi` compilers for a very long time.
---------
Co-authored-by: becker33 <becker33@users.noreply.github.com>
Diffstat (limited to 'lib')
-rwxr-xr-x | lib/spack/env/cc | 5 | ||||
-rw-r--r-- | lib/spack/spack/build_systems/autotools.py | 5 | ||||
-rw-r--r-- | lib/spack/spack/compilers/dpcpp.py | 34 |
3 files changed, 2 insertions, 42 deletions
diff --git a/lib/spack/env/cc b/lib/spack/env/cc index f72a6663a3..6c4db38ba1 100755 --- a/lib/spack/env/cc +++ b/lib/spack/env/cc @@ -248,7 +248,7 @@ case "$command" in lang_flags=C debug_flags="-g" ;; - c++|CC|g++|clang++|armclang++|icpc|icpx|dpcpp|pgc++|nvc++|xlc++|xlc++_r|FCC|amdclang++|crayCC) + c++|CC|g++|clang++|armclang++|icpc|icpx|pgc++|nvc++|xlc++|xlc++_r|FCC|amdclang++|crayCC) command="$SPACK_CXX" language="C++" comp="CXX" @@ -526,7 +526,7 @@ categorize_arguments() { continue fi - replaced="$after$stripped" + replaced="$after$stripped" # it matched, remove it shift @@ -913,4 +913,3 @@ fi # Execute the full command, preserving spaces with IFS set # to the alarm bell separator. IFS="$lsep"; exec $full_command_list - diff --git a/lib/spack/spack/build_systems/autotools.py b/lib/spack/spack/build_systems/autotools.py index 1f44ebf137..ce4d6bc279 100644 --- a/lib/spack/spack/build_systems/autotools.py +++ b/lib/spack/spack/build_systems/autotools.py @@ -434,11 +434,6 @@ To resolve this problem, please try the following: r"crtendS\.o", ]: x.filter(regex=(rehead + o), repl="") - elif self.pkg.compiler.name == "dpcpp": - # Hack to filter out spurious predep_objects when building with Intel dpcpp - # (see https://github.com/spack/spack/issues/32863): - x.filter(regex=r"^(predep_objects=.*)/tmp/conftest-[0-9A-Fa-f]+\.o", repl=r"\1") - x.filter(regex=r"^(predep_objects=.*)/tmp/a-[0-9A-Fa-f]+\.o", repl=r"\1") elif self.pkg.compiler.name == "nag": for tag in ["fc", "f77"]: marker = markers[tag] diff --git a/lib/spack/spack/compilers/dpcpp.py b/lib/spack/spack/compilers/dpcpp.py deleted file mode 100644 index 392817fd39..0000000000 --- a/lib/spack/spack/compilers/dpcpp.py +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -import os - -import spack.compilers.oneapi - - -class Dpcpp(spack.compilers.oneapi.Oneapi): - """This is the same as the oneAPI compiler but uses dpcpp instead of - icpx (for DPC++ source files). It explicitly refers to dpcpp, so that - CMake test files which check the compiler name (e.g. CMAKE_CXX_COMPILER) - detect it as dpcpp. - - Ideally we could switch out icpx for dpcpp where needed in the oneAPI - compiler definition, but two things are needed for that: (a) a way to - tell the compiler that it should be using dpcpp and (b) a way to - customize the link_paths - - See also: https://www.intel.com/content/www/us/en/develop/documentation/oneapi-dpcpp-cpp-compiler-dev-guide-and-reference/top/compiler-setup/using-the-command-line/invoking-the-compiler.html - """ - - # Subclasses use possible names of C++ compiler - cxx_names = ["dpcpp"] - - # Named wrapper links within build_env_path - link_paths = { - "cc": os.path.join("oneapi", "icx"), - "cxx": os.path.join("oneapi", "dpcpp"), - "f77": os.path.join("oneapi", "ifx"), - "fc": os.path.join("oneapi", "ifx"), - } |