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

[REVIEW] Hiding implementation details for distance primitives (dense + sparse) #344

Merged
merged 23 commits into from
Oct 22, 2021
+740 −371
Merged

[REVIEW] Hiding implementation details for distance primitives (dense + sparse) #344

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
d4825f7
Hiding private API for dense distances primitive
cjnolet Sep 30, 2021
b9fca66
Hiding private sparse distance API
cjnolet Sep 30, 2021
a99e0f7
Updating pairwise distance base to the proper directory
cjnolet Sep 30, 2021
541117f
Fixing fused_l2_knn path
cjnolet Sep 30, 2021
6359cad
Removing internal include from knn
cjnolet Sep 30, 2021
5e17652
Builds and runs
cjnolet Oct 1, 2021
fe892e8
Removing unused include
cjnolet Oct 1, 2021
56e1257
Adding hpp
cjnolet Oct 4, 2021
a43fb5c
Removing unnecessary detail:: namespace qualifier from distances
cjnolet Oct 4, 2021
92f4c2e
Removing some more unecessry namespaces
cjnolet Oct 4, 2021
45e0b70
Style
cjnolet Oct 4, 2021
a016e36
Updates
cjnolet Oct 12, 2021
c5c0eee
Updates to distance api
cjnolet Oct 12, 2021
7c2ac23
Update
cjnolet Oct 12, 2021
5639717
Updating import
cjnolet Oct 12, 2021
b3083a3
update
cjnolet Oct 12, 2021
902bf6c
Updsates
cjnolet Oct 13, 2021
9eac45b
Updates
cjnolet Oct 13, 2021
5436bc9
Updates
cjnolet Oct 13, 2021
a1583db
Updates
cjnolet Oct 14, 2021
bd3a199
Exposing separate distance funciton w/ distance in template for parallel
cjnolet Oct 14, 2021
62781e1
Merge branch 'branch-21.12' into imp-2112-public_api
cjnolet Oct 14, 2021
d77a829
Exposing initialize function
cjnolet Oct 15, 2021
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
9 changes: 6 additions & 3 deletions cpp/include/raft/distance/canberra.cuh → ...include/raft/distance/detail/canberra.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@
*/

#pragma once
#include <raft/distance/pairwise_distance_base.cuh>
#include <raft/distance/detail/pairwise_distance_base.cuh>

namespace raft {
namespace distance {
namespace detail {

/**
* @brief the canberra distance matrix calculation implementer
Expand Down Expand Up @@ -77,8 +78,8 @@ static void canberraImpl(const DataT *x, const DataT *y, IdxT m, IdxT n, IdxT k,
pairwiseDistanceMatKernel<false, DataT, AccT, OutT, IdxT, KPolicy,
decltype(core_lambda), decltype(epilog_lambda),
FinalLambda, true>;
dim3 grid =
launchConfigGenerator<KPolicy>(m, n, KPolicy::SmemSize, canberraRowMajor);
dim3 grid = detail::launchConfigGenerator<KPolicy>(m, n, KPolicy::SmemSize,
cjnolet marked this conversation as resolved.
Show resolved Hide resolved
canberraRowMajor);

canberraRowMajor<<<grid, blk, KPolicy::SmemSize, stream>>>(
x, y, nullptr, nullptr, m, n, k, lda, ldb, ldd, dOutput, core_lambda,
Expand Down Expand Up @@ -157,5 +158,7 @@ void canberraImpl(int m, int n, int k, const InType *pA, const InType *pB,
n, m, k, lda, ldb, ldd, pB, pA, pDcast, fin_op, stream);
}
}

} // namespace detail
} // namespace distance
} // namespace raft
9 changes: 5 additions & 4 deletions cpp/include/raft/distance/chebyshev.cuh → ...nclude/raft/distance/detail/chebyshev.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
*/

#pragma once
#include <raft/distance/pairwise_distance_base.cuh>
#include <raft/distance/detail/pairwise_distance_base.cuh>

namespace raft {
namespace distance {

namespace detail {
/**
* @brief the Chebyshev distance matrix calculation implementer
* It computes the following equation: cij = max(cij, op(ai-bj))
Expand Down Expand Up @@ -85,8 +85,8 @@ static void chebyshevImpl(const DataT *x, const DataT *y, IdxT m, IdxT n,
pairwiseDistanceMatKernel<false, DataT, AccT, OutT, IdxT, KPolicy,
decltype(core_lambda), decltype(epilog_lambda),
FinalLambda, false>;
dim3 grid = launchConfigGenerator<KPolicy>(m, n, KPolicy::SmemSize,
chebyshevColMajor);
dim3 grid = detail::launchConfigGenerator<KPolicy>(m, n, KPolicy::SmemSize,
cjnolet marked this conversation as resolved.
Show resolved Hide resolved
chebyshevColMajor);
chebyshevColMajor<<<grid, blk, KPolicy::SmemSize, stream>>>(
x, y, nullptr, nullptr, m, n, k, lda, ldb, ldd, dOutput, core_lambda,
epilog_lambda, fin_op);
Expand Down Expand Up @@ -154,5 +154,6 @@ void chebyshevImpl(int m, int n, int k, const InType *pA, const InType *pB,
n, m, k, lda, ldb, ldd, pB, pA, pDcast, fin_op, stream);
}
}
} // namespace detail
} // namespace distance
} // namespace raft
9 changes: 6 additions & 3 deletions cpp/include/raft/distance/correlation.cuh → ...lude/raft/distance/detail/correlation.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@

#pragma once
#include <raft/cuda_utils.cuh>
#include <raft/distance/pairwise_distance_base.cuh>
#include <raft/distance/detail/pairwise_distance_base.cuh>
#include <raft/linalg/reduce.cuh>

namespace raft {
namespace distance {
namespace detail {

/**
* @brief the Correlation distance matrix:
Expand Down Expand Up @@ -134,8 +135,8 @@ static void correlationImpl(const DataT *x, const DataT *y, const DataT *xn,
pairwiseDistanceMatKernel<true, DataT, AccT, OutT, IdxT, KPolicy,
decltype(core_lambda), decltype(epilog_lambda),
FinalLambda, false>;
dim3 grid = launchConfigGenerator<KPolicy>(m, n, KPolicy::SmemSize,
correlationColMajor);
dim3 grid = detail::launchConfigGenerator<KPolicy>(m, n, KPolicy::SmemSize,
cjnolet marked this conversation as resolved.
Show resolved Hide resolved
correlationColMajor);
correlationColMajor<<<grid, blk, shmemSize, stream>>>(
x, y, xn, yn, m, n, k, lda, ldb, ldd, dOutput, core_lambda, epilog_lambda,
fin_op);
Expand Down Expand Up @@ -243,5 +244,7 @@ void correlationImpl(int m, int n, int k, const InType *pA, const InType *pB,
fin_op, stream);
}
}

} // namespace detail
} // namespace distance
} // namespace raft
7 changes: 5 additions & 2 deletions cpp/include/raft/distance/cosine.cuh → cpp/include/raft/distance/detail/cosine.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@

#pragma once

#include <raft/distance/pairwise_distance_base.cuh>
#include <raft/distance/detail/pairwise_distance_base.cuh>
#include <raft/linalg/norm.cuh>

namespace raft {
namespace distance {
namespace detail {

/**
* @brief the cosine distance matrix calculation implementer
Expand Down Expand Up @@ -98,7 +99,8 @@ void cosineImpl(const DataT *x, const DataT *y, const DataT *xn,
pairwiseDistanceMatKernel<true, DataT, AccT, OutT, IdxT, KPolicy,
decltype(core_lambda), decltype(epilog_lambda),
FinalLambda, false>;
dim3 grid = launchConfigGenerator<KPolicy>(m, n, shmemSize, cosineColMajor);
dim3 grid =
cjnolet marked this conversation as resolved.
Show resolved Hide resolved
detail::launchConfigGenerator<KPolicy>(m, n, shmemSize, cosineColMajor);
cosineColMajor<<<grid, blk, shmemSize, stream>>>(
x, y, xn, yn, m, n, k, lda, ldb, ldd, dOutput, core_lambda, epilog_lambda,
fin_op);
Expand Down Expand Up @@ -201,5 +203,6 @@ void cosineAlgo1(Index_ m, Index_ n, Index_ k, const InType *pA,
}
}

}; // end namespace detail
}; // end namespace distance
}; // end namespace raft
Loading