Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions .github/actions/install-deps/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,16 @@ runs:
using: "composite"
steps:
- name: Clean System
uses: AdityaGarg8/remove-unwanted-software@v4.1
uses: AdityaGarg8/remove-unwanted-software@v5
if: ${{ inputs.clean == 'true' && runner.os != 'Windows' }}
with:
remove-android: "true"
remove-dotnet: "true"
remove-haskell: "true"
remove-codeql: "true"
remove-docker-images: "true"
remove-large-packages: "true"
remove-cached-tools: "true"

# Sticking to 3.29 because of:
# https://github.com/open-telemetry/opentelemetry-cpp/issues/2998
Expand Down Expand Up @@ -152,15 +155,15 @@ runs:
with:
toolchain: nightly-2025-02-01
targets: aarch64-apple-darwin
components: rustfmt, clippy, rust-src
components: rust-src

- name: Install rust (aarch64 Linux)
uses: dtolnay/rust-toolchain@nightly
if: ${{ inputs.rust == 'true' && inputs.arch == 'aarch64' && runner.os == 'Linux' }}
with:
toolchain: nightly-2025-02-01
targets: aarch64-unknown-linux-gnu
components: rustfmt, clippy, rust-src
components: rust-src

# # TODO doesn't work.
# - name: Install LLVM 17
Expand Down Expand Up @@ -217,3 +220,9 @@ runs:
- run: git config --system core.longpaths true
shell: pwsh
if: ${{ runner.os == 'Windows' }}

# - name: Free up disk space
# if: ${{ runner.os == 'Linux' }}
# run: |
# rm -rf /__t/*

21 changes: 2 additions & 19 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -198,11 +198,11 @@ jobs:
- os: ubuntu-22.04
arch: x86_64
python-version: 3.9
container: pagmo2/manylinux228_x86_64_with_deps
container: quay.io/pypa/manylinux_2_28_x86_64
- os: ubuntu-22.04-arm
arch: aarch64
python-version: 3.9
container: pagmo2/manylinux228_aarch64_with_deps
container: quay.io/pypa/manylinux_2_28_aarch64
is-release:
- ${{ startsWith(github.ref, 'refs/tags/v') || github.ref_name == 'master' }}
exclude:
Expand All @@ -220,19 +220,6 @@ jobs:
arch: x86_64

steps:
- name: Run df -h
if: ${{ runner.os == 'Linux' }}
run: df -h

- name: Free up disk space
if: ${{ runner.os == 'Linux' }}
run: |
rm -rf /__t/*

- name: Run df -h
if: ${{ runner.os == 'Linux' }}
run: df -h

- name: Checkout
uses: actions/checkout@v4

Expand All @@ -245,10 +232,6 @@ jobs:
name: perspective-metadata
path: rust/

- name: Run df -h
if: ${{ runner.os == 'Linux' }}
run: df -h

- name: Initialize Build
id: init-step
uses: ./.github/actions/install-deps
Expand Down
16 changes: 11 additions & 5 deletions rust/perspective-server/cpp/perspective/src/cpp/table.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -822,7 +822,8 @@ Table::remove_rows(const std::string_view& data) {
if (promote) {
std::stringstream ss;
ss << "Cannot append value of type " << dtype_to_str(*promote)
<< " to column of type " << dtype_to_str(col->get_dtype())
<< " to column \"" << m_index << "\" of type " << dtype_to_str(col->get_dtype())
<< " at index " << ii
<< std::endl;
PSP_COMPLAIN_AND_ABORT(ss.str());
}
Expand Down Expand Up @@ -879,7 +880,8 @@ Table::remove_cols(const std::string_view& data) {
if (promote) {
std::stringstream ss;
ss << "Cannot append value of type " << dtype_to_str(*promote)
<< " to column of type " << dtype_to_str(col->get_dtype())
<< " to column \"" << m_index << "\" of type " << dtype_to_str(col->get_dtype())
<< " at index " << ii
<< std::endl;
PSP_COMPLAIN_AND_ABORT(ss.str());
}
Expand Down Expand Up @@ -964,13 +966,15 @@ Table::update_cols(const std::string_view& data, std::uint32_t port_id) {
LOG_DEBUG("Ignoring column " << col_name);
continue;
}

for (const auto& cell : column.value.GetArray()) {
auto col = data_table.get_column(col_name);
auto promote = fill_column_json(col, ii, cell, true);
if (promote) {
std::stringstream ss;
ss << "Cannot append value of type " << dtype_to_str(*promote)
<< " to column of type " << dtype_to_str(col->get_dtype())
<< " to column \"" << col_name << "\" of type " << dtype_to_str(col->get_dtype())
<< " at index " << ii
<< std::endl;
PSP_COMPLAIN_AND_ABORT(ss.str());
}
Expand Down Expand Up @@ -1189,7 +1193,8 @@ Table::update_rows(const std::string_view& data, std::uint32_t port_id) {
if (promote) {
std::stringstream ss;
ss << "Cannot append value of type " << dtype_to_str(*promote)
<< " to column of type " << dtype_to_str(col->get_dtype())
<< " to column \"" << col_name << "\" of type " << dtype_to_str(col->get_dtype())
<< " at index " << ii
<< std::endl;
PSP_COMPLAIN_AND_ABORT(ss.str());
}
Expand Down Expand Up @@ -1422,7 +1427,8 @@ Table::update_ndjson(const std::string_view& data, std::uint32_t port_id) {
if (promote) {
std::stringstream ss;
ss << "Cannot append value of type " << dtype_to_str(*promote)
<< " to column of type " << dtype_to_str(col->get_dtype())
<< " to column \"" << col_name << "\" of type " << dtype_to_str(col->get_dtype())
<< " at index " << ii
<< std::endl;
PSP_COMPLAIN_AND_ABORT(ss.str());
}
Expand Down
5 changes: 3 additions & 2 deletions rust/perspective-viewer/src/rust/model/export_app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ static VERSION: &str = env!("CARGO_PKG_VERSION");

fn render_plugin(tag_name: impl AsRef<str>) -> String {
format!(
"import \"https://cdn.jsdelivr.net/npm/@perspective-dev/{0}@{1}/dist/cdn/{0}.js\";\n",
"import \"https://cdn.jsdelivr.net/npm/@perspective-dev/{0}@{1}/dist/cdn/{2}.js\";\n",
tag_name.as_ref().replace("perspective-", ""),
VERSION,
tag_name.as_ref(),
VERSION
)
}

Expand Down
Loading