Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[REVIEW] Fix build due to libcudf sublibs changes #1365

Merged
merged 3 commits into from
Mar 3, 2021
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
- #1348 Capturing error messages due to exceptions properly
- #1350 Fixed bug where there are no projects in a bindable table scan
- #1359 Avoid cuda issues when free pinned memory
- #1365 Fixed build after sublibs changes on cudf

# BlazingSQL 0.18.0 (Date TBS)

Expand Down
19 changes: 1 addition & 18 deletions engine/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -324,24 +324,7 @@ target_link_libraries(blazingsql-engine
#Threads::Threads
pthread

# TODO: Make this cleaner. Here we just used to link cudf, but cudf got split into a whole bunch of libraries in this PR https://github.com/rapidsai/cudf/pull/6134
# cudf
libcudf_ast.so
libcudf_interop.so
libcudf_partitioning.so
libcudf_rolling.so
libcudf_base.so
libcudf_io.so
libcudf_reductions.so
libcudf.so
libcudf_comms.so
libcudf_join.so
libcudf_replace.so
libcudf_hash.so
libcudf_merge.so
libcudf_reshape.so
libcudf_transpose.so

cudf
zmq
cudart

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include <cudf/strings/contains.hpp>
#include <cudf/strings/replace_re.hpp>
#include <cudf/strings/replace.hpp>
#include <cudf/strings/detail/replace.hpp>
#include <cudf/strings/substring.hpp>
#include <cudf/strings/case.hpp>
#include <cudf/strings/strip.hpp>
Expand Down Expand Up @@ -142,7 +143,7 @@ std::unique_ptr<cudf::column> evaluate_string_functions(const cudf::table_view &
std::string target = StringUtil::removeEncapsulation(arg_tokens[1], encapsulation_character);
std::string repl = StringUtil::removeEncapsulation(arg_tokens[2], encapsulation_character);

computed_col = cudf::strings::replace(column, target, repl);
computed_col = cudf::strings::detail::replace<cudf::strings::detail::replace_algorithm::ROW_PARALLEL>(column, target, repl);
break;
}
case operator_type::BLZ_STR_REGEXP_REPLACE:
Expand Down
19 changes: 1 addition & 18 deletions engine/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,24 +30,7 @@ function(configure_test TEST_NAME Tests_SRCS)
blazingdb-io
Threads::Threads

# TODO: Make this cleaner. Here we just used to link cudf, but cudf got split into a whole bunch of libraries in this PR https://github.com/rapidsai/cudf/pull/6134
# cudf
libcudf_base.so
libcudf_rolling.so
libcudf_replace.so
libcudf_transpose.so
libcudf_reductions.so
libcudf_ast.so
libcudf_join.so
libcudf_reshape.so
libcudf_merge.so
libcudf_comms.so
libcudf_hash.so
libcudf_io.so
libcudf_interop.so
libcudf_partitioning.so


cudf
zmq
cudart

Expand Down