Skip to content

Commit

Permalink
Merge pull request #1581 from Christian8491/fix/updating-dependencies
Browse files Browse the repository at this point in the history
[REVIEW] fix latest cudf dependencies
  • Loading branch information
wmalpica committed Jul 13, 2021
2 parents 8b3b096 + 112f84c commit 16869d9
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 19 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -12,6 +12,7 @@
## Bug Fixes
- #1570 Fix build due to changes in rmm device buffer
- #1576 Fix `CC`/`CXX` variables in CI
- #1581 Fix latest cudf dependencies


# BlazingSQL 21.06.00 (June 10th, 2021)
Expand Down
2 changes: 1 addition & 1 deletion ci/checks/style.sh
Expand Up @@ -11,7 +11,7 @@ LC_ALL=C.UTF-8
LANG=C.UTF-8

# Activate common conda env
source activate gdf
source activate rapids

# Run isort and get results/return code
# TODO: cordova in a near future consider hive.py and context.py
Expand Down
6 changes: 3 additions & 3 deletions dependencies.sh
Expand Up @@ -10,7 +10,7 @@ BOLDGREEN="\e[1;${GREEN}"
ITALICRED="\e[3;${RED}"
ENDCOLOR="\e[0m"

RAPIDS_VERSION="21.06"
RAPIDS_VERSION="21.08"
UCX_PY_VERSION="0.21"
CUDA_VERSION="11.0"
CHANNEL=""
Expand All @@ -28,9 +28,9 @@ if [ ! -z $3 ]; then
fi

echo -e "${GREEN}Installing dependencies${ENDCOLOR}"
conda install --yes -c conda-forge spdlog'>=1.8.5,<2.0.0a0' google-cloud-cpp=1.25 ninja mysql-connector-cpp=8.0.23 libpq=13 nlohmann_json=3.9.1
conda install --yes -c conda-forge spdlog'>=1.8.5,<2.0.0a0' google-cloud-cpp'>=1.25' ninja mysql-connector-cpp=8.0.23 libpq=13 nlohmann_json=3.9.1
# NOTE cython must be the same of cudf (for 0.11 and 0.12 cython is >=0.29,<0.30)
conda install --yes -c conda-forge cmake=3.18 gtest==1.10.0=h0efe328_4 gmock cppzmq cython=0.29 openjdk=8.0 maven jpype1 netifaces pyhive pytest tqdm ipywidgets boost-cpp=1.72.0
conda install --yes -c conda-forge cmake=3.18 gtest==1.10.0=h0efe328_4 gmock cppzmq cython=0.29 openjdk'>=8.0,<9.0' maven jpype1 netifaces pyhive pytest tqdm ipywidgets boost-cpp=1.72.0


echo -e "${GREEN}Install RAPIDS dependencies${ENDCOLOR}"
Expand Down
6 changes: 4 additions & 2 deletions engine/tests/parser/parquet_metadata_test.cpp
Expand Up @@ -42,8 +42,11 @@ void process_minmax_metadata(){
size_t total_num_row_groups=2; /*1 rowgroup by each file*/
size_t columns_with_metadata=1;

arrow::MemoryPool* pool = arrow::default_memory_pool();

std::shared_ptr<parquet::Statistics> statistics = parquet::Statistics::Make(desc,
encoded_min, encoded_max, 100 /*num_values*/, 0 /*null_count*/, 0 /*distinct_count*/, true /*has_min_max*/);
encoded_min, encoded_max, 100 /*num_values*/, 0 /*null_count*/, 0 /*distinct_count*/, true /*has_min_max*/,
false /*has_null_count*/, false/*has_distinct_count*/, pool);

size_t num_metadata_cols = 2; //min and max
std::vector<std::vector<std::vector<int64_t>>> minmax_metadata_table_per_file(num_files);
Expand Down Expand Up @@ -87,4 +90,3 @@ TEST_F(ParquetMetadataTest, typed_test) {
process_minmax_metadata<int64_t, parquet::Type::type::INT64>();
process_minmax_metadata<double, parquet::Type::type::DOUBLE>();
}

28 changes: 15 additions & 13 deletions tests/BlazingSQLTest/EndToEndTests/oldScripts/hiveFileTest.py
Expand Up @@ -387,19 +387,21 @@ def executionTestWithPartitions(dask_client, spark, dir_data_file, bc, nRals):

queryId = "TEST_01"
query = "select o_totalprice from orders where o_orderstatus = 'F' and o_orderdate <= '1992-01-31' and o_orderpriority IS NOT NULL and o_orderstatus IS NOT NULL order by o_orderkey"
runTest.run_query(
bc,
spark,
query,
queryId,
queryType,
worder,
"",
acceptable_difference,
use_percentage,
fileSchemaType,
query_spark=query,
)
# TODO: Fernando Cordova, gpuci randomly crashes with CSV
if fileSchemaType != DataType.CSV:
runTest.run_query(
bc,
spark,
query,
queryId,
queryType,
worder,
"",
acceptable_difference,
use_percentage,
fileSchemaType,
query_spark=query,
)

queryId = "TEST_02"
query = """select c_nationkey, c_acctbal + 3 as c_acctbal_new
Expand Down

0 comments on commit 16869d9

Please sign in to comment.