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

Refactor Hausdorff distance to header-only API #538

Merged
merged 112 commits into from
Jun 23, 2022
Merged
Changes from 1 commit
Commits
Show all changes
112 commits
Select commit Hold shift + click to select a range
314580d
Create header-only refactoring of cuspatial::haversine_distance
harrism Jan 19, 2022
0736356
Merge branch 'branch-22.04' into fea-header-only-haversine
harrism Jan 19, 2022
5830b66
Apply suggestions from code review
harrism Jan 20, 2022
4c16cd6
require RandomAccessIterator
harrism Jan 20, 2022
7580661
Merge branch 'fea-header-only-haversine' of github.com:harrism/cuspat…
harrism Jan 20, 2022
073e2d7
Convert haversine API to use AOS inputs.
harrism Feb 16, 2022
e37d61e
Revert cosmetic changes to top-level haversine.hpp
harrism Feb 16, 2022
9d8e3eb
Align location_2d and remove unused location_3d and coord_2d.
harrism Feb 16, 2022
7f2bbad
__device__ only
harrism Feb 16, 2022
2448677
"" --> <>
harrism Feb 16, 2022
0d954e0
Remove unused macro.
harrism Feb 16, 2022
7d100dc
Add refactoring guide.
harrism Mar 30, 2022
daa82a8
Add refactoring guide.
harrism Mar 30, 2022
c4ba1f7
Merge branch 'branch-22.04' into fea-header-only-haversine
harrism Mar 31, 2022
454d967
Add fancy iterator test
harrism Mar 31, 2022
a5dab4a
Merge branch 'branch-22.06' into fea-header-only-haversine
harrism Mar 31, 2022
08dfe95
.hpp->.cuh
harrism Mar 31, 2022
e373065
Add note about not making tests depend on libcudf_test
harrism Mar 31, 2022
49bb466
lonlat_to_cartesian declaration
harrism Apr 5, 2022
3ae133e
gitignore
harrism Apr 5, 2022
f8947eb
Add missing include and @
harrism Apr 5, 2022
564cc4c
Don't hide the stream parameter in the detail layer.
harrism Apr 5, 2022
8b3edae
Merge branch 'fea-header-only-haversine' into fea-header-only-coordin…
harrism Apr 5, 2022
9e7c8f0
Stream parameter
harrism Apr 5, 2022
4a6976e
header cleanup
harrism Apr 5, 2022
048df0d
Implementation progress (not working)
harrism Apr 6, 2022
c208144
Simplify coordinate types to a single vec_2d
harrism Apr 7, 2022
67ab7b7
Merge branch 'fea-header-only-haversine' into fea-header-only-coordin…
harrism Apr 7, 2022
45953e6
lonlat_to_cartesian refactored and new tests added
harrism Apr 7, 2022
21db279
Clean up haversine_test.cu includes
harrism Apr 7, 2022
66a7e1f
Merge branch 'fea-header-only-haversine' into fea-header-only-coordin…
harrism Apr 7, 2022
be1226c
type-safe vectors
harrism Apr 26, 2022
8134f12
Fix typo
harrism Apr 26, 2022
42f909e
vec_2d --> lonlat_2d in docs
harrism Apr 26, 2022
e5cb703
Merge branch 'branch-22.06' into fea-header-only-haversine
harrism Apr 26, 2022
7939b15
Merge branch 'fea-header-only-haversine' into fea-header-only-coordin…
harrism Apr 26, 2022
213299b
Update for type-safe vector types
harrism Apr 26, 2022
0b78d87
Review suggestions
harrism Apr 27, 2022
c6a392c
Merge branch 'fea-header-only-haversine' into fea-header-only-coordin…
harrism Apr 27, 2022
17569c6
Clarified documentation / refactoring guide.
harrism Apr 27, 2022
d5ef3b7
style
harrism Apr 28, 2022
2acba65
Merge branch 'fea-header-only-haversine' into fea-header-only-coordin…
harrism Apr 28, 2022
4883664
Merge branch 'branch-22.06' into fea-header-only-coordinate-transform
harrism Apr 28, 2022
7af5673
hausdorff header
harrism May 3, 2022
ae8ba04
.hpp --> .cuh
harrism May 3, 2022
f863e61
Doc fix
harrism May 3, 2022
4f859ba
Document template parameters and preconditions
harrism May 3, 2022
2c42845
header-only Implementation
harrism May 3, 2022
434cbe9
Explicit lonlat_2d<T> type.
harrism May 4, 2022
6858cc4
Merge branch 'fea-header-only-coordinate-transform' into fea-header-o…
harrism May 5, 2022
50146a8
Initial conversion, passes compilation and test
isVoid May 12, 2022
1861dc9
Add docstring
isVoid May 13, 2022
0d5dc94
Add RAI specification
isVoid May 13, 2022
ca54b2c
add default stream parameter
isVoid May 13, 2022
a427af6
Add first test and cast references around.
isVoid May 13, 2022
2c6ec85
Add more tests
isVoid May 13, 2022
9958f48
fix offset arrays
isVoid May 16, 2022
dc944c5
fix wrong gtest binary name
isVoid May 16, 2022
e36186a
Add precommit hooks and script for cmake format/lint
isVoid May 16, 2022
62aa1ad
update with optimized code
isVoid May 17, 2022
af38652
remove dependency on cudf atomics
isVoid May 17, 2022
ae11443
regroup includes
isVoid May 17, 2022
79d57aa
Use size_t as index type.
isVoid May 18, 2022
e2a3db7
some fixes on tests
isVoid May 18, 2022
a1512d8
Revert cmake-format and precommit hooks
isVoid May 18, 2022
9b1687c
Remove `Cart2dA` and `Cart2dB`
isVoid May 18, 2022
dea41f1
Documentation update
isVoid May 18, 2022
270cfe2
Style fix
isVoid May 18, 2022
37fe51e
Update to use latest vec_2d changes.
harrism May 19, 2022
815a00b
Improve vec_2d documentation
harrism May 19, 2022
2204661
Merge branch 'fea-header-only-coordinate-transform' into fea-header-o…
harrism May 19, 2022
cb5d301
fix broken compile
isVoid May 19, 2022
183c10c
Removes `device_atomics` usage
isVoid May 19, 2022
b2fbaad
Add `internal` marker to internal docstrings.
isVoid May 19, 2022
1752485
Move derived traits to traits.hpp
isVoid May 19, 2022
fe83ea2
add back raw_reference_cast
isVoid May 19, 2022
eebb9d6
Add libcudacxx cmake dependency
harrism May 25, 2022
13c8144
Convert cudf-based API to use header-only API
harrism May 25, 2022
7ee9b94
Revert "Removes `device_atomics` usage"
isVoid May 25, 2022
5926bcc
add atomicMax
isVoid May 25, 2022
8194142
Address atomic operation review
isVoid May 25, 2022
4a81a5b
style
isVoid May 25, 2022
0309fd9
Revert "Address atomic operation review"
isVoid May 25, 2022
ce6280f
address device atomics reviews
isVoid May 25, 2022
2c5e8bf
inline `addr` dereference
isVoid May 25, 2022
80fceba
Reverting attempts to cast to `ll`, not `ull`
isVoid May 25, 2022
d849ce3
Add mutable requirement for OutputIterator
harrism May 26, 2022
e8fe80b
Merge branch 'branch-22.06' into feature/header_only_linestring_distance
harrism Jun 1, 2022
d441462
Document atomics
harrism Jun 1, 2022
9a15132
Remove erroneous nested std::vector
harrism Jun 1, 2022
d242701
Responds to review feedback
harrism Jun 1, 2022
2c7ee53
Merge branch 'branch-22.06' into fea-header-only-hausdorff
harrism Jun 1, 2022
bda3226
Merge branch 'feature/header_only_linestring_distance' into fea-heade…
harrism Jun 1, 2022
b9c704c
Enable multiple includes
harrism Jun 1, 2022
f8d10c4
Use deviceAtomics.cuh
harrism Jun 1, 2022
1a8132a
Merge branch 'branch-22.08' into fea-header-only-hausdorff
harrism Jun 7, 2022
7a2ee08
Implement tests for header-only API
harrism Jun 9, 2022
76280e7
Remove non-cuDF-specific tests of cuDF-based API.
harrism Jun 14, 2022
a7a318a
copyright
harrism Jun 14, 2022
d6a2955
Initial conversion, passes compilation and test
harrism Jun 21, 2022
1df7784
Remove get_libcudacxx.cmake
harrism Jun 21, 2022
f29fde4
Remove reference to types.hpp
harrism Jun 21, 2022
64a7e2a
Assert that output iterator value_type is floating point.
harrism Jun 21, 2022
c7ba2ce
Doc fixes/improvements based on review
harrism Jun 21, 2022
ff62071
Fix preconditions.
harrism Jun 21, 2022
2996a59
Remove invalid preconditions.
harrism Jun 21, 2022
76604d4
Add non-overlap precondition for coordinate_transform.
harrism Jun 21, 2022
c56a289
Improve readability with suggestion from @isVoid
harrism Jun 22, 2022
54857ba
Merge branch 'branch-22.08' into fea-header-only-hausdorff
harrism Jun 22, 2022
7535336
Fix vec_2d includes
harrism Jun 22, 2022
1636ba2
Merge branch 'branch-22.08' into fea-header-only-hausdorff
harrism Jun 23, 2022
b8766e2
Documentation and vec_2d header location fix
harrism Jun 23, 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
Clean up haversine_test.cu includes
harrism committed Apr 7, 2022
commit 21db279891f2d24bd0ddb0de7b63a53a85282b82
6 changes: 3 additions & 3 deletions cpp/tests/experimental/spatial/haversine_test.cu
Original file line number Diff line number Diff line change
@@ -14,14 +14,14 @@
* limitations under the License.
*/

#include "cuspatial/types.hpp"
#include "thrust/iterator/transform_iterator.h"
#include <cuspatial/error.hpp>
#include <cuspatial/experimental/haversine.cuh>
#include <cuspatial/types.hpp>

#include <initializer_list>
#include <rmm/device_vector.hpp>

#include <thrust/iterator/transform_iterator.h>

#include <gtest/gtest.h>

template <typename T>