fix-win

Author: vmoens

.github/workflows/nightly_build.yml

@@ -112,14 +112,8 @@ jobs:
           python3 -mpip install --upgrade pip
       - name: Install tensordict
         run: |
-          if [[ "$OSTYPE" == "darwin"* ]]; then
-            brew install cmake
-          else
-            sudo apt-get update
-            sudo apt-get install -y cmake
-          fi
-          python3 -mpip install "pybind11[global]"
-          python3 -mpip install git+https://github.com/pytorch/tensordict.git
+          export PATH="/opt/python/${{ matrix.python_version[1] }}/bin:$PATH"
+          python3 -mpip install tensordict-nightly
       - name: Install test dependencies
         run: |
           export PATH="/opt/python/${{ matrix.python_version[1] }}/bin:$PATH"
@@ -278,15 +272,7 @@ jobs:
       - name: Install tensordict
         shell: bash
         run: |
-          if ! choco -v &> /dev/null; then
-            powershell -NoProfile -InputFormat None -ExecutionPolicy Bypass -Command "iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))"
-          fi
-          # Install cmake using Chocolatey
-          choco install cmake -y
-          # Install necessary Python packages
-          python -m pip install --upgrade pip
-          python -m pip install "pybind11[global]"
-          python3 -mpip install git+https://github.com/pytorch/tensordict.git
+          python3 -mpip install tensordict-nightly
       - name: Download built wheels
         uses: actions/download-artifact@v4
         with:

build_nightly.sh

@@ -40,6 +40,16 @@ echo "$(date +%Y.%m.%d)" > version.txt
 
 # Build the package
 echo "Building nightly package..."
-python -m build
+echo "DEBUG: Current working directory: $(pwd)"
+echo "DEBUG: Contents of current directory: $(ls -la)"
+echo "DEBUG: Contents of torchrl/csrc: $(ls -la torchrl/csrc 2>/dev/null || echo 'Directory not found')"
+echo "DEBUG: Python version: $(python --version)"
+echo "DEBUG: Platform: $(python -c 'import sys; print(sys.platform)')"
+
+# Install build dependencies
+echo "Installing build dependencies..."
+python -m pip install wheel setuptools==65.3.0
+
+python setup.py bdist_wheel
 
 echo "Nightly build completed successfully!" 

pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools", "wheel", "torch", "ninja"]
+requires = ["setuptools", "wheel", "torch", "ninja", "numpy", "pybind11[global]", "cmake"]
 build-backend = "setuptools.build_meta"
 
 [project]

setup.py

@@ -10,32 +10,69 @@ def get_extensions():
     extension = CppExtension
 
     extra_link_args = []
-    extra_compile_args = {
-        "cxx": [
-            "-O3",
-            "-std=c++17",
-            "-fdiagnostics-color=always",
-        ]
-    }
-    debug_mode = os.getenv("DEBUG", "0") == "1"
-    if debug_mode:
-        logging.info("Compiling in debug mode")
+    
+    # Debug output
+    print(f"DEBUG: Platform detected: {sys.platform}")
+    print(f"DEBUG: Platform == 'win32': {sys.platform == 'win32'}")
+    
+    # Platform-specific compiler flags
+    if sys.platform == "win32":
+        print("DEBUG: Using MSVC flags for Windows")
+        # MSVC flags for Windows
+        extra_compile_args = {
+            "cxx": [
+                "/O2",  # Optimization level 2 (equivalent to -O3)
+                "/std:c++17",  # C++17 standard
+                "/EHsc",  # Exception handling model
+            ]
+        }
+        debug_mode = os.getenv("DEBUG", "0") == "1"
+        if debug_mode:
+            logging.info("Compiling in debug mode")
+            extra_compile_args = {
+                "cxx": [
+                    "/Od",  # No optimization (equivalent to -O0)
+                    "/Zi",  # Generate debug info
+                    "/std:c++17",  # C++17 standard
+                    "/EHsc",  # Exception handling model
+                ]
+            }
+            extra_link_args = ["/DEBUG"]
+    else:
+        print("DEBUG: Using GCC/Clang flags for Unix-like systems")
+        # GCC/Clang flags for Unix-like systems
         extra_compile_args = {
             "cxx": [
-                "-O0",
-                "-fno-inline",
-                "-g",
+                "-O3",
                 "-std=c++17",
                 "-fdiagnostics-color=always",
             ]
         }
-        extra_link_args = ["-O0", "-g"]
+        debug_mode = os.getenv("DEBUG", "0") == "1"
+        if debug_mode:
+            logging.info("Compiling in debug mode")
+            extra_compile_args = {
+                "cxx": [
+                    "-O0",
+                    "-fno-inline",
+                    "-g",
+                    "-std=c++17",
+                    "-fdiagnostics-color=always",
+                ]
+            }
+            extra_link_args = ["-O0", "-g"]
+
+    print(f"DEBUG: Extra compile args: {extra_compile_args}")
+    print(f"DEBUG: Extra link args: {extra_link_args}")
 
     extensions_dir = "torchrl/csrc"
 
     # Get just the filenames, not full paths
     cpp_files = glob.glob(os.path.join(extensions_dir, "*.cpp"))
     sources = [os.path.relpath(f) for f in cpp_files]
+    print(f"DEBUG: C++ source files: {sources}")
+    print(f"DEBUG: Extensions directory exists: {os.path.exists(extensions_dir)}")
+    print(f"DEBUG: Contents of {extensions_dir}: {os.listdir(extensions_dir) if os.path.exists(extensions_dir) else 'Directory not found'}")
 
     include_dirs = ["."]
     python_include_dir = os.getenv("PYTHON_INCLUDE_DIR")
@@ -51,14 +88,23 @@ def get_extensions():
         )
     ]
 
+    print(f"DEBUG: Extension modules: {ext_modules}")
     return ext_modules
 
 def main():
+    print("DEBUG: Starting setup.py main function")
     setup_kwargs = {
         "ext_modules": get_extensions(),
         "cmdclass": {"build_ext": BuildExtension.with_options()},
+        "packages": ["torchrl"],
+        "package_data": {
+            "torchrl": ["version.py"],
+        },
+        "include_package_data": True,
+        "zip_safe": False,
     }
 
+    print(f"DEBUG: Setup kwargs: {setup_kwargs}")
     setup(**setup_kwargs)
 
 if __name__ == "__main__":