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
6 changes: 3 additions & 3 deletions .github/workflows/RunBenchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,13 @@ jobs:
if [ $ncores -eq 16 ]; then export MACHINE_TYPE="c6id.4xlarge"; fi
if [ $ncores -eq 32 ]; then export MACHINE_TYPE="c6id.8xlarge"; fi
if [ $ncores -eq 128 ]; then export MACHINE_TYPE="c6id.metal"; fi
if [[ ${{ inputs.sizes }} == *"small"* ]]; then
if [[ "${{ inputs.sizes }}" == *"small"* ]]; then
MACHINE_TYPE=$MACHINE_TYPE ./_run/run_small.sh
fi
if [[ ${{ inputs.sizes }} == *"medium"* ]]; then
if [[ "${{ inputs.sizes }}" == *"medium"* ]]; then
MACHINE_TYPE=$MACHINE_TYPE ./_run/run_medium.sh
fi
if [[ ${{ inputs.sizes }} == *"large"* ]]; then
if [[ "${{ inputs.sizes }}" == *"large"* ]]; then
MACHINE_TYPE=$MACHINE_TYPE ./_run/run_large.sh
fi

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/regression.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
fail-fast: false
matrix:
solution: [data.table, collapse, dplyr, pandas, spark, juliadf, juliads, polars, R-arrow, duckdb, datafusion, dask, clickhouse]
solution: [data.table, collapse, dplyr, pandas, spark, polars, R-arrow, duckdb, datafusion, dask, clickhouse]
name: Solo solutions
runs-on: ubuntu-latest
env:
Expand Down Expand Up @@ -115,7 +115,7 @@ jobs:
regression-test-benchmark-runner-all-solutions:
needs: regression-test-benchmark-runner-solo-solutions
name: Regression Tests all solutions
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
env:
CC: gcc-10
CXX: g++-10
Expand Down
2 changes: 1 addition & 1 deletion _setup_utils/prep_solutions.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
SOLUTIONS_FILENAME = "_control/solutions.csv"
RUN_CONF_FILENAME = "run.conf"

SKIPPED_SOLUTIONS = []
SKIPPED_SOLUTIONS = ["juliads", "juliadf"]


def print_usage():
Expand Down
3 changes: 2 additions & 1 deletion datatable/setup-datatable.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/bin/bash
# install devel data.table
mkdir -p ./datatable/r-datatable
Rscript -e 'install.packages("data.table", repos="https://Rdatatable.gitlab.io/data.table", method="curl", lib="./datatable/r-datatable")'
Rscript -e 'install.packages("data.table", repos="https://Rdatatable.gitlab.io/data.table", lib="./datatable/r-datatable")'

./datatable/ver-datatable.sh

2 changes: 1 addition & 1 deletion duckdb/setup-duckdb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ mkdir -p ./duckdb/r-duckdb
# prevent errors when running 'ver-duckdb.sh'
Rscript -e 'install.packages("DBI", lib="./duckdb/r-duckdb", repos = "http://cloud.r-project.org")'
ncores=`python3 -c 'import multiprocessing as mp; print(mp.cpu_count())'`
MAKE="make -j$ncores" Rscript -e 'install.packages("duckdb", lib="./duckdb/r-duckdb", repos = "http://cloud.r-project.org")'
MAKEFLAGS="-j$ncores" Rscript -e 'install.packages("duckdb", lib="./duckdb/r-duckdb", repos = "http://cloud.r-project.org")'

./duckdb/ver-duckdb.sh