updated setup.py tests.yml

Author: SubaashNair

.flake8

@@ -1,3 +1,8 @@
+; [flake8]
+; exclude = site-packages, __pycache__, .git, .venv, .eggs, *.egg-info
+; max-line-length = 88
 [flake8]
-exclude = site-packages, __pycache__, .git, .venv, .eggs, *.egg-info
-max-line-length = 88
+max-line-length = 100
+exclude = .git,__pycache__,build,dist,*.egg-info
+ignore = E203,W503
+per-file-ignores = __init__.py:F401

.github/workflows/tests.yml

@@ -16,71 +16,73 @@ jobs:
       fail-fast: false
 
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-
+    - uses: actions/checkout@v4
+    
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 
-    - name: Install build tools (Windows)
+    - name: Install build dependencies (Windows)
       if: runner.os == 'Windows'
       run: |
-        choco install visualstudio2019buildtools --include-optional
-        choco install windows-sdk-10.0 --include-optional
+        choco install visualstudio2019buildtools --package-parameters "--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64"
+        choco install windows-sdk-10.0
 
-    - name: Set environment variables (Windows)
+    - name: Set up MSVC (Windows)
+      if: runner.os == 'Windows'
+      uses: microsoft/[email protected]
+      
+    - name: Build Windows Extension
       if: runner.os == 'Windows'
       run: |
-        setx PATH "%PATH%;C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin"
-
-    - name: Debug environment
-      run: |
-        echo "OS: ${{ matrix.os }}"
-        echo "Python Version: ${{ matrix.python-version }}"
-        python -m sysconfig
-        echo "Python include: $(python -c 'import sysconfig; print(sysconfig.get_path("include"))')"
-        echo "Python libdir: $(python -c 'import sysconfig; print(sysconfig.get_config_var("LIBDIR"))')"
-        python --version
-        pip list
+        python setup.py build_ext --inplace
+        mkdir -p optimrl/c_src
+        Copy-Item build\lib.win-amd64*\optimrl\c_src\libgrpo.dll optimrl\c_src\
 
-    - name: Install dependencies
+    - name: Install package
       run: |
-        python -m pip install --upgrade pip
+        python -m pip install --upgrade pip setuptools wheel
         pip install -e '.[test]'
 
-    - name: Run tests with pytest
-      run: |
-        pytest tests/ -v
+    - name: Run tests
+      run: pytest tests/ -v
 
   lint:
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
+    - uses: actions/checkout@v4
 
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
         python-version: '3.12'
 
-    - name: Install linting dependencies
+    - name: Install linting tools
       run: |
         python -m pip install --upgrade pip
-        pip install black isort flake8
+        pip install black==23.12.1 isort==5.13.2 flake8==7.0.0
 
-    - name: Auto-correct formatting issues
+    - name: Create linting configs
+      run: |
+        echo "[flake8]
+        max-line-length = 100
+        exclude = .git,__pycache__,build,dist,*.egg-info
+        ignore = E203,W503
+        per-file-ignores = __init__.py:F401" > .flake8
+        
+        echo "[tool.isort]
+        profile = \"black\"
+        line_length = 100
+        skip = [\"site-packages\", \"__pycache__\"]" >> pyproject.toml
+
+    - name: Format code
       run: |
         black optimrl tests
         isort optimrl tests
 
-    - name: Check code formatting
+    - name: Check code style
       run: |
         black --check optimrl tests
         isort --check-only optimrl tests
-        flake8 optimrl tests
-
-    - name: Upgrade setuptools
-      run: python -m pip install --upgrade setuptools wheel
-
+        flake8 optimrl tests

optimrl/core.py

@@ -37,39 +37,58 @@ def __init__(self, epsilon=0.2, beta=0.1):
         # Set up C function interfaces
         self._setup_functions()
 
+    # def _find_library_path(self):
+    #     """Find the path to the compiled library file."""
+    #     # Get the directory of the current file
+    #     current_dir = os.path.dirname(os.path.abspath(__file__))
+
+    #     # Determine library name based on platform
+    #     if platform.system() == "Darwin":
+    #         lib_name = "libgrpo.dylib"
+    #     elif platform.system() == "Linux":
+    #         lib_name = "libgrpo.so"
+    #     elif platform.system() == "Windows":
+    #         lib_name = "libgrpo.dll"
+    #     else:
+    #         raise OSError(f"Unsupported operating system: {platform.system()}")
+
+    #     # Possible locations for the library
+    #     possible_paths = [
+    #         os.path.join(current_dir, "c_src", lib_name),
+    #         os.path.join(current_dir, lib_name),
+    #         os.path.join(os.path.dirname(current_dir), "c_src", lib_name),
+    #         os.path.join(sys.prefix, "lib", lib_name),
+    #     ]
+
+    #     # Find the first existing library file
+    #     for path in possible_paths:
+    #         if os.path.exists(path):
+    #             return path
+
+    #     paths_str = "\n".join(possible_paths)
+    #     raise FileNotFoundError(
+    #         f"Could not find {lib_name}. Searched in:\n{paths_str}\n"
+    #         "Try reinstalling the package or building the C extension."
+    #     )
     def _find_library_path(self):
-        """Find the path to the compiled library file."""
-        # Get the directory of the current file
         current_dir = os.path.dirname(os.path.abspath(__file__))
-
-        # Determine library name based on platform
-        if platform.system() == "Darwin":
-            lib_name = "libgrpo.dylib"
-        elif platform.system() == "Linux":
-            lib_name = "libgrpo.so"
-        elif platform.system() == "Windows":
-            lib_name = "libgrpo.dll"
-        else:
-            raise OSError(f"Unsupported operating system: {platform.system()}")
-
-        # Possible locations for the library
-        possible_paths = [
-            os.path.join(current_dir, "c_src", lib_name),
-            os.path.join(current_dir, lib_name),
-            os.path.join(os.path.dirname(current_dir), "c_src", lib_name),
-            os.path.join(sys.prefix, "lib", lib_name),
+        lib_name = {
+            'Windows': 'libgrpo.dll',
+            'Darwin': 'libgrpo.dylib',
+            'Linux': 'libgrpo.so'
+        }[platform.system()]
+        
+        search_paths = [
+            os.path.join(current_dir, "c_src"),
+            current_dir,
+            os.path.join(os.path.dirname(current_dir), "c_src"),
+            os.path.join(sys.prefix, "lib")
         ]
-
-        # Find the first existing library file
-        for path in possible_paths:
-            if os.path.exists(path):
-                return path
-
-        paths_str = "\n".join(possible_paths)
-        raise FileNotFoundError(
-            f"Could not find {lib_name}. Searched in:\n{paths_str}\n"
-            "Try reinstalling the package or building the C extension."
-        )
+        
+        for path in search_paths:
+            full_path = os.path.normpath(os.path.join(path, lib_name))
+            if os.path.exists(full_path):
+                return full_path
 
     def _load_library(self):
         """Load the compiled C library."""

pyproject.toml

@@ -18,3 +18,8 @@ skip = [
     "site-packages",
     "__pycache__",
 ]
+
+
+[tool.mypy]
+ignore_missing_imports = true
+strict_optional = true

setup.py

@@ -22,7 +22,7 @@ def build_extensions(self):
             print(f"Include dirs: {ext.include_dirs}")
             print(f"Library dirs: {ext.library_dirs}")
         super().build_extensions()
-        
+
         compiler_type = self.compiler.compiler_type
         for ext in self.extensions:
             if compiler_type == 'unix':
@@ -89,17 +89,24 @@ def finalize_options(self):
 
 # Define the extension module
 
+# grpo_module = Extension(
+#     'optimrl.c_src.libgrpo',
+#     sources=['optimrl/c_src/grpo.c'],
+#     include_dirs=[
+#         'optimrl/c_src',
+#         python_include_path
+#     ],
+#     library_dirs=[
+#         python_lib_path  # Include the Python library path dynamically
+#     ],
+#     libraries=['m'] if platform.system() != 'Windows' else [],
+#     extra_compile_args=['-O3', '-fPIC'] if platform.system() != 'Windows' else ['/O2'],
+#     extra_link_args=['-L' + python_lib_path] if platform.system() != 'Windows' else ['/EXPORT:PyInit_libgrpo']
+# )
 grpo_module = Extension(
     'optimrl.c_src.libgrpo',
     sources=['optimrl/c_src/grpo.c'],
-    include_dirs=[
-        'optimrl/c_src',
-        python_include_path
-    ],
-    library_dirs=[
-        python_lib_path  # Include the Python library path dynamically
-    ],
-    libraries=['m'] if platform.system() != 'Windows' else [],
+    include_dirs=[...],
     extra_compile_args=['-O3', '-fPIC'] if platform.system() != 'Windows' else ['/O2'],
     extra_link_args=['-L' + python_lib_path] if platform.system() != 'Windows' else ['/EXPORT:PyInit_libgrpo']
 )