PECOS-packages
diff --git a/‎.github/workflows/julia-release.yml‎
Lines changed: 6 additions & 6 deletions b/‎.github/workflows/julia-release.yml‎
Lines changed: 6 additions & 6 deletions
diff --git a/‎.github/workflows/julia-test.yml‎
Lines changed: 6 additions & 6 deletions b/‎.github/workflows/julia-test.yml‎
Lines changed: 6 additions & 6 deletions
diff --git a/‎.github/workflows/python-release.yml‎
Lines changed: 92 additions & 9 deletions b/‎.github/workflows/python-release.yml‎
Lines changed: 92 additions & 9 deletions
@@ -107,34 +107,34 @@ jobs:
         if: runner.os != 'Windows'
         run: |
           echo "Installing LLVM using pecos..."
-          cargo run -p pecos --features cli --release -- install llvm
+          cargo run -p pecos-cli --release -- install llvm
 
           echo "Setting LLVM environment variables..."
-          export PECOS_LLVM=$(cargo run -p pecos --features cli --release -- llvm find 2>/dev/null)
+          export PECOS_LLVM=$(cargo run -p pecos-cli --release -- llvm find 2>/dev/null)
           export LLVM_SYS_140_PREFIX="$PECOS_LLVM"
 
           echo "PECOS_LLVM=$PECOS_LLVM" >> $GITHUB_ENV
           echo "LLVM_SYS_140_PREFIX=$LLVM_SYS_140_PREFIX" >> $GITHUB_ENV
 
           echo "Verifying LLVM installation..."
-          cargo run -p pecos --features cli --release -- llvm check
+          cargo run -p pecos-cli --release -- llvm check
 
       - name: Install LLVM 14.0.6 using pecos-llvm (Windows)
         if: runner.os == 'Windows'
         shell: pwsh
         run: |
           Write-Host "Installing LLVM using pecos..."
-          cargo run -p pecos --features cli --release -- install llvm
+          cargo run -p pecos-cli --release -- install llvm
 
           Write-Host "Setting LLVM environment variables..."
-          $env:PECOS_LLVM = (cargo run -p pecos --features cli --release -- llvm find 2>$null)
+          $env:PECOS_LLVM = (cargo run -p pecos-cli --release -- llvm find 2>$null)
           $env:LLVM_SYS_140_PREFIX = $env:PECOS_LLVM
 
           "PECOS_LLVM=$env:PECOS_LLVM" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
           "LLVM_SYS_140_PREFIX=$env:LLVM_SYS_140_PREFIX" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
           Write-Host "Verifying LLVM installation..."
-          cargo run -p pecos --features cli --release -- llvm check
+          cargo run -p pecos-cli --release -- llvm check
 
       - name: Install Rust target
         run: |
 
@@ -58,34 +58,34 @@ jobs:
     #   if: runner.os != 'Windows'
     #   run: |
     #     echo "Installing LLVM using pecos..."
-    #     cargo run -p pecos --features cli --release -- install llvm
+    #     cargo run -p pecos-cli --release -- install llvm
     #
     #     echo "Setting LLVM environment variables..."
-    #     export PECOS_LLVM=$(cargo run -p pecos --features cli --release -- llvm find 2>/dev/null)
+    #     export PECOS_LLVM=$(cargo run -p pecos-cli --release -- llvm find 2>/dev/null)
     #     export LLVM_SYS_140_PREFIX="$PECOS_LLVM"
     #
     #     echo "PECOS_LLVM=$PECOS_LLVM" >> $GITHUB_ENV
     #     echo "LLVM_SYS_140_PREFIX=$LLVM_SYS_140_PREFIX" >> $GITHUB_ENV
     #
     #     echo "Verifying LLVM installation..."
-    #     cargo run -p pecos --features cli --release -- llvm check
+    #     cargo run -p pecos-cli --release -- llvm check
     #
     # - name: Install LLVM 14.0.6 using pecos (Windows)
     #   if: runner.os == 'Windows'
     #   shell: pwsh
     #   run: |
     #     Write-Host "Installing LLVM using pecos..."
-    #     cargo run -p pecos --features cli --release -- install llvm
+    #     cargo run -p pecos-cli --release -- install llvm
     #
     #     Write-Host "Setting LLVM environment variables..."
-    #     $env:PECOS_LLVM = (cargo run -p pecos --features cli --release -- llvm find 2>$null)
+    #     $env:PECOS_LLVM = (cargo run -p pecos-cli --release -- llvm find 2>$null)
     #     $env:LLVM_SYS_140_PREFIX = $env:PECOS_LLVM
     #
     #     "PECOS_LLVM=$env:PECOS_LLVM" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
     #     "LLVM_SYS_140_PREFIX=$env:LLVM_SYS_140_PREFIX" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
     #
     #     Write-Host "Verifying LLVM installation..."
-    #     cargo run -p pecos --features cli --release -- llvm check
+    #     cargo run -p pecos-cli --release -- llvm check
 
     - name: Cache Rust
       uses: Swatinem/rust-cache@v2
 
@@ -217,7 +217,7 @@ jobs:
             else
               echo "Skipping CUDA installation (GPU support not enabled for this build)"
             fi
-            cargo run --release -p pecos --features cli -- install llvm --force
+            cargo run --release -p pecos-cli -- install llvm --force
           CIBW_REPAIR_WHEEL_COMMAND_LINUX: >
             auditwheel repair -w {dest_dir} {wheel} &&
             pipx run abi3audit --strict --report {wheel}
@@ -230,7 +230,7 @@ jobs:
             curl -sSf https://sh.rustup.rs | sh -s -- -y
             source $HOME/.cargo/env
             rustup update
-            cargo run --release -p pecos --features cli -- install llvm --force
+            cargo run --release -p pecos-cli -- install llvm --force
             # Create a codesign wrapper that strips DYLD_LIBRARY_PATH to prevent
             # crashes on macOS 15 when bundled libc++ conflicts with system libc++
             mkdir -p $HOME/.pecos/bin
@@ -248,7 +248,7 @@ jobs:
             echo "=== Installing LLVM using pecos ===" &&
             rustup update &&
             echo "=== Running pecos install llvm ===" &&
-            cargo run --release -p pecos --features cli -- install llvm --force &&
+            cargo run --release -p pecos-cli -- install llvm --force &&
             echo "=== Checking LLVM installation ===" &&
             (test -d "C:\\Users\\runneradmin\\.pecos\\deps\\llvm" && echo "LLVM directory exists" && ls -la "C:\\Users\\runneradmin\\.pecos\\deps\\llvm" && (ls -la "C:\\Users\\runneradmin\\.pecos\\deps\\llvm\\bin" || echo "bin directory not found")) || (echo "ERROR: LLVM directory not found!" && exit 1) &&
             echo "=== Verifying LLVM_SYS_140_PREFIX ===" &&
@@ -264,12 +264,72 @@ jobs:
             delvewheel repair -v --add-path "C:\\Users\\runneradmin\\.pecos\\deps\\llvm\\bin" --no-dll "combase.dll;rmclient.dll" -w {dest_dir} {wheel} &&
             pipx run abi3audit --strict --report {wheel}
 
-      - name: Upload wheels
+      - name: Upload pecos-rslib wheels
         uses: actions/upload-artifact@v7
         with:
           name: wheel-pecos-rslib-${{ matrix.os }}-${{ matrix.architecture }}
           path: ./wheelhouse/*.whl
 
+      # Build pecos-rslib-llvm wheel (reuses LLVM already installed by pecos-rslib build)
+      - name: Build pecos-rslib-llvm wheels
+        uses: pypa/cibuildwheel@v3.3.1
+        with:
+          package-dir: python/pecos-rslib-llvm
+          output-dir: wheelhouse-llvm
+        env:
+          CIBW_BUILD: "cp310-*"
+          CIBW_SKIP: "*-win32 *-manylinux_i686 *-musllinux*"
+          CIBW_ARCHS_LINUX: ${{ matrix.cibw_archs }}
+          CIBW_MANYLINUX_X86_64_IMAGE: "manylinux_2_28"
+          CIBW_MANYLINUX_AARCH64_IMAGE: "manylinux_2_28"
+          CIBW_ENVIRONMENT_LINUX: >
+            PATH=$HOME/.cargo/bin:$HOME/.pecos/deps/llvm/bin:$PATH
+            LLVM_SYS_140_PREFIX=$HOME/.pecos/deps/llvm
+          CIBW_BEFORE_ALL_LINUX: |
+            curl -sSf https://sh.rustup.rs | sh -s -- -y
+            source $HOME/.cargo/env
+            dnf install libffi-devel -y
+            cargo run --release -p pecos-cli -- install llvm --force
+          CIBW_REPAIR_WHEEL_COMMAND_LINUX: >
+            auditwheel repair -w {dest_dir} {wheel} &&
+            pipx run abi3audit --strict --report {wheel}
+          CIBW_ENVIRONMENT_MACOS: >
+            PATH=$HOME/.cargo/bin:$HOME/.pecos/deps/llvm/bin:$PATH
+            LLVM_SYS_140_PREFIX=$HOME/.pecos/deps/llvm
+            MACOSX_DEPLOYMENT_TARGET=13.2
+          CIBW_BEFORE_ALL_MACOS: |
+            source $HOME/.cargo/env 2>/dev/null || { curl -sSf https://sh.rustup.rs | sh -s -- -y && source $HOME/.cargo/env; }
+            if [ ! -d "$HOME/.pecos/deps/llvm/bin" ]; then
+              rustup update
+              cargo run --release -p pecos-cli -- install llvm --force
+            else
+              echo "LLVM already installed from pecos-rslib build, skipping"
+            fi
+            mkdir -p $HOME/.pecos/bin
+            printf '#!/bin/bash\nunset DYLD_LIBRARY_PATH\nexec /usr/bin/codesign "$@"\n' > $HOME/.pecos/bin/codesign
+            chmod +x $HOME/.pecos/bin/codesign
+          CIBW_REPAIR_WHEEL_COMMAND_MACOS: >
+            PATH=$HOME/.pecos/bin:$PATH DYLD_LIBRARY_PATH=$HOME/.pecos/deps/llvm/lib delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel} &&
+            pipx run abi3audit --strict --report {wheel}
+          CIBW_ENVIRONMENT_WINDOWS: >
+            PATH="C:\\Users\\runneradmin\\.pecos\\deps\\llvm\\bin;$PATH"
+            LLVM_SYS_140_PREFIX="C:\\Users\\runneradmin\\.pecos\\deps\\llvm"
+          CIBW_BEFORE_ALL_WINDOWS: >
+            rustup update &&
+            if not exist "C:\Users\runneradmin\.pecos\deps\llvm\bin" (cargo run --release -p pecos-cli -- install llvm --force) else (echo LLVM already installed from pecos-rslib build)
+          CIBW_BEFORE_BUILD_WINDOWS: >
+            pip install delvewheel &&
+            python -c "import delvewheel._dll_list as d,inspect,re as r;p=inspect.getfile(d);c=open(p).read();n=chr(10);open(p,'w').write(c.replace(r\"re.compile('api-.*'),\",r\"re.compile('api-.*'),\"+n+r\"    re.compile('ext-.*'),\")) if 'ext-.*' not in c else None"
+          CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: >
+            delvewheel repair -v --add-path "C:\\Users\\runneradmin\\.pecos\\deps\\llvm\\bin" --no-dll "combase.dll;rmclient.dll" -w {dest_dir} {wheel} &&
+            pipx run abi3audit --strict --report {wheel}
+
+      - name: Upload pecos-rslib-llvm wheels
+        uses: actions/upload-artifact@v7
+        with:
+          name: wheel-pecos-rslib-llvm-${{ matrix.os }}-${{ matrix.architecture }}
+          path: ./wheelhouse-llvm/*.whl
+
   test_abi3_wheels:
     needs: build_wheelspecos_rslib
     if: |
@@ -371,8 +431,16 @@ jobs:
           name: wheel-pecos-rslib-ubuntu-latest-x86_64
           path: ./pecos-rslib-wheel
 
-      - name: Install pecos-rslib
-        run: pip install ./pecos-rslib-wheel/*.whl
+      - name: Download pecos-rslib-llvm wheel
+        uses: actions/download-artifact@v7
+        with:
+          name: wheel-pecos-rslib-llvm-ubuntu-latest-x86_64
+          path: ./pecos-rslib-llvm-wheel
+
+      - name: Install pecos-rslib and pecos-rslib-llvm
+        run: |
+          pip install ./pecos-rslib-wheel/*.whl
+          pip install ./pecos-rslib-llvm-wheel/*.whl
 
       - name: Install build dependencies
         run: pip install build
@@ -416,8 +484,16 @@ jobs:
           name: wheel-pecos-rslib-ubuntu-latest-x86_64
           path: ./pecos-rslib-wheel
 
-      - name: Install pecos-rslib
-        run: pip install ./pecos-rslib-wheel/*.whl
+      - name: Download pecos-rslib-llvm wheel
+        uses: actions/download-artifact@v7
+        with:
+          name: wheel-pecos-rslib-llvm-ubuntu-latest-x86_64
+          path: ./pecos-rslib-llvm-wheel
+
+      - name: Install pecos-rslib and pecos-rslib-llvm
+        run: |
+          pip install ./pecos-rslib-wheel/*.whl
+          pip install ./pecos-rslib-llvm-wheel/*.whl
 
       - name: Install build dependencies
         run: pip install build
@@ -464,7 +540,14 @@ jobs:
           echo "=== Downloaded artifacts structure ==="
           ls -la temp-artifacts/
 
-          # Move pecos-rslib wheels to distribution directory
+          # Move pecos-rslib and pecos-rslib-llvm wheels to distribution directory
+          mkdir -p dist/pecos-rslib-llvm
+          for artifact in temp-artifacts/wheel-pecos-rslib-llvm-*/; do
+            if [ -d "$artifact" ]; then
+              echo "Processing $artifact"
+              mv "$artifact"*.whl dist/pecos-rslib-llvm/ 2>/dev/null || true
+            fi
+          done
           for artifact in temp-artifacts/wheel-pecos-rslib-*/; do
             if [ -d "$artifact" ]; then
               echo "Processing $artifact"