Merge branch 'branch-24.08' into get_json_object_long_strings

# Conflicts: # src/main/cpp/src/get_json_object.cu
NVIDIA · Jul 17, 2024 · a7f8960 · a7f8960
2 parents ef6d7c2 + aff3696
commit a7f8960
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/thirdparty/cudf b/thirdparty/cudf
diff --git a/thirdparty/cudf-pins/rapids-cmake.sha b/thirdparty/cudf-pins/rapids-cmake.sha
@@ -1 +1 @@
-351fc88100ce381434f9dc16debbd32d2fc82a07
+fddf1c05f96f3a3ff50c358fdf634ba067001850
diff --git a/thirdparty/cudf-pins/versions.json b/thirdparty/cudf-pins/versions.json
@@ -47,7 +47,7 @@
     {
       "always_download" : true,
       "git_shallow" : false,
-      "git_tag" : "363e2d65c02b216baf33e4219f27c0102936edee",
+      "git_tag" : "ab3778c0462c2f713125a4e458f46bcd654b9d54",
       "git_url" : "https://github.com/rapidsai/kvikio.git",
       "version" : "24.08"
     },
@@ -132,7 +132,7 @@
     {
       "always_download" : true,
       "git_shallow" : false,
-      "git_tag" : "429960808c3bccea2e7e1da177439546481bb684",
+      "git_tag" : "f91ca6f22195868e6493e38975f5c07029bd1977",
       "git_url" : "https://github.com/rapidsai/rmm.git",
       "version" : "24.08"
     },
+4 −4		.devcontainer/cuda12.2-conda/devcontainer.json
+5 −5		.devcontainer/cuda12.2-pip/devcontainer.json
+10 −10		.github/workflows/build.yaml
+2 −2		.github/workflows/pandas-tests.yaml
+24 −24		.github/workflows/pr.yaml
+3 −3		.github/workflows/pr_issue_status_automation.yml
+11 −11		.github/workflows/test.yaml
+1 −1		CONTRIBUTING.md
+1 −1		README.md
+2 −2		conda/environments/all_cuda-125_arch-x86_64.yaml
+5 −5		cpp/include/cudf/detail/utilities/cuda.cuh
+9 −49		cpp/scripts/sort_ninja_log.py
+5 −1		dependencies.yaml
+3 −3		docs/cudf/source/user_guide/api_docs/pylibcudf/datetime.rst
+6 −0		docs/cudf/source/user_guide/api_docs/pylibcudf/expressions.rst
+1 −0		docs/cudf/source/user_guide/api_docs/pylibcudf/index.rst
+0 −1		python/cudf/cudf/_lib/CMakeLists.txt
+1 −2		python/cudf/cudf/_lib/__init__.py
+0 −156		python/cudf/cudf/_lib/expressions.pyx
+1 −1		python/cudf/cudf/_lib/json.pyx
+1 −1		python/cudf/cudf/_lib/parquet.pyx
+1 −0		python/cudf/cudf/_lib/pylibcudf/CMakeLists.txt
+1 −0		python/cudf/cudf/_lib/pylibcudf/__init__.pxd
+1 −0		python/cudf/cudf/_lib/pylibcudf/__init__.py
+12 −17		python/cudf/cudf/_lib/pylibcudf/expressions.pxd
+195 −0		python/cudf/cudf/_lib/pylibcudf/expressions.pyx
+2 −2		python/cudf/cudf/_lib/pylibcudf/libcudf/CMakeLists.txt
+52 −51		python/cudf/cudf/_lib/pylibcudf/libcudf/expressions.pxd
+0 −0		python/cudf/cudf/_lib/pylibcudf/libcudf/expressions.pyx
+1 −1		python/cudf/cudf/_lib/transform.pyx
+8 −3		python/cudf/cudf/core/_internals/expressions.py
+1 −1		python/cudf/cudf/io/parquet.py
+26 −0		python/cudf/cudf/options.py
+14 −22		python/cudf/cudf/pandas/_wrappers/pandas.py
+50 −0		python/cudf/cudf/pylibcudf_tests/test_expressions.py
+1 −1		python/cudf/cudf/tests/test_json.py
+1 −1		python/cudf/cudf/tests/test_parquet.py
+6 −1		python/cudf_polars/cudf_polars/dsl/ir.py
+28 −0		python/cudf_polars/cudf_polars/utils/versions.py
+2 −1		python/cudf_polars/tests/test_groupby.py
+5 −0		python/cudf_polars/tests/test_scan.py
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		351fc88100ce381434f9dc16debbd32d2fc82a07
		fddf1c05f96f3a3ff50c358fdf634ba067001850