Merge pull request #157 from SDNNetSim/develop

Merge develop into release/6.0.0

Author: ryanmccann1024

.github/workflows/docs.yml

@@ -54,8 +54,21 @@ jobs:
 
       - name: Install Python dependencies
         run: |
-          python -m pip install --upgrade pip
+          python -m pip install --upgrade pip setuptools wheel
+
+          # Install torch first (required before PyG packages)
+          pip install torch==2.2.2
+
+          # Install PyG packages with pre-built wheels
+          pip install torch-scatter torch-sparse torch-cluster torch-spline-conv -f https://data.pyg.org/whl/torch-2.2.2+cpu.html
+
+          # Install the rest of the requirements
+          pip install -r requirements.txt
+
+          # Install the package with dev dependencies
           pip install -e .[dev]
+
+          # Install additional Sphinx packages
           pip install sphinx sphinx-rtd-theme sphinx-copybutton sphinx-tabs myst-parser
 
       - name: Build documentation

install.sh

@@ -42,11 +42,12 @@ echo "🖥️  Platform: $platform ($arch)"
 echo "📦 Upgrading pip..."
 python -m pip install --upgrade pip setuptools wheel
 
-# Install core dependencies first (this includes PyTorch)
-echo "🔧 Installing core dependencies..."
-pip install -e .
+# Install PyTorch first (required before PyG packages can be installed)
+echo "🔥 Installing PyTorch..."
+pip install torch==2.2.2
 
 # Install PyTorch Geometric dependencies with platform-specific handling
+# Must be done BEFORE pip install -e . to avoid build failures
 echo "🧠 Installing PyTorch Geometric dependencies..."
 
 if [[ "$platform" == "darwin" ]]; then
@@ -65,6 +66,10 @@ else
     pip install torch-scatter torch-sparse torch-cluster torch-spline-conv -f https://data.pyg.org/whl/torch-2.2.2+cpu.html
 fi
 
+# Install core dependencies
+echo "🔧 Installing core dependencies..."
+pip install -e .
+
 # Install PyTorch Geometric
 echo "📐 Installing PyTorch Geometric..."
 pip install torch-geometric==2.6.1