Fix Python 3.12 build issues

montanalow · montanalow · commit 8ced585aa65b · 2025-04-15T11:30:19.000-07:00
- Add wheel package dependencies for Python 3.12 virtualenv creation
- Install PyTorch before other packages to satisfy auto_gptq dependencies
- Add special handling for Python 3.12 in build script
diff --git a/.github/workflows/ubuntu-packages-and-docker-image.yml b/.github/workflows/ubuntu-packages-and-docker-image.yml
@@ -26,20 +26,24 @@ jobs:
         UBUNTU_VERSION: ${{ matrix.ubuntu_version }}
       run: |
         sudo apt update
-        sudo apt install -y python3-dev python3-pip python3-virtualenv
+        sudo apt install -y python3-dev python3-pip python3-virtualenv software-properties-common python3-wheel-whl python3-pip-whl python3-setuptools-whl
+        
+        # Add deadsnakes PPA for all Python versions
+        sudo add-apt-repository -y ppa:deadsnakes/ppa
+        sudo apt update
         
         # Install specific Python versions based on Ubuntu target
         if [[ "$UBUNTU_VERSION" == "20.04" ]]; then
           sudo apt install -y python3.8 python3.8-dev python3.8-venv
         elif [[ "$UBUNTU_VERSION" == "22.04" ]]; then
           sudo apt install -y python3.10 python3.10-dev python3.10-venv
         elif [[ "$UBUNTU_VERSION" == "24.04" ]]; then
-          # Add deadsnakes PPA for Python 3.12 on Ubuntu 22.04
-          sudo add-apt-repository -y ppa:deadsnakes/ppa
-          sudo apt update
           sudo apt install -y python3.12 python3.12-dev python3.12-venv
         fi
         
+        # Install PyTorch before running the build script to satisfy auto_gptq's requirements
+        pip install torch --user
+        
         bash packages/postgresml-python/release.sh ${{ inputs.packageVersion }} ${{ matrix.ubuntu_version }}
 
   #
diff --git a/packages/postgresml-python/build.sh b/packages/postgresml-python/build.sh
@@ -49,6 +49,11 @@ fi
 virtualenv --python="python${PYTHON_VERSION}" "$deb_dir/var/lib/postgresml-python/pgml-venv"
 source "$deb_dir/var/lib/postgresml-python/pgml-venv/bin/activate"
 
+# For Python 3.12, ensure PyTorch is installed first
+if [[ "${PYTHON_VERSION}" == "3.12" ]]; then
+  python -m pip install torch
+fi
+
 python -m pip install -r "${deb_dir}/etc/postgresml-python/requirements.txt"
 
 deactivate
