diff options
author | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2024-08-08 18:15:42 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-08-08 18:15:42 +0200 |
commit | 007c1148c03927cc53e816b65d7b8f236d00c845 (patch) | |
tree | 2fd73e679b65a31abe1b229e7d60efb1bf5b04b3 /lib | |
parent | 8b2fec61f23a7b8230c0ed0378d90d04d8f590d8 (diff) | |
download | spack-007c1148c03927cc53e816b65d7b8f236d00c845.tar.gz spack-007c1148c03927cc53e816b65d7b8f236d00c845.tar.bz2 spack-007c1148c03927cc53e816b65d7b8f236d00c845.tar.xz spack-007c1148c03927cc53e816b65d7b8f236d00c845.zip |
Remove `Compiler.PrgEnv*` attributes (#45615)
Diffstat (limited to 'lib')
-rw-r--r-- | lib/spack/spack/compiler.py | 5 | ||||
-rw-r--r-- | lib/spack/spack/compilers/aocc.py | 3 | ||||
-rw-r--r-- | lib/spack/spack/compilers/cce.py | 5 | ||||
-rw-r--r-- | lib/spack/spack/compilers/gcc.py | 3 | ||||
-rw-r--r-- | lib/spack/spack/compilers/intel.py | 3 | ||||
-rw-r--r-- | lib/spack/spack/compilers/nvhpc.py | 3 | ||||
-rw-r--r-- | lib/spack/spack/compilers/oneapi.py | 3 | ||||
-rw-r--r-- | lib/spack/spack/compilers/pgi.py | 3 | ||||
-rw-r--r-- | lib/spack/spack/compilers/rocmcc.py | 3 |
9 files changed, 1 insertions, 30 deletions
diff --git a/lib/spack/spack/compiler.py b/lib/spack/spack/compiler.py index 13049883e7..341b77db05 100644 --- a/lib/spack/spack/compiler.py +++ b/lib/spack/spack/compiler.py @@ -278,11 +278,6 @@ class Compiler: def opt_flags(self): return ["-O", "-O0", "-O1", "-O2", "-O3"] - # Cray PrgEnv name that can be used to load this compiler - PrgEnv: Optional[str] = None - # Name of module used to switch versions of this compiler - PrgEnv_compiler: Optional[str] = None - def __init__( self, cspec, diff --git a/lib/spack/spack/compilers/aocc.py b/lib/spack/spack/compilers/aocc.py index ad67e17338..26e0b7d893 100644 --- a/lib/spack/spack/compilers/aocc.py +++ b/lib/spack/spack/compilers/aocc.py @@ -25,9 +25,6 @@ class Aocc(Compiler): # Subclasses use possible names of Fortran 90 compiler fc_names = ["flang"] - PrgEnv = "PrgEnv-aocc" - PrgEnv_compiler = "aocc" - version_argument = "--version" @property diff --git a/lib/spack/spack/compilers/cce.py b/lib/spack/spack/compilers/cce.py index e9377a0bb1..ae3d9889a3 100644 --- a/lib/spack/spack/compilers/cce.py +++ b/lib/spack/spack/compilers/cce.py @@ -34,12 +34,9 @@ class Cce(Compiler): # MacPorts builds gcc versions with prefixes and -mp-X.Y suffixes. suffixes = [r"-mp-\d\.\d"] - PrgEnv = "PrgEnv-cray" - PrgEnv_compiler = "cce" - @property def link_paths(self): - if any(self.PrgEnv in m for m in self.modules): + if any("PrgEnv-cray" in m for m in self.modules): # Old module-based interface to cray compilers return { "cc": os.path.join("cce", "cc"), diff --git a/lib/spack/spack/compilers/gcc.py b/lib/spack/spack/compilers/gcc.py index 6d635523ae..acf3003c3d 100644 --- a/lib/spack/spack/compilers/gcc.py +++ b/lib/spack/spack/compilers/gcc.py @@ -40,9 +40,6 @@ class Gcc(spack.compiler.Compiler): "fc": os.path.join("gcc", "gfortran"), } - PrgEnv = "PrgEnv-gnu" - PrgEnv_compiler = "gcc" - @property def verbose_flag(self): return "-v" diff --git a/lib/spack/spack/compilers/intel.py b/lib/spack/spack/compilers/intel.py index 023248b86e..1e8ad20afa 100644 --- a/lib/spack/spack/compilers/intel.py +++ b/lib/spack/spack/compilers/intel.py @@ -31,9 +31,6 @@ class Intel(Compiler): "fc": os.path.join("intel", "ifort"), } - PrgEnv = "PrgEnv-intel" - PrgEnv_compiler = "intel" - if sys.platform == "win32": version_argument = "/QV" else: diff --git a/lib/spack/spack/compilers/nvhpc.py b/lib/spack/spack/compilers/nvhpc.py index 1078e92108..813d14a6c2 100644 --- a/lib/spack/spack/compilers/nvhpc.py +++ b/lib/spack/spack/compilers/nvhpc.py @@ -29,9 +29,6 @@ class Nvhpc(Compiler): "fc": os.path.join("nvhpc", "nvfortran"), } - PrgEnv = "PrgEnv-nvhpc" - PrgEnv_compiler = "nvhpc" - version_argument = "--version" version_regex = r"nv[^ ]* (?:[^ ]+ Dev-r)?([0-9.]+)(?:-[0-9]+)?" diff --git a/lib/spack/spack/compilers/oneapi.py b/lib/spack/spack/compilers/oneapi.py index fbcf7876c7..e8edc227d8 100644 --- a/lib/spack/spack/compilers/oneapi.py +++ b/lib/spack/spack/compilers/oneapi.py @@ -33,9 +33,6 @@ class Oneapi(Compiler): "fc": os.path.join("oneapi", "ifx"), } - PrgEnv = "PrgEnv-oneapi" - PrgEnv_compiler = "oneapi" - version_argument = "--version" version_regex = r"(?:(?:oneAPI DPC\+\+(?:\/C\+\+)? Compiler)|(?:\(IFORT\))|(?:\(IFX\))) (\S+)" diff --git a/lib/spack/spack/compilers/pgi.py b/lib/spack/spack/compilers/pgi.py index 1e8656fd3f..1dd7eeed42 100644 --- a/lib/spack/spack/compilers/pgi.py +++ b/lib/spack/spack/compilers/pgi.py @@ -30,9 +30,6 @@ class Pgi(Compiler): "fc": os.path.join("pgi", "pgfortran"), } - PrgEnv = "PrgEnv-pgi" - PrgEnv_compiler = "pgi" - version_argument = "-V" ignore_version_errors = [2] # `pgcc -V` on PowerPC annoyingly returns 2 version_regex = r"pg[^ ]* ([0-9.]+)-[0-9]+ (LLVM )?[^ ]+ target on " diff --git a/lib/spack/spack/compilers/rocmcc.py b/lib/spack/spack/compilers/rocmcc.py index 863d3c2cbf..5dc8d1c1d3 100644 --- a/lib/spack/spack/compilers/rocmcc.py +++ b/lib/spack/spack/compilers/rocmcc.py @@ -23,9 +23,6 @@ class Rocmcc(spack.compilers.clang.Clang): # Subclasses use possible names of Fortran 90 compiler fc_names = ["amdflang"] - PrgEnv = "PrgEnv-amd" - PrgEnv_compiler = "amd" - @property def link_paths(self): link_paths = { |