diff options
| -rw-r--r-- | mesonbuild/compilers/c.py | 2 | ||||
| -rw-r--r-- | mesonbuild/compilers/compilers.py | 69 | ||||
| -rw-r--r-- | mesonbuild/compilers/cpp.py | 2 | ||||
| -rw-r--r-- | mesonbuild/compilers/fortran.py | 2 | ||||
| -rw-r--r-- | mesonbuild/compilers/mixins/pgi.py | 89 |
5 files changed, 92 insertions, 72 deletions
diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py index f787f2019..47cfd981d 100644 --- a/mesonbuild/compilers/c.py +++ b/mesonbuild/compilers/c.py @@ -26,12 +26,12 @@ from .mixins.gnu import GnuCompiler from .mixins.intel import IntelGnuLikeCompiler, IntelVisualStudioLikeCompiler from .mixins.clang import ClangCompiler from .mixins.elbrus import ElbrusCompiler +from .mixins.pgi import PGICompiler from .compilers import ( gnu_winlibs, msvc_winlibs, Compiler, CompilerType, - PGICompiler, ) diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index eebb6e636..76c5c5e5d 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -142,23 +142,6 @@ cuda_buildtype_args = {'plain': [], 'release': [], 'minsize': [], } -pgi_buildtype_args = {'plain': [], - 'debug': [], - 'debugoptimized': [], - 'release': [], - 'minsize': [], - 'custom': [], - } - - -pgi_buildtype_linker_args = {'plain': [], - 'debug': [], - 'debugoptimized': [], - 'release': [], - 'minsize': [], - 'custom': [], - } - java_buildtype_args = {'plain': [], 'debug': ['-g'], 'debugoptimized': ['-g'], @@ -1289,55 +1272,3 @@ def get_largefile_args(compiler): # transitionary features and must be enabled by programs that use # those features explicitly. return [] - - -class PGICompiler: - def __init__(self, compiler_type): - self.id = 'pgi' - self.compiler_type = compiler_type - - default_warn_args = ['-Minform=inform'] - self.warn_args = {'0': [], - '1': default_warn_args, - '2': default_warn_args, - '3': default_warn_args} - - def get_module_incdir_args(self) -> Tuple[str]: - return ('-module', ) - - def get_no_warn_args(self) -> List[str]: - return ['-silent'] - - def get_pic_args(self) -> List[str]: - if self.compiler_type.is_osx_compiler or self.compiler_type.is_windows_compiler: - return [] # PGI -fPIC is Linux only. - return ['-fPIC'] - - def openmp_flags(self) -> List[str]: - return ['-mp'] - - def get_buildtype_args(self, buildtype: str) -> List[str]: - return pgi_buildtype_args[buildtype] - - def get_buildtype_linker_args(self, buildtype: str) -> List[str]: - return pgi_buildtype_linker_args[buildtype] - - def get_optimization_args(self, optimization_level: str): - return clike_optimization_args[optimization_level] - - def get_debug_args(self, is_debug: bool): - return clike_debug_args[is_debug] - - def compute_parameters_with_absolute_paths(self, parameter_list: List[str], build_dir: str): - for idx, i in enumerate(parameter_list): - if i[:2] == '-I' or i[:2] == '-L': - parameter_list[idx] = i[:2] + os.path.normpath(os.path.join(build_dir, i[2:])) - - def get_allow_undefined_link_args(self): - return [] - - def get_dependency_gen_args(self, outtarget, outfile): - return [] - - def get_always_args(self): - return [] diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py index e1eecbe0f..44f53eb23 100644 --- a/mesonbuild/compilers/cpp.py +++ b/mesonbuild/compilers/cpp.py @@ -24,7 +24,6 @@ from ..mesonlib import MesonException, MachineChoice, version_compare from .compilers import ( gnu_winlibs, msvc_winlibs, - PGICompiler, Compiler, ) from .c_function_attributes import CXX_FUNC_ATTRIBUTES, C_FUNC_ATTRIBUTES @@ -36,6 +35,7 @@ from .mixins.gnu import GnuCompiler from .mixins.intel import IntelGnuLikeCompiler, IntelVisualStudioLikeCompiler from .mixins.clang import ClangCompiler from .mixins.elbrus import ElbrusCompiler +from .mixins.pgi import PGICompiler def non_msvc_eh_options(eh, args): diff --git a/mesonbuild/compilers/fortran.py b/mesonbuild/compilers/fortran.py index d519d8e0d..e41756695 100644 --- a/mesonbuild/compilers/fortran.py +++ b/mesonbuild/compilers/fortran.py @@ -19,7 +19,6 @@ from .compilers import ( CompilerType, clike_debug_args, Compiler, - PGICompiler, ) from .mixins.clike import CLikeCompiler from .mixins.gnu import ( @@ -29,6 +28,7 @@ from .mixins.gnu import ( from .mixins.intel import IntelGnuLikeCompiler, IntelVisualStudioLikeCompiler from .mixins.clang import ClangCompiler from .mixins.elbrus import ElbrusCompiler +from .mixins.pgi import PGICompiler from .. import mlog from mesonbuild.mesonlib import ( diff --git a/mesonbuild/compilers/mixins/pgi.py b/mesonbuild/compilers/mixins/pgi.py new file mode 100644 index 000000000..af35e5b96 --- /dev/null +++ b/mesonbuild/compilers/mixins/pgi.py @@ -0,0 +1,89 @@ +# Copyright 2019 The meson development team +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +"""Abstractions for the PGI family of compilers.""" + +import typing +import os + +from ..compilers import clike_debug_args, clike_optimization_args + +pgi_buildtype_args = {'plain': [], + 'debug': [], + 'debugoptimized': [], + 'release': [], + 'minsize': [], + 'custom': [], + } + + +pgi_buildtype_linker_args = {'plain': [], + 'debug': [], + 'debugoptimized': [], + 'release': [], + 'minsize': [], + 'custom': [], + } + + +class PGICompiler: + def __init__(self, compiler_type): + self.id = 'pgi' + self.compiler_type = compiler_type + + default_warn_args = ['-Minform=inform'] + self.warn_args = {'0': [], + '1': default_warn_args, + '2': default_warn_args, + '3': default_warn_args} + + def get_module_incdir_args(self) -> typing.Tuple[str]: + return ('-module', ) + + def get_no_warn_args(self) -> typing.List[str]: + return ['-silent'] + + def get_pic_args(self) -> typing.List[str]: + if self.compiler_type.is_osx_compiler or self.compiler_type.is_windows_compiler: + return [] # PGI -fPIC is Linux only. + return ['-fPIC'] + + def openmp_flags(self) -> typing.List[str]: + return ['-mp'] + + def get_buildtype_args(self, buildtype: str) -> typing.List[str]: + return pgi_buildtype_args[buildtype] + + def get_buildtype_linker_args(self, buildtype: str) -> typing.List[str]: + return pgi_buildtype_linker_args[buildtype] + + def get_optimization_args(self, optimization_level: str): + return clike_optimization_args[optimization_level] + + def get_debug_args(self, is_debug: bool): + return clike_debug_args[is_debug] + + def compute_parameters_with_absolute_paths(self, parameter_list: typing.List[str], build_dir: str): + for idx, i in enumerate(parameter_list): + if i[:2] == '-I' or i[:2] == '-L': + parameter_list[idx] = i[:2] + os.path.normpath(os.path.join(build_dir, i[2:])) + + def get_allow_undefined_link_args(self): + return [] + + def get_dependency_gen_args(self, outtarget, outfile): + return [] + + def get_always_args(self): + return [] |