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

Add Header Only API pairwise_linestring_intersection #852

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
12ce052
Initial port from feature/intersection_dev
isVoid Nov 22, 2022
7310405
More porting from range/ref objects and passing compilation
isVoid Nov 22, 2022
727a51f
header cleanup
isVoid Nov 22, 2022
4b2edee
style
isVoid Nov 22, 2022
01bc3a0
initial porting
isVoid Nov 23, 2022
6a7c0d2
rename with find
isVoid Nov 23, 2022
dfa1ce9
initial port from dev branch
isVoid Nov 23, 2022
bb5e0d4
Merge branch 'branch-23.02' of https://github.com/rapidsai/cuspatial …
isVoid Nov 27, 2022
99ed507
Merge branch 'branch-23.02' of https://github.com/rapidsai/cuspatial …
isVoid Nov 28, 2022
4d6617b
Merge branch 'branch-23.02' of https://github.com/rapidsai/cuspatial …
isVoid Nov 28, 2022
50e56ee
add docs for range
isVoid Nov 29, 2022
41da8e0
add docs for properties and methods
isVoid Nov 29, 2022
c6dc62c
update with constant integer range usage
isVoid Nov 29, 2022
8666629
use array access operator instead of pointer arithmetic
isVoid Nov 29, 2022
3cdf65c
Revert "update with constant integer range usage"
isVoid Nov 29, 2022
3d3b312
use unique_ptr for all non-temporary, owning objects
isVoid Dec 2, 2022
8534f17
style
isVoid Dec 2, 2022
7aa0aa0
add error handling
isVoid Dec 2, 2022
eaf22b4
add error handling
isVoid Dec 2, 2022
2482d25
Merge branch 'branch-23.02' of https://github.com/rapidsai/cuspatial …
isVoid Dec 5, 2022
f1731fe
address reviews
isVoid Dec 5, 2022
403b890
add more basic tests
isVoid Dec 5, 2022
279a50b
Merge branch 'branch-23.02' of https://github.com/rapidsai/cuspatial …
isVoid Dec 6, 2022
25e3496
apply review comments
isVoid Dec 7, 2022
500de19
address reviews
isVoid Dec 7, 2022
736c3f1
Merge branch 'branch-23.02' of https://github.com/rapidsai/cuspatial …
isVoid Dec 8, 2022
3450882
use segment methods
isVoid Dec 8, 2022
c9a7e89
zero initialize array in kernel
isVoid Dec 8, 2022
83f9b1a
simplify tests
isVoid Dec 8, 2022
2170e84
undef test macro
isVoid Dec 8, 2022
16c6a42
Use new macro
isVoid Dec 8, 2022
bfdd6bb
remove duplicate definition of segment arrays
isVoid Dec 8, 2022
877a12f
adding new bottom-up traverse helper; use ephemeral atomic_ref object
isVoid Dec 8, 2022
44b68de
add enumerate_range
isVoid Dec 9, 2022
975bda9
more adding to the enumerate range
isVoid Dec 9, 2022
c58cd33
a new zero data helper
isVoid Dec 9, 2022
bb1d792
Update cpp/include/doxygen_groups.h
isVoid Dec 9, 2022
9a82805
refactor tests to remove duplicates
isVoid Dec 9, 2022
8aef773
initial port from dev branch
isVoid Dec 10, 2022
a5ab622
replace wording: stencil with flag
isVoid Dec 10, 2022
40ee156
compile intersection tests
isVoid Dec 10, 2022
2bb7d7b
Merge branch 'feature/merge_segment_pr' into feature/header_only_inte…
isVoid Dec 10, 2022
6bbf858
Merge branch 'feature/merge_point_on_segment_pr' into feature/header_…
isVoid Dec 10, 2022
8ee7d5a
refactor tests to make simpler
isVoid Dec 10, 2022
5e490ba
revert comments https://github.com/rapidsai/cuspatial/pull/819#discus…
isVoid Dec 12, 2022
ba55a15
Merge branch 'feature/merge_point_on_segment_pr' into feature/header_…
isVoid Dec 12, 2022
ed85fac
fix bug in count
isVoid Dec 12, 2022
8f800a8
Merge branch 'branch-23.02' of https://github.com/rapidsai/cuspatial …
isVoid Dec 13, 2022
5c0ecc2
Revert "fix bug in count"
isVoid Dec 13, 2022
42c9b6f
Merge branch 'branch-23.02' of https://github.com/rapidsai/cuspatial …
isVoid Dec 13, 2022
8a9e70e
Update docstrings
isVoid Dec 14, 2022
3e4bcc1
Update cpp/tests/experimental/spatial/linestring_intersection_interme…
isVoid Dec 14, 2022
0c239dd
Merge branch 'feature/header_only_intersection/pr' of github.com:isVo…
isVoid Dec 14, 2022
eb4f767
Merge branch 'branch-23.02' of https://github.com/rapidsai/cuspatial …
isVoid Dec 14, 2022
c1efe0e
Merge branch 'branch-23.02' of https://github.com/rapidsai/cuspatial …
isVoid Dec 14, 2022
7613da1
remove bad merge function
isVoid Dec 15, 2022
fec6bef
remove bad merge function
isVoid Dec 15, 2022
3b11670
Add sorting function to intersection results
isVoid Dec 15, 2022
44faadf
rename find_point->find_points
isVoid Dec 15, 2022
30cfe9b
add more combinations to test and refactors
isVoid Dec 15, 2022
4472a7a
Merge branch 'branch-23.02' of https://github.com/rapidsai/cuspatial …
isVoid Dec 15, 2022
45a1f0f
fix broken builds
isVoid Dec 15, 2022
0de15d3
fix typo in intersection_util
isVoid Dec 16, 2022
9d14f27
remove stale include
isVoid Dec 16, 2022
3404d55
some print utility updates
isVoid Dec 16, 2022
940674c
remove synchronize
isVoid Dec 16, 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
Prev Previous commit
Next Next commit
some print utility updates
  • Loading branch information
isVoid committed Dec 16, 2022
commit 3404d55d8b40cce0bb5899f01527212f02549b34
7 changes: 7 additions & 0 deletions cpp/include/cuspatial/experimental/geometry/segment.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include <cuspatial/cuda_utils.hpp>
#include <cuspatial/vec_2d.hpp>

#include <iostream>
namespace cuspatial {

/**
Expand Down Expand Up @@ -48,6 +49,12 @@ class alignas(sizeof(Vertex)) segment {

/// Return the geometric center of segment.
Vertex CUSPATIAL_HOST_DEVICE center() const { return midpoint(v1, v2); }

private:
friend std::ostream& operator<<(std::ostream& os, segment<T> const& seg)
{
return os << seg.v1 << " -> " << seg.v2;
}
};

// deduction guide, enables CTAD
Expand Down
22 changes: 0 additions & 22 deletions cpp/include/cuspatial_test/test_util.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -100,27 +100,5 @@ void print_device_range(Iter begin,
std::cout << post;
}

/**
* @brief Print a range of device-side data.
*
* @note Copies the data range to host before printing.
*
* @tparam Iter Iterator to device data
* @param begin The beginning of the range to print
* @param end The end of the range to print
* @param pre String to print before the device data range
* @param post String to print after the device data range
*/
template <typename Vector>
void print_device_vector(Vector& v, std::string_view pre = "", std::string_view post = "\n")
{
using T = typename Vector::value_type;
auto hvec = to_host<T>(v);

std::cout << pre;
std::for_each(hvec.begin(), hvec.end(), [](auto const& x) { std::cout << x << " "; });
std::cout << post;
}

} // namespace test
} // namespace cuspatial