postgresml · levkk · Apr 17, 2023 · Apr 17, 2023 · Apr 17, 2023 · Apr 17, 2023
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,8 +1,6 @@
 name: tests
 on:
   push:
-    branches:
-      - master
   workflow_dispatch:
 jobs:
   tests:
@@ -14,49 +12,77 @@ jobs:
       - uses: actions/checkout@v3
       - name: Install dependencies
         run: |
-          sudo apt-get update && \
-            DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC sudo apt-get install -y \
-              curl \
-              build-essential \
-              libopenblas-dev \
-              clang \
-              python3-dev \
-              libpython3-dev \
-              postgresql \
-              postgresql-server-dev-14 \
-              pkg-config \
-              python3-pip \
-              python3
-          sudo pip3 install xgboost lightgbm scikit-learn
+          git submodule update --init --recursive
+
+          # PostgreSQL apt
+          curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg >/dev/null
+          sudo sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+
+          sudo apt-get install -y software-properties-common
+          sudo add-apt-repository ppa:apt-fast/stable --yes
+          sudo add-apt-repository ppa:deadsnakes/ppa --yes
+          sudo apt update
+
+          sudo apt-get install -y apt-fast
+          sudo apt-get update && sudo apt-fast install -y \
+            libopenblas-dev \
+            libssl-dev \
+            bison \
+            flex \
+            pkg-config \
+            cmake \
+            libreadline-dev \
+            libz-dev \
+            curl \
+            lsb-release \
+            tzdata \
+            sudo \
+            cmake \
+            libpq-dev \
+            libclang-dev \
+            wget \
+            postgresql-15 \
+            postgresql-14 \
+            postgresql-13 \
+            postgresql-12 \
+            postgresql-11 \
+            postgresql-server-dev-15 \
+            postgresql-server-dev-14 \
+            postgresql-server-dev-13 \
+            postgresql-server-dev-12 \
+            postgresql-server-dev-11 \
+            lsb-release \
+            python3.10 \
+            python3-pip \
+            libpython3.10-dev \
+            python3.10-dev \
+
+            sudo pip3 install xgboost lightgbm scikit-learn
       - name: Cache dependencies
         uses: actions/cache@v3
         with:
           path: |
-            ~/.cargo
             pgml-extension/target
-            ~/.pgx
+            ~/.cargo
           key: ${{ runner.os }}-rust-${{ hashFiles('pgml-extension/Cargo.lock') }}
       - name: Submodules
         run: |
           git submodule update --init --recursive
-      - name: Run tests
-        run: |
-          curl https://sh.rustup.rs -sSf | sh -s -- -y
-          source ~/.cargo/env
-          cargo install cargo-pgx --version "0.7.1"
-
-          if [[ ! -d ~/.pgx ]]; then
-            cargo pgx init
-          fi
-
-          cargo pgx test
-
-          cargo pgx stop
-          cargo pgx start
-
-          # psql -p 28813 -h 127.0.0.1 -d pgml -P pager -f tests/test.sql
-
-          cargo pgx stop
-
-
-
+      - name: Install pgrx
+        uses: postgresml/gh-actions-cargo@master
+        with:
+          working-directory: pgml-extension
+          command: install
+          args: cargo-pgrx --version "0.7.4"
+      - name: pgrx init
+        uses: postgresml/gh-actions-cargo@master
+        with:
+          working-directory: pgml-extension
+          command: pgrx
+          args: init --pg11=/usr/lib/postgresql/11/bin/pg_config --pg12=/usr/lib/postgresql/12/bin/pg_config --pg13=/usr/lib/postgresql/13/bin/pg_config --pg14=/usr/lib/postgresql/14/bin/pg_config --pg15=/usr/lib/postgresql/15/bin/pg_config
+      - name: pgrx test
+        uses: postgresml/gh-actions-cargo@master
+        with:
+          working-directory: pgml-extension
+          command: pgrx
+          args: test
diff --git a/.github/workflows/package-extension.yml b/.github/workflows/package-extension.yml
@@ -84,7 +84,7 @@ jobs:
       with:
         working-directory: pgml-extension
         command: install
-        args: cargo-pgx --version "0.7.1"
+        args: cargo-pgx --version "0.7.4"
     - name: pgx init
       uses: postgresml/gh-actions-cargo@master
       with:

diff --git a/pgml-extension/Cargo.lock b/pgml-extension/Cargo.lock
diff --git a/pgml-extension/Cargo.toml b/pgml-extension/Cargo.toml
@@ -8,18 +8,18 @@ crate-type = ["cdylib"]
 
 [features]
 default = ["pg15", "python"]
-pg11 = ["pgx/pg11", "pgx-tests/pg11" ]
-pg12 = ["pgx/pg12", "pgx-tests/pg12" ]
-pg13 = ["pgx/pg13", "pgx-tests/pg13" ]
-pg14 = ["pgx/pg14", "pgx-tests/pg14" ]
-pg15 = ["pgx/pg15", "pgx-tests/pg15" ]
+pg11 = ["pgrx/pg11", "pgrx-tests/pg11" ]
+pg12 = ["pgrx/pg12", "pgrx-tests/pg12" ]
+pg13 = ["pgrx/pg13", "pgrx-tests/pg13" ]
+pg14 = ["pgrx/pg14", "pgrx-tests/pg14" ]
+pg15 = ["pgrx/pg15", "pgrx-tests/pg15" ]
 pg_test = []
 python = ["pyo3"]
 cuda = ["xgboost/cuda", "lightgbm/cuda"]
 
 [dependencies]
-pgx = "=0.7.4"
-pgx-pg-sys = "=0.7.4"
+pgrx = "=0.7.4"
+pgrx-pg-sys = "=0.7.4"
 xgboost = { git="https://github.com/postgresml/rust-xgboost.git", branch = "master" }
 once_cell = "1"
 rand = "0.8"
@@ -48,7 +48,7 @@ flate2 = "1.0"
 csv = "1.1"
 
 [dev-dependencies]
-pgx-tests = "=0.7.4"
+pgrx-tests = "=0.7.4"
 
 [profile.dev]
 panic = "unwind"

diff --git a/pgml-extension/Dockerfile b/pgml-extension/Dockerfile
@@ -37,8 +37,8 @@ RUN useradd postgresml -m -s /bin/bash -G sudo
 RUN echo 'postgresml ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
 USER postgresml
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
-RUN $HOME/.cargo/bin/cargo install cargo-pgx --version "0.7.4"
-RUN $HOME/.cargo/bin/cargo pgx init
+RUN $HOME/.cargo/bin/cargo install cargo-pgrx --version "0.7.4"
+RUN $HOME/.cargo/bin/cargo pgrx init
 RUN curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg >/dev/null
 RUN sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
 RUN sudo apt update

diff --git a/pgml-extension/control b/pgml-extension/control
@@ -11,5 +11,5 @@ Description: PostgresML - machine learning with PostgreSQL
  learning directly in the database. It allows to both train
  algorithms on tables or views, and to predict novel datapoints
  using only SQL.
- The extension is written in Rust using tcdi/pgx with some additional
+ The extension is written in Rust using tcdi/pgrx with some additional
  functionality written in Python & PLPython.
diff --git a/pgml-extension/docker/Cargo.toml.cuda b/pgml-extension/docker/Cargo.toml.cuda
@@ -8,19 +8,19 @@ crate-type = ["cdylib"]
 
 [features]
 default = ["pg15", "python", "cuda"]
-pg10 = ["pgx/pg10", "pgx-tests/pg10" ]
-pg11 = ["pgx/pg11", "pgx-tests/pg11" ]
-pg12 = ["pgx/pg12", "pgx-tests/pg12" ]
-pg13 = ["pgx/pg13", "pgx-tests/pg13" ]
-pg14 = ["pgx/pg14", "pgx-tests/pg14" ]
-pg15 = ["pgx/pg15", "pgx-tests/pg15" ]
+pg10 = ["pgrx/pg10", "pgrx-tests/pg10" ]
+pg11 = ["pgrx/pg11", "pgrx-tests/pg11" ]
+pg12 = ["pgrx/pg12", "pgrx-tests/pg12" ]
+pg13 = ["pgrx/pg13", "pgrx-tests/pg13" ]
+pg14 = ["pgrx/pg14", "pgrx-tests/pg14" ]
+pg15 = ["pgrx/pg15", "pgrx-tests/pg15" ]
 pg_test = []
 python = ["pyo3"]
 cuda = ["xgboost/cuda", "lightgbm/cuda"]
 
 [dependencies]
-pgx = "=0.7.1"
-pgx-pg-sys = "=0.7.1"
+pgrx = "=0.7.1"
+pgrx-pg-sys = "=0.7.1"
 xgboost = { git="https://github.com/postgresml/rust-xgboost.git", branch = "master" }
 once_cell = "1"
 rand = "0.8"
@@ -49,7 +49,7 @@ flate2 = "1.0"
 csv = "1.1"
 
 [dev-dependencies]
-pgx-tests = "=0.7.1"
+pgrx-tests = "=0.7.1"
 
 [profile.dev]
 panic = "unwind"

diff --git a/pgml-extension/docker/Cargo.toml.no-python b/pgml-extension/docker/Cargo.toml.no-python
@@ -8,19 +8,19 @@ crate-type = ["cdylib"]
 
 [features]
 default = ["pg15"]
-pg10 = ["pgx/pg10", "pgx-tests/pg10" ]
-pg11 = ["pgx/pg11", "pgx-tests/pg11" ]
-pg12 = ["pgx/pg12", "pgx-tests/pg12" ]
-pg13 = ["pgx/pg13", "pgx-tests/pg13" ]
-pg14 = ["pgx/pg14", "pgx-tests/pg14" ]
-pg14 = ["pgx/pg15", "pgx-tests/pg15" ]
+pg10 = ["pgrx/pg10", "pgrx-tests/pg10" ]
+pg11 = ["pgrx/pg11", "pgrx-tests/pg11" ]
+pg12 = ["pgrx/pg12", "pgrx-tests/pg12" ]
+pg13 = ["pgrx/pg13", "pgrx-tests/pg13" ]
+pg14 = ["pgrx/pg14", "pgrx-tests/pg14" ]
+pg14 = ["pgrx/pg15", "pgrx-tests/pg15" ]
 pg_test = []
 python = ["pyo3"]
 cuda = ["xgboost/cuda", "lightgbm/cuda"]
 
 [dependencies]
-pgx = "=0.7.1"
-pgx-pg-sys = "=0.7.1"
+pgrx = "=0.7.1"
+pgrx-pg-sys = "=0.7.1"
 xgboost = { git="https://github.com/postgresml/rust-xgboost.git", branch = "master" }
 once_cell = "1"
 rand = "0.8"
@@ -49,7 +49,7 @@ flate2 = "1.0"
 csv = "1.1"
 
 [dev-dependencies]
-pgx-tests = "=0.7.1"
+pgrx-tests = "=0.7.1"
 
 [profile.dev]
 panic = "unwind"

diff --git a/pgml-extension/sql/setup_examples.sql b/pgml-extension/sql/setup_examples.sql
@@ -3,7 +3,7 @@
 ---
 --- Usage:
 ---
----   $ cargo pgx run --release
+---   $ cargo pgrx run --release
 ---   $ psql -P pager-off -h localhost -p 28813 -d pgml -f sql/setup_examples.sql
 ---
 \set ON_ERROR_STOP true