Skip to content

Commit

Permalink
Merge branch 'json-multithreaded-compio' of github.com:shrshi/cudf in…
Browse files Browse the repository at this point in the history
…to json-multithreaded-compio
  • Loading branch information
shrshi committed Jan 4, 2025
2 parents b23d334 + 3c557b2 commit 4aa7d59
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 27 deletions.
9 changes: 3 additions & 6 deletions cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# =============================================================================
# Copyright (c) 2018-2024, NVIDIA CORPORATION.
# Copyright (c) 2018-2025, NVIDIA CORPORATION.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
# in compliance with the License. You may obtain a copy of the License at
Expand Down Expand Up @@ -274,11 +274,8 @@ endif()
# add third party dependencies using CPM
rapids_cpm_init()

# Not using rapids-cmake since we never want to find, always download.
CPMAddPackage(
NAME rapids_logger GITHUB_REPOSITORY rapidsai/rapids-logger GIT_SHALLOW FALSE GIT_TAG
c510947ae9d3a67530cfe3e5eaccb5a3b8ea0e55 VERSION c510947ae9d3a67530cfe3e5eaccb5a3b8ea0e55
)
include(${rapids-cmake-dir}/cpm/rapids_logger.cmake)
rapids_cpm_rapids_logger()
rapids_make_logger(cudf EXPORT_SET cudf-exports)

# find jitify
Expand Down
34 changes: 17 additions & 17 deletions docs/cudf/source/user_guide/api_docs/general_functions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,40 +9,40 @@ Data manipulations
.. autosummary::
:toctree: api/

cudf.concat
cudf.crosstab
cudf.cut
cudf.factorize
cudf.get_dummies
cudf.melt
cudf.merge
cudf.pivot
cudf.pivot_table
cudf.unstack
concat
crosstab
cut
factorize
get_dummies
melt
merge
pivot
pivot_table
unstack

Top-level conversions
---------------------
.. autosummary::
:toctree: api/

cudf.to_numeric
cudf.from_dataframe
cudf.from_dlpack
cudf.from_pandas
to_numeric
from_dataframe
from_dlpack
from_pandas

Top-level dealing with datetimelike data
----------------------------------------

.. autosummary::
:toctree: api/

cudf.to_datetime
cudf.date_range
to_datetime
date_range

Top-level dealing with Interval data
------------------------------------

.. autosummary::
:toctree: api/

cudf.interval_range
interval_range
8 changes: 4 additions & 4 deletions docs/cudf/source/user_guide/api_docs/io.rst
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ Parquet

read_parquet
DataFrame.to_parquet
cudf.io.parquet.read_parquet_metadata
cudf.io.parquet.ParquetDatasetWriter
cudf.io.parquet.ParquetDatasetWriter.close
cudf.io.parquet.ParquetDatasetWriter.write_table
io.parquet.read_parquet_metadata
io.parquet.ParquetDatasetWriter
io.parquet.ParquetDatasetWriter.close
io.parquet.ParquetDatasetWriter.write_table


ORC
Expand Down

0 comments on commit 4aa7d59

Please sign in to comment.