-
Notifications
You must be signed in to change notification settings - Fork 236
Native row-major PCA #3036
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
Open
aamijar
wants to merge
3
commits into
NVIDIA:main
Choose a base branch
from
aamijar:pca-row-major
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+316
−101
Open
Native row-major PCA #3036
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -98,29 +98,41 @@ void trunc_comp_exp_vars(raft::resources const& handle, | |
|
|
||
| /** | ||
| * @brief perform fit operation for PCA. | ||
| * | ||
| * Supports both row-major and col-major input layouts via the LayoutPolicy template | ||
| * parameter. The output `components` matrix has the same layout as the input. | ||
| * | ||
| * @tparam math_t element type | ||
| * @tparam idx_t index type | ||
| * @tparam LayoutPolicy layout of the input matrix (raft::row_major or raft::col_major) | ||
| * @param[in] handle: raft::resources | ||
| * @param[in] prms: PCA parameters (n_components, algorithm, whiten, etc.) | ||
| * @param[inout] input: the data is fitted to PCA. Size n_rows x n_cols (col-major). | ||
| * @param[out] components: the principal components. Size n_components x n_cols (col-major). | ||
| * @param[inout] input: the data is fitted to PCA. Size n_rows x n_cols. | ||
| * @param[out] components: the principal components. Size n_components x n_cols. | ||
| * @param[out] explained_var: explained variances. Size n_components. | ||
| * @param[out] explained_var_ratio: ratio of explained to total variance. Size n_components. | ||
| * @param[out] singular_vals: singular values. Size n_components. | ||
| * @param[out] mu: mean of all features. Size n_cols. | ||
| * @param[out] noise_vars: noise variance scalar. | ||
| * @param[in] flip_signs_based_on_U whether to determine signs by U (true) or V.T (false) | ||
| */ | ||
| template <typename math_t, typename idx_t> | ||
| template <typename math_t, typename idx_t, typename LayoutPolicy> | ||
| void pca_fit(raft::resources const& handle, | ||
| const paramsPCA& prms, | ||
| raft::device_matrix_view<math_t, idx_t, raft::col_major> input, | ||
| raft::device_matrix_view<math_t, idx_t, raft::col_major> components, | ||
| raft::device_matrix_view<math_t, idx_t, LayoutPolicy> input, | ||
| raft::device_matrix_view<math_t, idx_t, LayoutPolicy> components, | ||
| raft::device_vector_view<math_t, idx_t> explained_var, | ||
| raft::device_vector_view<math_t, idx_t> explained_var_ratio, | ||
| raft::device_vector_view<math_t, idx_t> singular_vals, | ||
| raft::device_vector_view<math_t, idx_t> mu, | ||
| raft::device_scalar_view<math_t, idx_t> noise_vars, | ||
| bool flip_signs_based_on_U = false) | ||
| { | ||
| static_assert( | ||
| std::is_same_v<LayoutPolicy, raft::row_major> || std::is_same_v<LayoutPolicy, raft::col_major>, | ||
| "pca_fit: input layout must be raft::row_major or raft::col_major"); | ||
| constexpr bool input_row_major = std::is_same_v<LayoutPolicy, raft::row_major>; | ||
|
|
||
| auto stream = resource::get_cuda_stream(handle); | ||
| auto cublas_handle = raft::resource::get_cublas_handle(handle); | ||
|
|
||
|
|
@@ -134,19 +146,32 @@ void pca_fit(raft::resources const& handle, | |
| ASSERT(n_components > 0, "Parameter n_components: number of components cannot be less than one"); | ||
| ASSERT(n_components <= n_cols, "n_components cannot exceed n_cols"); | ||
|
|
||
| raft::stats::mean<false>(mu.data_handle(), input.data_handle(), n_cols, n_rows, false, stream); | ||
| raft::stats::mean<input_row_major>( | ||
| mu.data_handle(), input.data_handle(), n_cols, n_rows, false, stream); | ||
|
|
||
| auto len = static_cast<std::size_t>(n_cols * n_cols); | ||
| rmm::device_uvector<math_t> cov(len, stream); | ||
|
|
||
| raft::stats::cov<false>( | ||
| raft::stats::cov<input_row_major>( | ||
| handle, cov.data(), input.data_handle(), mu.data_handle(), n_cols, n_rows, true, true, stream); | ||
|
|
||
| // The eigendecomposition of the (symmetric) covariance matrix naturally produces a | ||
| // col-major components buffer. For row-major output we accumulate into a temporary | ||
| // and physically transpose at the end. | ||
| std::optional<raft::device_matrix<math_t, idx_t, raft::col_major>> components_col_storage; | ||
| if constexpr (input_row_major) { | ||
| components_col_storage = raft::make_device_matrix_view<...)(...); | ||
| } | ||
| math_t* components_col_data = | ||
| input_row_major ? components_col_storage->data_handle() : components.data_handle(); | ||
| auto components_col_view = raft::make_device_matrix_view<math_t, idx_t, raft::col_major>( | ||
| components_col_data, n_components, n_cols); | ||
|
|
||
| detail::trunc_comp_exp_vars( | ||
| handle, | ||
| prms, | ||
| raft::make_device_matrix_view<math_t, idx_t, raft::col_major>(cov.data(), n_cols, n_cols), | ||
| components, | ||
| components_col_view, | ||
| explained_var, | ||
| explained_var_ratio, | ||
| noise_vars, | ||
|
|
@@ -161,31 +186,52 @@ void pca_fit(raft::resources const& handle, | |
| raft::make_host_scalar_view(&scalar), | ||
| true); | ||
|
|
||
| raft::stats::meanAdd<false, true>( | ||
| raft::stats::meanAdd<input_row_major, true>( | ||
| input.data_handle(), input.data_handle(), mu.data_handle(), n_cols, n_rows, stream); | ||
|
|
||
| detail::sign_flip_components(handle, input, components, true, flip_signs_based_on_U); | ||
| detail::sign_flip_components(handle, input, components_col_view, true, flip_signs_based_on_U); | ||
|
|
||
| if constexpr (input_row_major) { | ||
| // Transpose the internal col-major (n_components x n_cols) components into the user's | ||
| // row-major (n_components x n_cols) buffer. The same memory laid out as col-major | ||
| // (n_cols x n_components) is exactly the row-major (n_components x n_cols) we want. | ||
| auto components_as_col_view = raft::make_device_matrix_view<math_t, idx_t, raft::col_major>( | ||
| components.data_handle(), n_cols, n_components); | ||
| raft::linalg::transpose(handle, components_col_view, components_as_col_view); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * @brief performs transform operation for PCA. Transforms the data to eigenspace. | ||
| * | ||
| * Supports both row-major and col-major layouts via the LayoutPolicy template parameter. | ||
| * `input`, `components`, and `trans_input` must all share the same layout. | ||
| * | ||
| * @tparam math_t element type | ||
| * @tparam idx_t index type | ||
| * @tparam LayoutPolicy layout (raft::row_major or raft::col_major) | ||
| * @param[in] handle: raft::resources | ||
| * @param[in] prms: PCA parameters (n_components, algorithm, whiten, etc.) | ||
| * @param[inout] input: the data to transform. Size n_rows x n_cols (col-major). | ||
| * @param[in] components: principal components. Size n_components x n_cols (col-major). | ||
| * @param[inout] input: the data to transform. Size n_rows x n_cols. | ||
| * @param[in] components: principal components. Size n_components x n_cols. | ||
| * @param[in] singular_vals: singular values. Size n_components. | ||
| * @param[in] mu: mean of features. Size n_cols. | ||
| * @param[out] trans_input: the transformed data. Size n_rows x n_components (col-major). | ||
| * @param[out] trans_input: the transformed data. Size n_rows x n_components. | ||
| */ | ||
| template <typename math_t, typename idx_t> | ||
| template <typename math_t, typename idx_t, typename LayoutPolicy> | ||
| void pca_transform(raft::resources const& handle, | ||
| const paramsPCA& prms, | ||
| raft::device_matrix_view<math_t, idx_t, raft::col_major> input, | ||
| raft::device_matrix_view<math_t, idx_t, raft::col_major> components, | ||
| raft::device_matrix_view<math_t, idx_t, LayoutPolicy> input, | ||
| raft::device_matrix_view<math_t, idx_t, LayoutPolicy> components, | ||
| raft::device_vector_view<math_t, idx_t> singular_vals, | ||
| raft::device_vector_view<math_t, idx_t> mu, | ||
| raft::device_matrix_view<math_t, idx_t, raft::col_major> trans_input) | ||
| raft::device_matrix_view<math_t, idx_t, LayoutPolicy> trans_input) | ||
| { | ||
| static_assert( | ||
| std::is_same_v<LayoutPolicy, raft::row_major> || std::is_same_v<LayoutPolicy, raft::col_major>, | ||
| "pca_transform: layout must be raft::row_major or raft::col_major"); | ||
| constexpr bool input_row_major = std::is_same_v<LayoutPolicy, raft::row_major>; | ||
|
|
||
| auto stream = resource::get_cuda_stream(handle); | ||
|
|
||
| auto n_rows = input.extent(0); | ||
|
|
@@ -200,49 +246,69 @@ void pca_transform(raft::resources const& handle, | |
| rmm::device_uvector<math_t> components_copy{components_len, stream}; | ||
| raft::copy(components_copy.data(), components.data_handle(), components_len, stream); | ||
|
|
||
| auto components_copy_view = raft::make_device_matrix_view<math_t, idx_t, LayoutPolicy>( | ||
| components_copy.data(), n_components, n_cols); | ||
|
Comment on lines
+249
to
+250
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why explicitly here instead of inline in the diff before this PR? |
||
|
|
||
| if (prms.whiten) { | ||
| math_t scalar = math_t(sqrt(n_rows - 1)); | ||
| raft::linalg::scalarMultiply( | ||
| components_copy.data(), components_copy.data(), scalar, components_len, stream); | ||
| raft::linalg::binary_div_skip_zero<raft::Apply::ALONG_ROWS>( | ||
| // Divide each row of (n_components x n_cols) components by the corresponding singular | ||
| // value. Apply::ALONG_COLUMNS broadcasts a vector of size n_rows-of-matrix | ||
| // (= n_components) over each column, which is the same operation in both layouts. | ||
| raft::linalg::binary_div_skip_zero<raft::Apply::ALONG_COLUMNS>( | ||
| handle, | ||
| raft::make_device_matrix_view<math_t, idx_t, raft::row_major>( | ||
| components_copy.data(), n_cols, n_components), | ||
| components_copy_view, | ||
| raft::make_device_vector_view<const math_t, idx_t>(singular_vals.data_handle(), | ||
| n_components)); | ||
| } | ||
|
|
||
| raft::stats::meanCenter<false, true>( | ||
| raft::stats::meanCenter<input_row_major, true>( | ||
| input.data_handle(), input.data_handle(), mu.data_handle(), n_cols, n_rows, stream); | ||
| detail::tsvd_transform(handle, | ||
| prms, | ||
| input, | ||
| raft::make_device_matrix_view<math_t, idx_t, raft::col_major>( | ||
| components_copy.data(), n_components, n_cols), | ||
| trans_input); | ||
| raft::stats::meanAdd<false, true>( | ||
|
|
||
| // trans_input = input @ components_copy^T, in the user's layout. | ||
| // Reinterpreting the components_copy buffer with the opposite layout swaps the logical | ||
| // dimensions, giving us the (n_cols x n_components) transposed view we need for gemm. | ||
| using transposed_layout = std::conditional_t<input_row_major, raft::col_major, raft::row_major>; | ||
| auto components_copy_transposed = raft::make_device_matrix_view<math_t, idx_t, transposed_layout>( | ||
| components_copy.data(), n_cols, n_components); | ||
| raft::linalg::gemm(handle, input, components_copy_transposed, trans_input); | ||
|
|
||
| raft::stats::meanAdd<input_row_major, true>( | ||
| input.data_handle(), input.data_handle(), mu.data_handle(), n_cols, n_rows, stream); | ||
| } | ||
|
|
||
| /** | ||
| * @brief performs inverse transform operation for PCA. | ||
| * | ||
| * Supports both row-major and col-major layouts via the LayoutPolicy template parameter. | ||
| * `trans_input`, `components`, and `output` must all share the same layout. | ||
| * | ||
| * @tparam math_t element type | ||
| * @tparam idx_t index type | ||
| * @tparam LayoutPolicy layout (raft::row_major or raft::col_major) | ||
| * @param[in] handle: raft::resources | ||
| * @param[in] prms: PCA parameters (n_components, algorithm, whiten, etc.) | ||
| * @param[in] trans_input: the transformed data. Size n_rows x n_components (col-major). | ||
| * @param[in] components: principal components. Size n_components x n_cols (col-major). | ||
| * @param[in] trans_input: the transformed data. Size n_rows x n_components. | ||
| * @param[in] components: principal components. Size n_components x n_cols. | ||
| * @param[in] singular_vals: singular values. Size n_components. | ||
| * @param[in] mu: mean of features. Size n_cols. | ||
| * @param[out] output: the reconstructed data. Size n_rows x n_cols (col-major). | ||
| * @param[out] output: the reconstructed data. Size n_rows x n_cols. | ||
| */ | ||
| template <typename math_t, typename idx_t> | ||
| template <typename math_t, typename idx_t, typename LayoutPolicy> | ||
| void pca_inverse_transform(raft::resources const& handle, | ||
| const paramsPCA& prms, | ||
| raft::device_matrix_view<math_t, idx_t, raft::col_major> trans_input, | ||
| raft::device_matrix_view<math_t, idx_t, raft::col_major> components, | ||
| raft::device_matrix_view<math_t, idx_t, LayoutPolicy> trans_input, | ||
| raft::device_matrix_view<math_t, idx_t, LayoutPolicy> components, | ||
| raft::device_vector_view<math_t, idx_t> singular_vals, | ||
| raft::device_vector_view<math_t, idx_t> mu, | ||
| raft::device_matrix_view<math_t, idx_t, raft::col_major> output) | ||
| raft::device_matrix_view<math_t, idx_t, LayoutPolicy> output) | ||
| { | ||
| static_assert( | ||
| std::is_same_v<LayoutPolicy, raft::row_major> || std::is_same_v<LayoutPolicy, raft::col_major>, | ||
| "pca_inverse_transform: layout must be raft::row_major or raft::col_major"); | ||
| constexpr bool input_row_major = std::is_same_v<LayoutPolicy, raft::row_major>; | ||
|
|
||
| auto stream = resource::get_cuda_stream(handle); | ||
|
|
||
| auto n_rows = output.extent(0); | ||
|
|
@@ -257,49 +323,55 @@ void pca_inverse_transform(raft::resources const& handle, | |
| rmm::device_uvector<math_t> components_copy{components_len, stream}; | ||
| raft::copy(components_copy.data(), components.data_handle(), components_len, stream); | ||
|
|
||
| auto components_copy_view = raft::make_device_matrix_view<math_t, idx_t, LayoutPolicy>( | ||
| components_copy.data(), n_components, n_cols); | ||
|
Comment on lines
+326
to
+327
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same as above |
||
|
|
||
| if (prms.whiten) { | ||
| math_t sqrt_n_samples = sqrt(n_rows - 1); | ||
| math_t scalar = n_rows - 1 > 0 ? math_t(1 / sqrt_n_samples) : 0; | ||
| raft::linalg::scalarMultiply( | ||
| components_copy.data(), components_copy.data(), scalar, components_len, stream); | ||
| raft::linalg::binary_mult_skip_zero<raft::Apply::ALONG_ROWS>( | ||
| raft::linalg::binary_mult_skip_zero<raft::Apply::ALONG_COLUMNS>( | ||
| handle, | ||
| raft::make_device_matrix_view<math_t, idx_t, raft::row_major>( | ||
| components_copy.data(), n_cols, n_components), | ||
| components_copy_view, | ||
| raft::make_device_vector_view<const math_t, idx_t>(singular_vals.data_handle(), | ||
| n_components)); | ||
| } | ||
|
|
||
| detail::tsvd_inverse_transform(handle, | ||
| prms, | ||
| trans_input, | ||
| raft::make_device_matrix_view<math_t, idx_t, raft::col_major>( | ||
| components_copy.data(), n_components, n_cols), | ||
| output); | ||
| raft::stats::meanAdd<false, true>( | ||
| // output = trans_input @ components_copy. All three matrices share the user's layout, | ||
| // so the mdspan gemm picks the correct cuBLAS transposes automatically. | ||
| raft::linalg::gemm(handle, trans_input, components_copy_view, output); | ||
|
|
||
| raft::stats::meanAdd<input_row_major, true>( | ||
| output.data_handle(), output.data_handle(), mu.data_handle(), n_cols, n_rows, stream); | ||
| } | ||
|
|
||
| /** | ||
| * @brief perform fit and transform operations for PCA. | ||
| * | ||
| * Supports both row-major and col-major layouts via the LayoutPolicy template parameter. | ||
| * | ||
| * @tparam math_t element type | ||
| * @tparam idx_t index type | ||
| * @tparam LayoutPolicy layout (raft::row_major or raft::col_major) | ||
| * @param[in] handle: raft::resources | ||
| * @param[in] prms: PCA parameters (n_components, algorithm, whiten, etc.) | ||
| * @param[inout] input: the data is fitted to PCA. Size n_rows x n_cols (col-major). | ||
| * @param[out] trans_input: the transformed data. Size n_rows x n_components (col-major). | ||
| * @param[out] components: the principal components. Size n_components x n_cols (col-major). | ||
| * @param[inout] input: the data is fitted to PCA. Size n_rows x n_cols. | ||
| * @param[out] trans_input: the transformed data. Size n_rows x n_components. | ||
| * @param[out] components: the principal components. Size n_components x n_cols. | ||
| * @param[out] explained_var: explained variances. Size n_components. | ||
| * @param[out] explained_var_ratio: ratio of explained to total variance. Size n_components. | ||
| * @param[out] singular_vals: singular values. Size n_components. | ||
| * @param[out] mu: mean of all features. Size n_cols. | ||
| * @param[out] noise_vars: noise variance scalar. | ||
| * @param[in] flip_signs_based_on_U whether to determine signs by U (true) or V.T (false) | ||
| */ | ||
| template <typename math_t, typename idx_t> | ||
| template <typename math_t, typename idx_t, typename LayoutPolicy> | ||
| void pca_fit_transform(raft::resources const& handle, | ||
| const paramsPCA& prms, | ||
| raft::device_matrix_view<math_t, idx_t, raft::col_major> input, | ||
| raft::device_matrix_view<math_t, idx_t, raft::col_major> trans_input, | ||
| raft::device_matrix_view<math_t, idx_t, raft::col_major> components, | ||
| raft::device_matrix_view<math_t, idx_t, LayoutPolicy> input, | ||
| raft::device_matrix_view<math_t, idx_t, LayoutPolicy> trans_input, | ||
| raft::device_matrix_view<math_t, idx_t, LayoutPolicy> components, | ||
| raft::device_vector_view<math_t, idx_t> explained_var, | ||
| raft::device_vector_view<math_t, idx_t> explained_var_ratio, | ||
| raft::device_vector_view<math_t, idx_t> singular_vals, | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
But since covar matrix is symmetric, it shouldn't matter if it's column or row layout, right? Why do we need to transpose at all?