Rework compiler flags (should be correct for Windows now)

Author: turboderp

exllamav3/ext.py

@@ -80,19 +80,23 @@ def find_msvc():
             else:
                 print(" !! Unable to find cl.exe; compilation will probably fail", file = sys.stderr)
 
-    # gcc / cl.exe flags
+    # compiler flags
+
+    extra_cflags = []
+    extra_cuda_cflags = ["-lineinfo", "-O3"]
 
     if windows:
-        extra_cflags = ["/Ox"]
+        extra_cflags += ["/Ox", "/arch:AVX2"]
+        extra_cuda_cflags += ["-Xcompiler", "/O2", "-Xcompiler", "/arch:AVX2"]
+        if ext_debug:
+            extra_cflags += ["/Zi"]
+            extra_cuda_cflags += ["-Xcompiler", "/Zi"]
     else:
-        extra_cflags = ["-Ofast"]
-
-    if ext_debug:
-        extra_cflags += ["-ftime-report", "-DTORCH_USE_CUDA_DSA"]
-
-    # nvcc flags
-
-    extra_cuda_cflags = ["-lineinfo", "-O3", "-Xcompiler \"-O3 -mavx2\""]
+        extra_cflags += ["-Ofast", "-mavx2"]
+        extra_cuda_cflags += ["-Xcompiler=-O3", "-Xcompiler=-mavx2"]
+        if ext_debug:
+            extra_cflags += ["-ftime-report", "-DTORCH_USE_CUDA_DSA"]
+            extra_cuda_cflags += ["-Xcompiler=-g"]
 
     if torch.version.hip:
         extra_cuda_cflags += ["-DHIPBLAS_USE_HIP_HALF"]

setup.py

@@ -17,12 +17,21 @@
 
 windows = os.name == "nt"
 
-extra_cflags = ["/Ox"] if windows else ["-O3"]
+extra_cflags = []
+extra_cuda_cflags = ["-lineinfo", "-O3"]
 
-if ext_debug:
-    extra_cflags += ["-ftime-report", "-DTORCH_USE_CUDA_DSA"]
-
-extra_cuda_cflags = ["-lineinfo", "-O3", "-Xcompiler \"-O3 -mavx2\""]
+if windows:
+    extra_cflags += ["/Ox", "/arch:AVX2"]
+    extra_cuda_cflags += ["-Xcompiler", "/O2", "-Xcompiler", "/arch:AVX2"]
+    if ext_debug:
+        extra_cflags += ["/Zi"]
+        extra_cuda_cflags += ["-Xcompiler", "/Zi"]
+else:
+    extra_cflags += ["-Ofast", "-mavx2"]
+    extra_cuda_cflags += ["-Xcompiler=-O3", "-Xcompiler=-mavx2"]
+    if ext_debug:
+        extra_cflags += ["-ftime-report", "-DTORCH_USE_CUDA_DSA"]
+        extra_cuda_cflags += ["-Xcompiler=-g"]
 
 if torch and torch_version.hip:
     extra_cuda_cflags += ["-DHIPBLAS_USE_HIP_HALF"]