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

Remove itstimestamp and types.hpp #554

Merged
merged 3 commits into from
Jun 17, 2022
Merged

Remove itstimestamp and types.hpp #554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1816048
remove types.hpp
isVoid Jun 3, 2022
1ddd4cd
remove file reference in docs
isVoid Jun 3, 2022
ad2cc51
Move macro into cuda utils
isVoid Jun 8, 2022
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
5 changes: 5 additions & 0 deletions cpp/include/cuspatial/cuda_utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#ifdef __CUDACC__
#define CUSPATIAL_HOST_DEVICE __host__ __device__
#else
#define CUSPATIAL_HOST_DEVICE
#endif
1 change: 0 additions & 1 deletion cpp/include/cuspatial/experimental/detail/coordinate_transform.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#pragma once

#include <cuspatial/constants.hpp>
#include <cuspatial/types.hpp>

#include <rmm/cuda_stream_view.hpp>
#include <rmm/exec_policy.hpp>
Expand Down
1 change: 0 additions & 1 deletion cpp/include/cuspatial/experimental/detail/haversine.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

#include <cuspatial/constants.hpp>
#include <cuspatial/error.hpp>
#include <cuspatial/types.hpp>
#include <cuspatial/utility/vec_2d.hpp>

#include <rmm/cuda_stream_view.hpp>
Expand Down
2 changes: 0 additions & 2 deletions cpp/include/cuspatial/experimental/type_utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
* limitations under the License.
*/

#include <cuspatial/types.hpp>

#include <thrust/iterator/transform_iterator.h>
#include <thrust/iterator/transform_output_iterator.h>
#include <thrust/iterator/zip_iterator.h>
Expand Down
55 changes: 0 additions & 55 deletions cpp/include/cuspatial/types.hpp
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion cpp/include/cuspatial/utility/vec_2d.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
*/

#pragma once
#include <cuspatial/types.hpp>

#include <cuspatial/cuda_utils.hpp>

namespace cuspatial {

Expand Down
1 change: 0 additions & 1 deletion cpp/include/doxygen_groups.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@
* @defgroup cuspatial_types Types
* @{
* @brief Type declarations for cuspatial
* @file types.hpp
* @file vec_2d.hpp
*
* @defgroup type_factories Factory Methods
Expand Down
1 change: 0 additions & 1 deletion cpp/src/spatial/haversine.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include <cuspatial/error.hpp>
#include <cuspatial/experimental/haversine.cuh>
#include <cuspatial/experimental/type_utils.hpp>
#include <cuspatial/types.hpp>

#include <cudf/column/column.hpp>
#include <cudf/column/column_view.hpp>
Expand Down
1 change: 0 additions & 1 deletion cpp/tests/experimental/spatial/coordinate_transform_test.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

#include <cuspatial/error.hpp>
#include <cuspatial/experimental/coordinate_transform.cuh>
#include <cuspatial/types.hpp>

#include <rmm/device_vector.hpp>

Expand Down
1 change: 0 additions & 1 deletion cpp/tests/experimental/spatial/haversine_test.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

#include <cuspatial/error.hpp>
#include <cuspatial/experimental/haversine.cuh>
#include <cuspatial/types.hpp>

#include <rmm/device_vector.hpp>

Expand Down