Merge branch 'rapidsai:branch-22.02' into 10062

rapidsai · Jan 19, 2022 · 8183a1c · 8183a1c
2 parents 2fe377c + e416188
commit 8183a1c
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 9 deletions.
diff --git a/cpp/src/io/orc/aggregate_orc_metadata.cpp b/cpp/src/io/orc/aggregate_orc_metadata.cpp
@@ -172,9 +172,10 @@ std::vector<metadata::stripe_source_mapping> aggregate_orc_metadata::select_stri
       // Coalesce stripe info at the source file later since that makes downstream processing much
       // easier in impl::read
       for (const auto& stripe_idx : user_specified_stripes[src_file_idx]) {
-        CUDF_EXPECTS(stripe_idx < static_cast<decltype(stripe_idx)>(
-                                    per_file_metadata[src_file_idx].ff.stripes.size()),
-                     "Invalid stripe index");
+        CUDF_EXPECTS(
+          stripe_idx >= 0 and stripe_idx < static_cast<decltype(stripe_idx)>(
+                                             per_file_metadata[src_file_idx].ff.stripes.size()),
+          "Invalid stripe index");
         stripe_infos.push_back(
           std::make_pair(&per_file_metadata[src_file_idx].ff.stripes[stripe_idx], nullptr));
         row_count += per_file_metadata[src_file_idx].ff.stripes[stripe_idx].numberOfRows;

diff --git a/docs/cudf/source/basics/basics.rst b/docs/cudf/source/basics/basics.rst
@@ -37,7 +37,8 @@ The following table lists all of cudf types. For methods requiring dtype argumen
     | Boolean                |                  | np.bool_                                                                            | ``'bool'``                                  |
     +------------------------+------------------+-------------------------------------------------------------------------------------+---------------------------------------------+
     | Decimal                | Decimal32Dtype,  | (none)                                                                              | (none)                                      |
-    |                        | Decimal64Dtype   |                                                                                     |                                             |
+    |                        | Decimal64Dtype,  |                                                                                     |                                             |
+    |                        | Decimal128Dtype  |                                                                                     |                                             |
     +------------------------+------------------+-------------------------------------------------------------------------------------+---------------------------------------------+
 
 **Note: All dtypes above are Nullable**

diff --git a/docs/cudf/source/basics/io-supported-types.rst b/docs/cudf/source/basics/io-supported-types.rst
@@ -62,6 +62,8 @@ The following table lists are compatible cudf types for each supported IO format
     +-----------------------+--------+--------+--------+--------+---------+--------+--------+--------+--------+---------+---------+--------+--------+---------+---------+
     | decimal64             | ✅     | ✅     | ✅     | ✅     | ❌      | ❌     | ✅     | ✅     | ❌     | ❌      | ❌      | ❌     | ❌     | ❌      | ❌      |
     +-----------------------+--------+--------+--------+--------+---------+--------+--------+--------+--------+---------+---------+--------+--------+---------+---------+
+    | decimal128            | ✅     | ✅     | ✅     | ✅     | ❌      | ❌     | ✅     | ✅     | ❌     | ❌      | ❌      | ❌     | ❌     | ❌      | ❌      |
+    +-----------------------+--------+--------+--------+--------+---------+--------+--------+--------+--------+---------+---------+--------+--------+---------+---------+
 
 **Notes:**
 

diff --git a/java/src/main/native/src/CompiledExpression.cpp b/java/src/main/native/src/CompiledExpression.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, NVIDIA CORPORATION.
+ * Copyright (c) 2021-2022, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -59,7 +59,7 @@ class jni_serialized_ast {
     check_for_eof(sizeof(T));
     // use memcpy since data may be misaligned
     T result;
-    memcpy(&result, data_ptr, sizeof(T));
+    memcpy(reinterpret_cast<jbyte *>(&result), data_ptr, sizeof(T));
     data_ptr += sizeof(T);
     return result;
   }

diff --git a/python/cudf/cudf/core/dataframe.py b/python/cudf/cudf/core/dataframe.py
@@ -6519,7 +6519,7 @@ def _get_union_of_series_names(series_list):
         else:
             names_list.append(series.name)
     if unnamed_count == len(series_list):
-        names_list = [*range(len(series_list))]
+        names_list = range(len(series_list))
 
     return names_list
 

diff --git a/python/cudf/cudf/tests/test_dataframe.py b/python/cudf/cudf/tests/test_dataframe.py
@@ -7665,9 +7665,14 @@ def test_dataframe_init_from_series_list(data, ignore_dtype, columns):
     actual = cudf.DataFrame(gd_data, columns=columns)
 
     if ignore_dtype:
-        assert_eq(expected.fillna(-1), actual.fillna(-1), check_dtype=False)
+        assert_eq(
+            expected.fillna(-1),
+            actual.fillna(-1),
+            check_dtype=False,
+            check_index_type=True,
+        )
     else:
-        assert_eq(expected, actual)
+        assert_eq(expected, actual, check_index_type=True)
 
 
 @pytest.mark.parametrize(

diff --git a/python/dask_cudf/dask_cudf/tests/test_groupby.py b/python/dask_cudf/dask_cudf/tests/test_groupby.py
@@ -17,6 +17,7 @@
 @pytest.mark.parametrize("aggregation", SUPPORTED_AGGS)
 @pytest.mark.parametrize("series", [False, True])
 def test_groupby_basic(series, aggregation):
+    np.random.seed(0)
     pdf = pd.DataFrame(
         {
             "x": np.random.randint(0, 5, size=10000),
-Original file line number
+Diff line change
@@ Expand Up @@
         +-----------------------+--------+--------+--------+--------+---------+--------+--------+--------+--------+---------+---------+--------+--------+---------+---------+
         | decimal64             | ✅     | ✅     | ✅     | ✅     | ❌      | ❌     | ✅     | ✅     | ❌     | ❌      | ❌      | ❌     | ❌     | ❌      | ❌      |
         +-----------------------+--------+--------+--------+--------+---------+--------+--------+--------+--------+---------+---------+--------+--------+---------+---------+
+        | decimal128            | ✅     | ✅     | ✅     | ✅     | ❌      | ❌     | ✅     | ✅     | ❌     | ❌      | ❌      | ❌     | ❌     | ❌      | ❌      |
+        +-----------------------+--------+--------+--------+--------+---------+--------+--------+--------+--------+---------+---------+--------+--------+---------+---------+
     **Notes:**
@@ Expand Down @@