postgresml · montanalow · Jan 16, 2025 · Jan 11, 2025 · Jan 11, 2025 · Jan 11, 2025
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,8 +10,6 @@ jobs:
        working-directory: pgml-extension
    steps:
      - uses: actions/checkout@v4
-        with:
-          submodules: 'recursive'
      - name: Fetch master
        run: |
          git fetch origin master --depth 1
@@ -45,7 +43,7 @@ jobs:
            ~/.cargo
            pgml-extension/target
            ~/.pgrx
-          key: ${{ runner.os }}-rust-1.74-${{ hashFiles('pgml-extension/Cargo.lock') }}-bust2
+          key: ${{ runner.os }}-rust-1.74-${{ hashFiles('pgml-extension/Cargo.lock') }}-bust3
      - name: Install pgrx
        if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0'
        run: |
@@ -55,17 +53,8 @@ jobs:

          if [[ ! -d ~/.pgrx ]]; then
            cargo pgrx init
-            echo "shared_preload_libraries = 'pgml'" >> ~/.pgrx/data-16/postgresql.conf
+            echo "shared_preload_libraries = 'pgml'" >> ~/.pgrx/data-17/postgresql.conf
          fi
-      - name: Update extension test
-        if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0'
-        run: |
-          git checkout origin/master
-          echo "\q" | cargo pgrx run
-          psql -p 28816 -h localhost -d pgml -P pager -c "DROP EXTENSION IF EXISTS pgml CASCADE; DROP SCHEMA IF EXISTS pgml CASCADE; CREATE EXTENSION pgml;"
-          git checkout $GITHUB_SHA
-          echo "\q" | cargo pgrx run
-          psql -p 28816 -h localhost -d pgml -P pager -c "ALTER EXTENSION pgml UPDATE;"
      - name: Unit tests
        if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0'
        run: |
@@ -74,4 +63,4 @@ jobs:
        if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0'
        run: |
          echo "\q" | cargo pgrx run
-          psql -p 28816 -h 127.0.0.1 -d pgml -P pager -f tests/test.sql
+          psql -p 28817 -h 127.0.0.1 -d pgml -P pager -f tests/test.sql
diff --git a/.github/workflows/ubuntu-packages-and-docker-image.yml b/.github/workflows/ubuntu-packages-and-docker-image.yml
@@ -4,7 +4,7 @@ on:
  workflow_dispatch:
    inputs:
      packageVersion:
-        default: "2.9.3"
+        default: "2.10.0"
 jobs:
  #
  # PostgresML extension.

diff --git a/.gitmodules b/.gitmodules
diff --git a/README.md b/README.md
@@ -82,7 +82,7 @@ docker run \
    -v postgresml_data:/var/lib/postgresql \
    -p 5433:5432 \
    -p 8000:8000 \
-    ghcr.io/postgresml/postgresml:2.7.12 \
+    ghcr.io/postgresml/postgresml:2.10.0 \
    sudo -u postgresml psql -d postgresml
 ```


diff --git a/packages/postgresml-dashboard/build.sh b/packages/postgresml-dashboard/build.sh
@@ -5,7 +5,7 @@ dir="/tmp/postgresml-dashboard"
 deb_dir="$dir/deb-build"
 source_dir="$dir/source"
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-export PACKAGE_VERSION=${1:-"2.7.12"}
+export PACKAGE_VERSION=${1:-"2.10.0"}
 export GITHUB_STARS=$(curl -s "https://api.github.com/repos/postgresml/postgresml" | grep stargazers_count | cut -d : -f 2 | tr -d " " | tr -d ",")
 if [[ $(arch) == "x86_64" ]]; then
  export ARCH=amd64

diff --git a/packages/postgresml-dashboard/release.sh b/packages/postgresml-dashboard/release.sh
@@ -5,7 +5,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 package_version="$1"

 if [[ -z "$package_version" ]]; then
-  echo "Usage: $0 <package version, e.g. 2.7.12>"
+  echo "Usage: $0 <package version, e.g. 2.10.0>"
  exit 1
 fi


diff --git a/packages/postgresml-python/build.sh b/packages/postgresml-python/build.sh
@@ -7,7 +7,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 deb_dir="/tmp/postgresml-python/deb-build"
 major=${1:-"14"}

-export PACKAGE_VERSION=${1:-"2.7.12"}
+export PACKAGE_VERSION=${1:-"2.10.0"}
 export PYTHON_VERSION=${2:-"3.10"}

 if [[ $(arch) == "x86_64" ]]; then

diff --git a/packages/postgresml-python/release.sh b/packages/postgresml-python/release.sh
@@ -12,7 +12,7 @@ fi

 if [[ -z "$package_version" ]]; then
 	echo "postgresml-python package build and release script"
-	echo "usage: $0 <package version, e.g. 2.7.12>"
+	echo "usage: $0 <package version, e.g. 2.10.0>"
 	exit 1
 fi


diff --git a/packages/postgresml/build.sh b/packages/postgresml/build.sh
@@ -3,8 +3,9 @@ set -e

 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )

-export PACKAGE_VERSION=${1:-"2.7.12"}
+export PACKAGE_VERSION=${1:-"2.10.0"}
 export PGVERSION=${2:-"14"}
+export UBUNTU_VERSION=${3:-"24.04"}

 deb_dir="/tmp/postgresml/deb-build"

@@ -26,5 +27,4 @@ dpkg-deb \
  --root-owner-group \
  -z1 \
  --build "$deb_dir" \
-  postgresml-${PGVERSION}-${PACKAGE_VERSION}-ubuntu22.04-all.deb
-
+  postgresml-${PGVERSION}-${PACKAGE_VERSION}-ubuntu${UBUNTU_VERSION}-all.deb
diff --git a/packages/postgresml/release.sh b/packages/postgresml/release.sh
@@ -5,34 +5,52 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 package_version="$1"

 if [[ -z "$package_version" ]]; then
-	echo "postgresml package build and release script"
-	echo "usage: $0 <package version, e.g. 2.7.12>"
-	exit 1
+  echo "postgresml package build and release script"
+  echo "usage: $0 <package version, e.g. 2.10.0>"
+  exit 1
 fi

 if ! which deb-s3; then
-	curl -sLO https://github.com/deb-s3/deb-s3/releases/download/0.11.4/deb-s3-0.11.4.gem
-	sudo gem install deb-s3-0.11.4.gem
-	deb-s3
+  curl -sLO https://github.com/deb-s3/deb-s3/releases/download/0.11.4/deb-s3-0.11.4.gem
+  sudo gem install deb-s3-0.11.4.gem
+  deb-s3
 fi

 function package_name() {
-	echo "postgresml-$1-$package_version-ubuntu22.04-all.deb"
+  local pg_version=$1
+  local ubuntu_version=$2
+  echo "postgresml-${pg_version}-${package_version}-ubuntu${ubuntu_version}-all.deb"
 }

-for pg in {12..16}; do
-  bash ${SCRIPT_DIR}/build.sh ${package_version} ${pg}
-
-  if [[ ! -f $(package_name ${pg}) ]]; then
-  	echo "File $(package_name ${pg}) doesn't exist"
-  	exit 1
-  fi
-
-  deb-s3 upload \
-    --lock \
-    --bucket apt.postgresml.org \
-    $(package_name ${pg}) \
-    --codename $(lsb_release -cs)
-
-  rm $(package_name ${pg}) 
+# Active LTS Ubuntu versions
+ubuntu_versions=("20.04" "22.04" "24.04")
+
+# Map Ubuntu versions to codenames
+declare -A ubuntu_codenames=(
+  ["20.04"]="focal"
+  ["22.04"]="jammy"
+  ["24.04"]="noble"
+)
+
+for ubuntu_version in "${ubuntu_versions[@]}"; do
+  codename=${ubuntu_codenames[$ubuntu_version]}
+  echo "Building packages for Ubuntu ${ubuntu_version} (${codename})"
+
+  for pg in {11..17}; do
+    echo "Building PostgreSQL ${pg} package..."
+    bash ${SCRIPT_DIR}/build.sh ${package_version} ${pg} ${ubuntu_version}
+
+    if [[ ! -f $(package_name ${pg} ${ubuntu_version}) ]]; then
+      echo "File $(package_name ${pg} ${ubuntu_version}) doesn't exist"
+      exit 1
+    fi
+
+    deb-s3 upload \
+      --lock \
+      --bucket apt.postgresml.org \
+      $(package_name ${pg} ${ubuntu_version}) \
+      --codename ${codename}
+
+    rm $(package_name ${pg} ${ubuntu_version})
+  done
 done
diff --git a/packages/postgresql-pgml/release.sh b/packages/postgresql-pgml/release.sh
@@ -4,7 +4,7 @@ set -e
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )

 if [[ -z "${1}" ]]; then
-  echo "Usage: $0 <package version, e.g. 2.7.12>"
+  echo "Usage: $0 <package version, e.g. 2.10.0>"
  exit 1
 fi


diff --git a/pgml-cms/docs/open-source/pgml/api/pgml.tune.md b/pgml-cms/docs/open-source/pgml/api/pgml.tune.md
@@ -159,7 +159,7 @@ Without tuning, DistilBERT classifies every single movie review as `positive`, a

 Once our model has been fine tuned on the dataset, it'll be saved and deployed with a Project visible in the Dashboard, just like models built from simpler algorithms.

-[![Fine Tuning](https://github.com/postgresml/postgresml/raw/v2.7.12/dashboard/static/images/dashboard/tuning.png)](https://github.com/postgresml/postgresml/blob/v2.7.12/dashboard/static/images/dashboard/tuning.png)
+[![Fine Tuning](https://github.com/postgresml/postgresml/raw/v2.10.0/dashboard/static/images/dashboard/tuning.png)](https://github.com/postgresml/postgresml/blob/v2.10.0/dashboard/static/images/dashboard/tuning.png)

 #### Prepare the data


diff --git a/pgml-cms/docs/open-source/pgml/developers/contributing.md b/pgml-cms/docs/open-source/pgml/developers/contributing.md
@@ -127,7 +127,7 @@ SELECT pgml.version();
 postgres=# select pgml.version();
      version
 -------------------
- 2.9.3
+ 2.10.0
 (1 row)
 ```
 {% endtab %}

diff --git a/pgml-cms/docs/open-source/pgml/developers/installation.md b/pgml-cms/docs/open-source/pgml/developers/installation.md
@@ -132,7 +132,7 @@ CREATE EXTENSION
 pgml_test=# SELECT pgml.version();
 version 
 ---------
- 2.9.3
+ 2.10.0
 (1 row)
 ```


diff --git a/pgml-cms/docs/open-source/pgml/developers/quick-start-with-docker.md b/pgml-cms/docs/open-source/pgml/developers/quick-start-with-docker.md
@@ -18,7 +18,7 @@ docker run \
    -v postgresml_data:/var/lib/postgresql \
    -p 5433:5432 \
    -p 8000:8000 \
-    ghcr.io/postgresml/postgresml:2.9.3 \
+    ghcr.io/postgresml/postgresml:2.10.0 \
    sudo -u postgresml psql -d postgresml
 ```
 {% endtab %}
@@ -43,7 +43,7 @@ docker run \
    --gpus all \
    -p 5433:5432 \
    -p 8000:8000 \
-    ghcr.io/postgresml/postgresml:2.9.3 \
+    ghcr.io/postgresml/postgresml:2.10.0 \
    sudo -u postgresml psql -d postgresml
 ```

@@ -80,7 +80,7 @@ Time: 41.520 ms
 postgresml=# SELECT pgml.version();
 version 
 ---------
- 2.9.3
+ 2.10.0
 (1 row)
 ```


diff --git a/pgml-cms/docs/open-source/pgml/developers/self-hosting/pooler.md b/pgml-cms/docs/open-source/pgml/developers/self-hosting/pooler.md
@@ -115,6 +115,6 @@ Type "help" for help.
 postgresml=> SELECT pgml.version();
 version
 ---------
- 2.9.3
+ 2.10.0
 (1 row)
 ```
diff --git a/pgml-extension/.cargo/config.toml b/pgml-extension/.cargo/config.toml
@@ -1,9 +1,11 @@
 [build]
-# Postgres symbols won't be available until runtime
 rustflags = ["-C", "link-args=-Wl,-undefined,dynamic_lookup"]

 [target.x86_64-unknown-linux-gnu]
 rustflags = ["-C", "link-args=-Wl,-undefined,dynamic_lookup,-fuse-ld=lld"]

 [target.aarch64-unknown-linux-gnu]
 rustflags = ["-C", "link-args=-Wl,-undefined,dynamic_lookup,-fuse-ld=lld"]
+
+[target.aarch64-apple-darwin]
+rustflags = ["-C", "link-args=-WL,-undefined,dynamic_lookup"]
-Original file line number
+Diff line change
@@ -132,7 +132,7 @@ CREATE EXTENSION
     pgml_test=# SELECT pgml.version();
      version
     ---------
-.9.3
+.10.0
     (1 row)
     ```
-          Expand Down