Skip to content

Commit c6da939

Browse files
authored
fix: aarch64 release CI (#606)
Signed-off-by: usamoi <[email protected]>
1 parent f7c766d commit c6da939

File tree

5 files changed

+6
-30
lines changed

5 files changed

+6
-30
lines changed

.github/workflows/psql.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,6 @@ jobs:
7777
~/.cargo/registry/cache/
7878
~/.cargo/git/db/
7979
key: ${{ github.job }}-${{ hashFiles('./Cargo.lock') }}-${{ matrix.version }}
80-
- name: Set up Clang-16
81-
run: |
82-
sudo sh -c 'echo "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-16 main" >> /etc/apt/sources.list'
83-
wget --quiet -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
84-
sudo apt-get update
85-
sudo apt-get install -y clang-16
86-
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-16 128
8780
- name: Build
8881
run: |
8982
export PGRX_PG_CONFIG_PATH=$(pwd)/vendor/pg${VERSION}_${ARCH}_debian/pg_config/pg_config

.github/workflows/release.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,11 @@ jobs:
5959
sudo apt-get update
6060
sudo apt-get install -y build-essential crossbuild-essential-arm64
6161
sudo apt-get install -y qemu-user-static
62-
echo 'target.aarch64-unknown-linux-gnu.linker = "aarch64-linux-gnu-gcc"' | tee ~/.cargo/config.toml
62+
touch ~/.cargo/config.toml
63+
echo 'target.aarch64-unknown-linux-gnu.linker = "aarch64-linux-gnu-gcc"' >> ~/.cargo/config.toml
64+
echo 'target.aarch64-unknown-linux-gnu.runner = ["qemu-aarch64-static", "-L", "/usr/aarch64-linux-gnu"]' >> ~/.cargo/config.toml
65+
rustup target add x86_64-unknown-linux-gnu
66+
rustup target add aarch64-unknown-linux-gnu
6367
- name: Set up Sccache
6468
uses: mozilla-actions/[email protected]
6569
- name: Set up Cache
@@ -71,13 +75,6 @@ jobs:
7175
~/.cargo/registry/cache/
7276
~/.cargo/git/db/
7377
key: ${{ github.job }}-${{ hashFiles('./Cargo.lock') }}-${{ matrix.version }}-${{ matrix.arch }}
74-
- name: Set up Clang-16
75-
run: |
76-
sudo sh -c 'echo "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-16 main" >> /etc/apt/sources.list'
77-
wget --quiet -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
78-
sudo apt-get update
79-
sudo apt-get install -y clang-16
80-
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-16 128
8178
- name: Build
8279
run: |
8380
export PGRX_PG_CONFIG_PATH=$(pwd)/vendor/pg${VERSION}_${ARCH}_debian/pg_config/pg_config

.github/workflows/release_enterprise.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,6 @@ jobs:
7373
~/.cargo/registry/cache/
7474
~/.cargo/git/db/
7575
key: ${{ github.job }}-${{ hashFiles('./Cargo.lock') }}-${{ matrix.version }}-${{ matrix.arch }}
76-
- name: Set up Clang-16
77-
run: |
78-
sudo sh -c 'echo "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-16 main" >> /etc/apt/sources.list'
79-
wget --quiet -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
80-
sudo apt-get update
81-
sudo apt-get install -y clang-16
82-
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-16 128
8376
- name: Schema
8477
run: |
8578
echo -n $PGVECTORS_SCHEMA > .schema

.github/workflows/rust.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,6 @@ jobs:
7878
~/.cargo/registry/cache/
7979
~/.cargo/git/db/
8080
key: ${{ github.job }}-${{ hashFiles('./Cargo.lock') }}-${{ matrix.arch }}
81-
- name: Set up Clang-16
82-
run: |
83-
sudo sh -c 'echo "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-16 main" >> /etc/apt/sources.list'
84-
wget --quiet -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
85-
sudo apt-get update
86-
sudo apt-get install -y clang-16
87-
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-16 128
8881
- name: Clippy
8982
run: |
9083
cargo clippy --workspace --exclude pgvectors --exclude pyvectors --target $ARCH-unknown-linux-gnu

crates/quantization/src/quantize.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ mod mul_add_round {
9696
// this hint is used to disable loop unrolling
9797
while std::hint::black_box(n) > 0 {
9898
let x = a.read();
99-
let v = (k * x + b).round_ties_even() as u8;
99+
let v = x.mul_add(k, b).round_ties_even() as u8;
100100
r.write(v);
101101
n -= 1;
102102
a = a.add(1);

0 commit comments

Comments
 (0)