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.

Sign up for GitHub

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

Update RMM include files #3985

Merged
merged 10 commits into from
Feb 3, 2020
Merged

Update RMM include files #3985

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
939702d
Update include paths for rmm/mr/device.
jrhemstad Jan 29, 2020
b0e0b12
Cleanup datetime includes.
jrhemstad Jan 29, 2020
8bb5807
Remove rmm from copy_range.
jrhemstad Jan 29, 2020
a03ed89
Cleanup fill.hpp.
jrhemstad Jan 29, 2020
3b2c0fe
Clean up repeat and filling.
jrhemstad Jan 29, 2020
532e5e2
Clean up null_mask includes.
jrhemstad Jan 29, 2020
95b0454
Remove unncessary RMM includes.
jrhemstad Jan 29, 2020
a1a995d
CHANGELOG.
jrhemstad Jan 29, 2020
55141e0
Merge branch 'branch-0.13' into fea-ext-move-device-resource-folder
jrhemstad Feb 3, 2020
f4329cc
Fix double line break in CHANGELOG
kkraus14 Feb 3, 2020
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
- PR #3910 Adding sinh, cosh, tanh, asinh, acosh, atanh cube root and rint unary support.
- PR #3972 Add Java bindings for left_semi_join and left_anti_join
- PR #3975 Simplify and generalize data handling in `Buffer`
- PR #3985 Update RMM include files and remove extraneously included header files.

## Bug Fixes

Expand Down
1 change: 0 additions & 1 deletion cpp/include/cudf/column/column.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
#include "column_view.hpp"

#include <rmm/device_buffer.hpp>
#include <rmm/mr/device_memory_resource.hpp>

#include <memory>
#include <type_traits>
Expand Down
6 changes: 3 additions & 3 deletions cpp/include/cudf/datetime.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

#pragma once

#include <cudf/column/column.hpp>
#include <cudf/column/column_view.hpp>
#include <rmm/mr/default_memory_resource.hpp>
#include <cudf/types.hpp>

#include <memory>

namespace cudf {
namespace datetime {
Expand Down
1 change: 0 additions & 1 deletion cpp/include/cudf/detail/copy_range.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include <cudf/utilities/error.hpp>
#include <cudf/utilities/type_dispatcher.hpp>
#include <rmm/device_scalar.hpp>
#include <rmm/mr/device_memory_resource.hpp>

#include <cub/cub.cuh>

Expand Down
3 changes: 0 additions & 3 deletions cpp/include/cudf/detail/fill.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@

#include <cudf/filling.hpp>
#include <cudf/types.hpp>
#include <rmm/mr/device_memory_resource.hpp>

#include <cuda_runtime.h>

#include <memory>

Expand Down
4 changes: 0 additions & 4 deletions cpp/include/cudf/detail/repeat.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,7 @@

#pragma once

#include <cudf/filling.hpp>
#include <cudf/types.hpp>
#include <rmm/mr/device_memory_resource.hpp>

#include <cuda_runtime.h>

#include <memory>

Expand Down
2 changes: 0 additions & 2 deletions cpp/include/cudf/filling.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
#pragma once

#include <cudf/types.hpp>
#include <rmm/mr/default_memory_resource.hpp>
#include <rmm/mr/device_memory_resource.hpp>

#include <memory>

Expand Down
4 changes: 2 additions & 2 deletions cpp/include/cudf/null_mask.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
*/
#pragma once

#include <cudf/column/column_view.hpp>
#include <cudf/types.hpp>

#include <rmm/device_buffer.hpp>
#include <rmm/mr/device_memory_resource.hpp>

#include <vector>

namespace cudf {

Expand Down
1 change: 0 additions & 1 deletion cpp/include/cudf/scalar/scalar.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#include <rmm/device_buffer.hpp>
#include <rmm/device_scalar.hpp>
#include <rmm/thrust_rmm_allocator.h>
#include <rmm/mr/device_memory_resource.hpp>

#include <memory>
#include <type_traits>
Expand Down
1 change: 0 additions & 1 deletion cpp/src/bitmask/null_mask.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
#include <cub/cub.cuh>
#include <rmm/device_buffer.hpp>
#include <rmm/device_scalar.hpp>
#include <rmm/mr/device_memory_resource.hpp>
#include <rmm/thrust_rmm_allocator.h>

#include <algorithm>
Expand Down
1 change: 0 additions & 1 deletion cpp/src/column/column.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
#include <cudf/copying.hpp>

#include <rmm/device_buffer.hpp>
#include <rmm/mr/device_memory_resource.hpp>

#include <algorithm>
#include <numeric>
Expand Down
1 change: 0 additions & 1 deletion cpp/src/copying/copy_range.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
#include <cudf/strings/detail/copy_range.cuh>
#include <cudf/utilities/error.hpp>
#include <cudf/utilities/traits.hpp>
#include <rmm/mr/device_memory_resource.hpp>

#include <thrust/iterator/constant_iterator.h>

Expand Down
2 changes: 2 additions & 0 deletions cpp/src/datetime/datetime_ops.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
#include <cudf/datetime.hpp>
#include <cudf/null_mask.hpp>
#include <cudf/utilities/traits.hpp>
#include <cudf/column/column.hpp>
#include <cudf/column/column_view.hpp>

#include <rmm/thrust_rmm_allocator.h>

Expand Down
1 change: 0 additions & 1 deletion cpp/src/filling/fill.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
#include <cudf/strings/detail/fill.hpp>
#include <cudf/utilities/error.hpp>
#include <cudf/utilities/traits.hpp>
#include <rmm/mr/device_memory_resource.hpp>

#include <cuda_runtime.h>

Expand Down
1 change: 0 additions & 1 deletion cpp/src/filling/legacy/tile.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#include <cudf/utilities/error.hpp>
#include <cudf/legacy/copying.hpp>
#include "cudf/types.hpp"
#include "rmm/mr/device_memory_resource.hpp"

#include <cudf/cudf.h>
#include <cudf/types.h>
Expand Down
1 change: 0 additions & 1 deletion cpp/src/filling/repeat.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
#include <cudf/table/table_view.hpp>
#include <cudf/utilities/type_dispatcher.hpp>
#include <rmm/thrust_rmm_allocator.h>
#include <rmm/mr/device_memory_resource.hpp>

#include <thrust/iterator/counting_iterator.h>
#include <thrust/iterator/constant_iterator.h>
Expand Down
6 changes: 3 additions & 3 deletions cpp/src/hash/hash_allocator.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
#include <new>

#include <rmm/rmm.h>
#include <rmm/mr/device_memory_resource.hpp>
#include <rmm/mr/managed_memory_resource.hpp>
#include <rmm/mr/default_memory_resource.hpp>
#include <rmm/mr/device/device_memory_resource.hpp>
#include <rmm/mr/device/managed_memory_resource.hpp>
#include <rmm/mr/device/default_memory_resource.hpp>

template <class T>
struct managed_allocator {
Expand Down
1 change: 0 additions & 1 deletion cpp/src/io/functions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
#include <cudf/table/table.hpp>
#include <cudf/utilities/error.hpp>

#include <rmm/mr/device_memory_resource.hpp>

namespace cudf {
namespace experimental {
Expand Down
1 change: 0 additions & 1 deletion cpp/src/table/table.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

#include <cudf/table/table.hpp>
#include <cudf/table/table_view.hpp>
#include <rmm/mr/device_memory_resource.hpp>
#include <cudf/utilities/error.hpp>

namespace cudf {
Expand Down
2 changes: 0 additions & 2 deletions cpp/tests/column/factories_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
#include <tests/utilities/base_fixture.hpp>
#include <tests/utilities/type_lists.hpp>

#include <rmm/mr/default_memory_resource.hpp>
#include <rmm/mr/device_memory_resource.hpp>

#include <gmock/gmock.h>

Expand Down
3 changes: 0 additions & 3 deletions cpp/tests/scalar/factories_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@
#include <tests/utilities/base_fixture.hpp>
#include <tests/utilities/type_lists.hpp>

#include <rmm/mr/default_memory_resource.hpp>
#include <rmm/mr/device_memory_resource.hpp>

#include <gmock/gmock.h>

class ScalarFactoryTest : public cudf::test::BaseFixture {
Expand Down
4 changes: 2 additions & 2 deletions cpp/tests/utilities/base_fixture.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#include <cudf/wrappers/bool.hpp>
#include <cudf/utilities/traits.hpp>

#include <rmm/mr/default_memory_resource.hpp>
#include <rmm/mr/device_memory_resource.hpp>
#include <rmm/mr/device/default_memory_resource.hpp>
#include <rmm/mr/device/device_memory_resource.hpp>

#include <ftw.h>
#include <random>
Expand Down