提交 887c8aa7 authored 作者: Olivier Delalleau's avatar Olivier Delalleau

Small cosmetic coding style improvements

上级 8422aa01
...@@ -53,8 +53,9 @@ def is_nvcc_available(): ...@@ -53,8 +53,9 @@ def is_nvcc_available():
else: return False else: return False
is_nvcc_available()#to set nvcc_path correctly and get the version is_nvcc_available()#to set nvcc_path correctly and get the version
def nvcc_module_compile_str(module_name, src_code, location=None, include_dirs=[], lib_dirs=[], libs=[], def nvcc_module_compile_str(
preargs=[]): module_name, src_code,
location=None, include_dirs=[], lib_dirs=[], libs=[], preargs=[]):
""" """
:param module_name: string (this has been embedded in the src_code :param module_name: string (this has been embedded in the src_code
:param src_code: a complete c or c++ source listing for the module :param src_code: a complete c or c++ source listing for the module
...@@ -71,8 +72,8 @@ def nvcc_module_compile_str(module_name, src_code, location=None, include_dirs=[ ...@@ -71,8 +72,8 @@ def nvcc_module_compile_str(module_name, src_code, location=None, include_dirs=[
""" """
if sys.platform=="win32": if sys.platform=="win32":
#remove some compilation args that cl.exe don't understand # Remove some compilation args that cl.exe does not understand.
#cl.exe is the compiler used by nvcc on Windows # cl.exe is the compiler used by nvcc on Windows.
for a in ["-Wno-write-strings","-Wno-unused-label", for a in ["-Wno-write-strings","-Wno-unused-label",
"-Wno-unused-variable", "-fno-math-errno"]: "-Wno-unused-variable", "-fno-math-errno"]:
if a in preargs: if a in preargs:
...@@ -185,8 +186,8 @@ def nvcc_module_compile_str(module_name, src_code, location=None, include_dirs=[ ...@@ -185,8 +186,8 @@ def nvcc_module_compile_str(module_name, src_code, location=None, include_dirs=[
orig_dir = os.getcwd() orig_dir = os.getcwd()
try: try:
os.chdir(location) os.chdir(location)
p = subprocess.Popen(
p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
nvcc_stdout, nvcc_stderr = p.communicate()[:2] nvcc_stdout, nvcc_stderr = p.communicate()[:2]
finally: finally:
os.chdir(orig_dir) os.chdir(orig_dir)
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论