summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Hirsch, Ph.D <scivision@users.noreply.github.com>2019-01-28 15:34:57 -0500
committerJussi Pakkanen <jpakkane@gmail.com>2019-01-29 22:06:11 +0200
commit4e31ca3abeecf0591cccc7052da34c2735759030 (patch)
treed9fa61740cb210681a6e8db9a588ccd9a2c3440b
parent1058430898245cb904f7e617b63aa5ae8867edb2 (diff)
downloadmeson-4e31ca3abeecf0591cccc7052da34c2735759030.tar.gz
correct naming to CudaCompiler, pep8
-rw-r--r--mesonbuild/compilers/__init__.py2
-rw-r--r--mesonbuild/compilers/compilers.py2
-rw-r--r--mesonbuild/interpreterbase.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/compilers/__init__.py b/mesonbuild/compilers/__init__.py
index 60cca93c2..5de0e5976 100644
--- a/mesonbuild/compilers/__init__.py
+++ b/mesonbuild/compilers/__init__.py
@@ -72,7 +72,7 @@ __all__ = [
'JavaCompiler',
'LLVMDCompiler',
'MonoCompiler',
- 'NvidiaCudaCompiler',
+ 'CudaCompiler',
'VisualStudioCsCompiler',
'NAGFortranCompiler',
'ObjCCompiler',
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py
index 97e2b9444..317d91afb 100644
--- a/mesonbuild/compilers/compilers.py
+++ b/mesonbuild/compilers/compilers.py
@@ -150,7 +150,7 @@ cuda_buildtype_args = {'plain': [],
'debugoptimized': [],
'release': [],
'minsize': [],
- }
+ }
arm_buildtype_args = {'plain': [],
'debug': ['-O0', '--debug'],
diff --git a/mesonbuild/interpreterbase.py b/mesonbuild/interpreterbase.py
index 45a4cb0f0..9206d02d9 100644
--- a/mesonbuild/interpreterbase.py
+++ b/mesonbuild/interpreterbase.py
@@ -18,7 +18,7 @@
from . import mparser, mesonlib, mlog
from . import environment, dependencies
-import os, copy, re, types
+import os, copy, re
from functools import wraps
class ObjectHolder: