From 69c7ef0fbdc6fa7bcf39bbc4b63519b11546ea73 Mon Sep 17 00:00:00 2001 From: Janne Hellsten Date: Mon, 11 Apr 2022 18:27:01 +0300 Subject: [PATCH] Update custom ops to work with fresh install of VS 2022 for #115 --- torch_utils/custom_ops.py | 8 ++++---- torch_utils/ops/bias_act.py | 2 +- torch_utils/ops/filtered_lrelu.py | 2 +- torch_utils/ops/upfirdn2d.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/torch_utils/custom_ops.py b/torch_utils/custom_ops.py index dd7cc04..439e445 100644 --- a/torch_utils/custom_ops.py +++ b/torch_utils/custom_ops.py @@ -28,10 +28,10 @@ verbosity = 'brief' # Verbosity level: 'none', 'brief', 'full' def _find_compiler_bindir(): patterns = [ - 'C:/Program Files (x86)/Microsoft Visual Studio/*/Professional/VC/Tools/MSVC/*/bin/Hostx64/x64', - 'C:/Program Files (x86)/Microsoft Visual Studio/*/BuildTools/VC/Tools/MSVC/*/bin/Hostx64/x64', - 'C:/Program Files (x86)/Microsoft Visual Studio/*/Community/VC/Tools/MSVC/*/bin/Hostx64/x64', - 'C:/Program Files (x86)/Microsoft Visual Studio */vc/bin', + 'C:/Program Files*/Microsoft Visual Studio/*/Professional/VC/Tools/MSVC/*/bin/Hostx64/x64', + 'C:/Program Files*/Microsoft Visual Studio/*/BuildTools/VC/Tools/MSVC/*/bin/Hostx64/x64', + 'C:/Program Files*/Microsoft Visual Studio/*/Community/VC/Tools/MSVC/*/bin/Hostx64/x64', + 'C:/Program Files*/Microsoft Visual Studio */vc/bin', ] for pattern in patterns: matches = sorted(glob.glob(pattern)) diff --git a/torch_utils/ops/bias_act.py b/torch_utils/ops/bias_act.py index 5c485c0..b2b53d7 100644 --- a/torch_utils/ops/bias_act.py +++ b/torch_utils/ops/bias_act.py @@ -43,7 +43,7 @@ def _init(): sources=['bias_act.cpp', 'bias_act.cu'], headers=['bias_act.h'], source_dir=os.path.dirname(__file__), - extra_cuda_cflags=['--use_fast_math'], + extra_cuda_cflags=['--use_fast_math', '--allow-unsupported-compiler'], ) return True diff --git a/torch_utils/ops/filtered_lrelu.py b/torch_utils/ops/filtered_lrelu.py index 6106c91..6701cd7 100644 --- a/torch_utils/ops/filtered_lrelu.py +++ b/torch_utils/ops/filtered_lrelu.py @@ -28,7 +28,7 @@ def _init(): sources=['filtered_lrelu.cpp', 'filtered_lrelu_wr.cu', 'filtered_lrelu_rd.cu', 'filtered_lrelu_ns.cu'], headers=['filtered_lrelu.h', 'filtered_lrelu.cu'], source_dir=os.path.dirname(__file__), - extra_cuda_cflags=['--use_fast_math'], + extra_cuda_cflags=['--use_fast_math', '--allow-unsupported-compiler'], ) return True diff --git a/torch_utils/ops/upfirdn2d.py b/torch_utils/ops/upfirdn2d.py index b544be1..394f746 100644 --- a/torch_utils/ops/upfirdn2d.py +++ b/torch_utils/ops/upfirdn2d.py @@ -28,7 +28,7 @@ def _init(): sources=['upfirdn2d.cpp', 'upfirdn2d.cu'], headers=['upfirdn2d.h'], source_dir=os.path.dirname(__file__), - extra_cuda_cflags=['--use_fast_math'], + extra_cuda_cflags=['--use_fast_math', '--allow-unsupported-compiler'], ) return True