Revert to windows-wheel and moved GPU override

Author: fpetrini15

CMakeLists.txt

@@ -64,13 +64,6 @@ if(NOT TRITON_ENABLE_PYTHON_GRPC)
   set(TRITON_COMMON_ENABLE_PROTOBUF_PYTHON OFF)
 endif()
 
-# FIXME: Windows client currently does not support GPU tensors.
-# For simplicity, we will override this option here.
-if(WIN32 AND TRITON_ENABLE_GPU)
-  message("GPU shared memory is not currently supported by the Windows client. Forcing TRITON_ENABLE_GPU to false.")
-  set(TRITON_ENABLE_GPU OFF CACHE BOOL "GPU disabled" FORCE)
-endif()
-
 #
 # Dependencies
 #

src/python/CMakeLists.txt

@@ -45,6 +45,13 @@ if(NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE Release)
 endif()
 
+# FIXME: Windows client currently does not support GPU tensors.
+# For simplicity, we will override this option here.
+if(WIN32 AND TRITON_ENABLE_GPU)
+  message("GPU shared memory is not currently supported by the Windows python client. Forcing TRITON_ENABLE_GPU to false.")
+  set(TRITON_ENABLE_GPU OFF CACHE BOOL "GPU disabled" FORCE)
+endif()
+
 #
 # Dependencies
 #

src/python/library/build_wheel.py

@@ -230,10 +230,9 @@ def sed(pattern, replace, source, dest=None):
         else:
             platform_name = "manylinux1_x86_64"
         args = ["python3", "setup.py", "bdist_wheel", "--plat-name", platform_name]
-    # FIXME: Uncomment when Windows tests do not use WSL
-    # elif FLAGS.windows and platform.uname().machine == "AMD64":
-    #     platform_name = "win_amd64"
-    #     args = ["python3", "setup.py", "bdist_wheel", "--plat-name", platform_name]
+    elif FLAGS.windows and platform.uname().machine == "AMD64":
+        platform_name = "win_amd64"
+        args = ["python3", "setup.py", "bdist_wheel", "--plat-name", platform_name]
     else:
         args = ["python3", "setup.py", "bdist_wheel"]
 

src/python/library/setup.py

@@ -78,10 +78,7 @@ def req_file(filename, folder="requirements"):
 platform_package_data = []
 if "linux" in PLATFORM_FLAG:
     platform_package_data += ["libcshm.so"]
-# FIXME: Uncomment when Windows tests do not use WSL
-# elif PLATFORM_FLAG == "win_amd64":
-#     platform_package_data += ["cshm.dll"]
-else:
+elif PLATFORM_FLAG == "win_amd64":
     platform_package_data += ["cshm.dll"]
 
 data_files = [