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

Moving kmeans from cuml to Raft #605

Merged
merged 37 commits into from
Jul 26, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
cfba2b2
Initial move of cuML KMeans to Raft. Add gather.cuh
lowener Mar 28, 2022
98f1030
Merge branch 'branch-22.06' into 22.06-kmeans
lowener Mar 28, 2022
73b6800
Use int by default
lowener Mar 29, 2022
6ac0087
Fix logger include
lowener Mar 31, 2022
81f8aec
Add test for kmeans
lowener Apr 4, 2022
3699dde
Fix style
lowener Apr 7, 2022
4618d37
Test raft with cuml
lowener Apr 12, 2022
19a87de
Add data constness
lowener Apr 20, 2022
109b668
Merge branch 'branch-22.06' into 22.06-kmeans
lowener Apr 20, 2022
cf372ef
Added kmeans transform, clean todos
lowener Apr 21, 2022
9a1a504
Fix style
lowener Apr 22, 2022
2ecbaef
Fix typo
lowener Apr 23, 2022
6091e44
Fix transform pairwisedistance call
lowener Apr 26, 2022
fc45d92
Fix transform metric
lowener Apr 26, 2022
1e0d582
Fix include and namespace in partition
lowener Apr 26, 2022
7436cc9
Fix comparison warning
lowener May 3, 2022
2283140
Add host_scalar and raw-pointers API
lowener May 19, 2022
ff324e8
Use distance type in params and style fix
lowener May 19, 2022
e2869c0
Merge branch 'branch-22.06' into 22.06-kmeans-continuation
lowener May 19, 2022
7772a44
Add RngState
lowener May 20, 2022
92f4839
Added const reference for kmeans detail functions
lowener May 23, 2022
0654cdb
Fix logger
lowener May 23, 2022
ffe8bef
Add todo comment for mdarray usage
lowener May 23, 2022
4a1249b
Include improvement and handle for streams
lowener May 30, 2022
570865a
Fix includes
lowener May 30, 2022
683ccd9
Initialize handle before stream
lowener May 31, 2022
f91c3b1
Improve doc and centroids as optional in fit_predict
lowener Jun 1, 2022
a1ad4ae
Merge branch 'branch-22.08' into 22.06-kmeans
cjnolet Jun 17, 2022
ca47e32
Expose kmeans functions to public API
lowener Jun 21, 2022
b78f93a
Merge branch 'branch-22.08' into 22.06-kmeans
lowener Jun 21, 2022
4972481
Fix typo
lowener Jun 28, 2022
c1e4483
Rename common file
lowener Jun 28, 2022
f48b283
Fix documentation sampleCentroids
lowener Jul 8, 2022
771210e
Fix compilation warning
lowener Jul 11, 2022
9b3868b
Fix test include
lowener Jul 11, 2022
bb14137
fix style
lowener Jul 15, 2022
3b06fd2
Merge branch 'branch-22.08' into 22.06-kmeans
lowener Jul 25, 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
1,940 changes: 1,041 additions & 899 deletions cpp/include/raft/cluster/detail/kmeans.cuh

Large diffs are not rendered by default.

683 changes: 683 additions & 0 deletions cpp/include/raft/cluster/detail/kmeans_common.cuh

Large diffs are not rendered by default.

503 changes: 465 additions & 38 deletions cpp/include/raft/cluster/kmeans.cuh

Large diffs are not rendered by default.

73 changes: 73 additions & 0 deletions cpp/include/raft/cluster/kmeans_params.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
/*
* Copyright (c) 2022, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#pragma once
#include <raft/core/logger.hpp>
#include <raft/distance/distance_type.hpp>
#include <raft/random/rng_state.hpp>

namespace raft {
namespace cluster {

struct KMeansParams {
enum InitMethod { KMeansPlusPlus, Random, Array };

// The number of clusters to form as well as the number of centroids to
// generate (default:8).
int n_clusters = 8;

/*
* Method for initialization, defaults to k-means++:
* - InitMethod::KMeansPlusPlus (k-means++): Use scalable k-means++ algorithm
* to select the initial cluster centers.
* - InitMethod::Random (random): Choose 'n_clusters' observations (rows) at
* random from the input data for the initial centroids.
* - InitMethod::Array (ndarray): Use 'centroids' as initial cluster centers.
*/
InitMethod init = KMeansPlusPlus;

// Maximum number of iterations of the k-means algorithm for a single run.
int max_iter = 300;

// Relative tolerance with regards to inertia to declare convergence.
double tol = 1e-4;

// verbosity level.
int verbosity = RAFT_LEVEL_INFO;

// Seed to the random number generator.
raft::random::RngState rng_state =
raft::random::RngState(0, raft::random::GeneratorType::GenPhilox);

// Metric to use for distance computation.
raft::distance::DistanceType metric = raft::distance::DistanceType::L2Expanded;

// Number of instance k-means algorithm will be run with different seeds.
int n_init = 1;

// Oversampling factor for use in the k-means|| algorithm.
double oversampling_factor = 2.0;

// batch_samples and batch_centroids are used to tile 1NN computation which is
// useful to optimize/control the memory footprint
// Default tile is [batch_samples x n_clusters] i.e. when batch_centroids is 0
// then don't tile the centroids
int batch_samples = 1 << 15;
int batch_centroids = 0; // if 0 then batch_centroids = n_clusters

bool inertia_check = false;
};
} // namespace cluster
} // namespace raft
2 changes: 1 addition & 1 deletion cpp/include/raft/comms/detail/ucp_helper.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class ucp_request {
};

// by default, match the whole tag
static const ucp_tag_t default_tag_mask = -1;
static const ucp_tag_t default_tag_mask = (ucp_tag_t)-1;

/**
* @brief Asynchronous send callback sets request to completed
Expand Down
5 changes: 5 additions & 0 deletions cpp/include/raft/core/logger.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
*/
#pragma once

#ifndef __RAFT_RT_LOGGER
#define __RAFT_RT_LOGGER

#include <stdarg.h>

#include <algorithm>
Expand Down Expand Up @@ -315,3 +318,5 @@ class logger {
#define RAFT_LOG_CRITICAL(fmt, ...) void(0)
#endif
/** @} */

#endif
Loading