Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/branch-25.02' into rename-test…
Browse files Browse the repository at this point in the history
…-to-tests
  • Loading branch information
bdice committed Jan 23, 2025
2 parents 0bb5825 + 1bcd5c7 commit 532215e
Show file tree
Hide file tree
Showing 54 changed files with 120 additions and 110 deletions.
3 changes: 1 addition & 2 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Cython / Python:
- 'python/**'
- 'notebooks/**'

CUDA/C++:
- 'cpp/**'

Expand All @@ -18,4 +18,3 @@ ci:

conda:
- 'conda/**'

7 changes: 6 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
---
# Copyright (c) 2023, NVIDIA CORPORATION.
# Copyright (c) 2023-2025, NVIDIA CORPORATION.

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v5.0.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- repo: https://github.com/psf/black
rev: 22.10.0
hooks:
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
identification within third-party archives.

Copyright 2018 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
Expand Down
4 changes: 2 additions & 2 deletions ci/checks/black_lists.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# Copyright (c) 2019-2023, NVIDIA CORPORATION.
# Copyright (c) 2019-2025, NVIDIA CORPORATION.
##########################################
# cuML black listed function call Tester #
##########################################
Expand Down Expand Up @@ -40,7 +40,7 @@ done

for cond_black_listed in cudaMemcpy cudaMemset; do
TMP=`git --no-pager diff --ignore-submodules -w --minimal -U0 -S"$cond_black_listed" $PR_TARGET_BRANCH | grep '^+' | grep -v '^+++' | grep -P "$cond_black_listed(?!Async)"`

if [ "$TMP" != "" ]; then
for filename in `git --no-pager diff --ignore-submodules -w --minimal --name-only -S"$cond_black_listed" $PR_TARGET_BRANCH`; do
basefilename=$(basename -- "$filename")
Expand Down
2 changes: 1 addition & 1 deletion codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ comment:
# undocumented option:
# https://community.codecov.io/t/unable-to-determine-a-parent-commit-to-compare-against-in-base-branch-after-squash-and-merge/2480/15
codecov:
allow_coverage_offsets: true
allow_coverage_offsets: true
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ dependencies:
- nbsphinx
- ninja
- nltk
- numba>=0.57
- numba>=0.59.1,<0.61.0a0
- numpy>=1.23,<3.0a0
- numpydoc
- nvcc_linux-64=11.8
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-125_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ dependencies:
- nbsphinx
- ninja
- nltk
- numba>=0.57
- numba>=0.59.1,<0.61.0a0
- numpy>=1.23,<3.0a0
- numpydoc
- packaging
Expand Down
3 changes: 1 addition & 2 deletions cpp/.clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ WarningsAsErrors: '*'
HeaderFilterRegex: ''
AnalyzeTemporaryDtors: false
FormatStyle: none
CheckOptions:
CheckOptions:
- key: cert-dcl16-c.NewSuffixes
value: 'L;LL;LU;LLU'
- key: cppcoreguidelines-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic
Expand Down Expand Up @@ -142,4 +142,3 @@ CheckOptions:
- key: readability-identifier-naming.TypedefSuffix
value: ''
...

3 changes: 1 addition & 2 deletions cpp/cmake/modules/ConfigureAlgorithms.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#=============================================================================
# Copyright (c) 2022-2024, NVIDIA CORPORATION.
# Copyright (c) 2022-2025, NVIDIA CORPORATION.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -129,4 +129,3 @@ else()
set(LINK_CUVS ON)
endif()
endif()

12 changes: 6 additions & 6 deletions cpp/examples/symreg/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# symbolic regression
This subfolder contains an example on how perform symbolic regression in cuML (from C++)
This subfolder contains an example on how perform symbolic regression in cuML (from C++)
There are two `CMakeLists.txt` in this folder:
1. `CMakeLists.txt` (default) which is included when building cuML
2. `CMakeLists_standalone.txt` as an example for a stand alone project linking to `libcuml.so`
Expand All @@ -11,7 +11,7 @@ $ cmake .. -DCUML_LIBRARY_DIR=/path/to/directory/with/libcuml.so -DCUML_INCLUDE_
```
Then build with `make` or `ninja`
```
$ make
$ make
Scanning dependencies of target raft
[ 10%] Creating directories for 'raft'
[ 20%] Performing download step (git clone) for 'raft'
Expand All @@ -28,7 +28,7 @@ Scanning dependencies of target symreg_example
[100%] Linking CUDA executable symreg_example
[100%] Built target symreg_example
```
`CMakeLists_standalone.txt` also loads a minimal set of header dependencies(namely [raft](https://github.com/rapidsai/raft) and [cub](https://github.com/NVIDIA/cub)) if they are not detected in the system.
`CMakeLists_standalone.txt` also loads a minimal set of header dependencies(namely [raft](https://github.com/rapidsai/raft) and [cub](https://github.com/NVIDIA/cub)) if they are not detected in the system.
## Run

1. Generate a toy training and test dataset
Expand All @@ -53,7 +53,7 @@ $ ./symreg_example -n_cols 2 \
-stopping_criteria 0.01 \
-p_crossover 0.7 \
-p_subtree 0.1 \
-p_hoist 0.05 \
-p_hoist 0.05 \
-p_point 0.1 \
-parsimony_coefficient 0.01
```
Expand All @@ -77,11 +77,11 @@ Finished training for 4 generations.
Best AST equation :( add( sub( mult( X0, X0) , div( X1, X1) ) , sub( X1, mult( X1, X1) ) ) )
Training time = 626.658ms
***************************************
Beginning Inference on Test dataset...
Beginning Inference on Test dataset...
Inference score on test set = 5.29271e-08
Inference time = 0.35248ms
Some Predicted test values:
-1.65061;-1.64081;-0.91711;-2.28976;-0.280688;
Corresponding Actual test values:
-1.65061;-1.64081;-0.91711;-2.28976;-0.280688;
```
```
4 changes: 2 additions & 2 deletions cpp/include/cuml/common/pinned_host_vector.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021-2023, NVIDIA CORPORATION.
* Copyright (c) 2021-2025, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -61,4 +61,4 @@ class pinned_host_vector {
std::size_t size_;
};

} // namespace ML
} // namespace ML
4 changes: 2 additions & 2 deletions cpp/include/cuml/experimental/fil/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ RAPIDS Forest Inference Library (FIL) provides accelerated inference for
tree-based machine learning models. Unlike packages like XGBoost,
LightGBM, or even Scikit-Learn/cuML's random forest implementations, FIL
cannot be used to _train_ forest models. Instead, its goal is to speed up
inference using forest models trained by all of those packages.
inference using forest models trained by all of those packages.

This directory contains an experimental new implementation of FIL which
provides both CPU and GPU execution. Its GPU implementation also offers
improved performance relative to the existing implementation in many but not all cases.
improved performance relative to the existing implementation in many but not all cases.

For Python usage information and more extensive information on
parameter-tuning and other end-user functionality, check out
Expand Down
4 changes: 2 additions & 2 deletions cpp/include/cuml/solvers/params.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, NVIDIA CORPORATION.
* Copyright (c) 2018-2025, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -33,4 +33,4 @@ enum loss_funct {

enum penalty { NONE, L1, L2, ELASTICNET };

}; // namespace ML
}; // namespace ML
4 changes: 2 additions & 2 deletions cpp/include/cuml/tsa/holtwinters_params.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019-2021, NVIDIA CORPORATION.
* Copyright (c) 2019-2025, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -46,4 +46,4 @@ struct OptimParams {

enum Norm { L0, L1, L2, LINF };

} // namespace ML
} // namespace ML
4 changes: 2 additions & 2 deletions cpp/src/dbscan/vertexdeg/pack.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018-2024, NVIDIA CORPORATION.
* Copyright (c) 2018-2025, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -65,4 +65,4 @@ struct Pack {

} // namespace VertexDeg
} // namespace Dbscan
} // namespace ML
} // namespace ML
4 changes: 2 additions & 2 deletions cpp/src/decisiontree/batched-levelalgo/bins.cuh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019-2022, NVIDIA CORPORATION.
* Copyright (c) 2019-2025, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -73,4 +73,4 @@ struct AggregateBin {
}
};
} // namespace DT
} // namespace ML
} // namespace ML
4 changes: 2 additions & 2 deletions cpp/src/genetic/constants.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, NVIDIA CORPORATION.
* Copyright (c) 2021-2025, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -28,4 +28,4 @@ const int GENE_TPB = 256;
const int MAX_STACK_SIZE = 20;

} // namespace genetic
} // namespace cuml
} // namespace cuml
4 changes: 2 additions & 2 deletions cpp/src/glm/qn/mg/glm_base_mg.cuh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2023-2024, NVIDIA CORPORATION.
* Copyright (c) 2023-2025, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -204,4 +204,4 @@ struct GLMWithDataMG : ML::GLM::detail::GLMWithData<T, GLMObjective> {
};
}; // namespace opg
}; // namespace GLM
}; // namespace ML
}; // namespace ML
4 changes: 2 additions & 2 deletions cpp/src/glm/qn/mg/standardization.cuh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2023-2024, NVIDIA CORPORATION.
* Copyright (c) 2023-2025, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -377,4 +377,4 @@ struct Standardizer {

}; // namespace opg
}; // namespace GLM
}; // namespace ML
}; // namespace ML
4 changes: 2 additions & 2 deletions cpp/src/hdbscan/detail/kernels/membership.cuh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, NVIDIA CORPORATION.
* Copyright (c) 2021-2025, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -70,4 +70,4 @@ struct probabilities_functor {
}; // namespace Membership
}; // namespace detail
}; // namespace HDBSCAN
}; // namespace ML
}; // namespace ML
4 changes: 2 additions & 2 deletions cpp/src/hdbscan/detail/kernels/stabilities.cuh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, NVIDIA CORPORATION.
* Copyright (c) 2021-2025, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -61,4 +61,4 @@ struct stabilities_functor {
}; // namespace Stability
}; // namespace detail
}; // namespace HDBSCAN
}; // namespace ML
}; // namespace ML
4 changes: 2 additions & 2 deletions cpp/src/hdbscan/detail/predict.cuh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022-2024, NVIDIA CORPORATION.
* Copyright (c) 2022-2025, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -272,4 +272,4 @@ void approximate_predict(const raft::handle_t& handle,
}; // end namespace Predict
}; // end namespace detail
}; // end namespace HDBSCAN
}; // end namespace ML
}; // end namespace ML
2 changes: 1 addition & 1 deletion cpp/src/tsne/kluger_lab_license.txt
Original file line number Diff line number Diff line change
Expand Up @@ -132,4 +132,4 @@ General Public License. (e.g. they do not require you to accompany any object
code using FFTW with the corresponding source code.) For these alternative
terms you must purchase a license from MIT’s Technology Licensing Office. Users
interested in such a license should contact us ([email protected]) for more
information.
information.
4 changes: 2 additions & 2 deletions cpp/src_prims/datasets/boston.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019-2021, NVIDIA CORPORATION.
* Copyright (c) 2019-2025, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -535,4 +535,4 @@ static const int n_features = 13;

} // namespace Boston
} // namespace Datasets
} // namespace MLCommon
} // namespace MLCommon
4 changes: 2 additions & 2 deletions cpp/src_prims/datasets/breast_cancer.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019-2021, NVIDIA CORPORATION.
* Copyright (c) 2019-2025, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -1989,4 +1989,4 @@ static const int n_features = 30;

} // namespace BreastCancer
} // namespace Datasets
} // namespace MLCommon
} // namespace MLCommon
4 changes: 2 additions & 2 deletions cpp/src_prims/datasets/diabetes.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019-2021, NVIDIA CORPORATION.
* Copyright (c) 2019-2025, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -1504,4 +1504,4 @@ static const int n_features = 10;

} // namespace Diabetes
} // namespace Datasets
} // namespace MLCommon
} // namespace MLCommon
2 changes: 1 addition & 1 deletion cpp/tests/c_api/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ To help prevent accidentally including the C-API files when compiling `libcuml++
#error \
"This header is only for the C-API and should not be included from the C++ API."
#endif
```
```
4 changes: 2 additions & 2 deletions cpp/tests/mg/kmeans_test.cu
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022-2024, NVIDIA CORPORATION.
* Copyright (c) 2022-2025, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -203,4 +203,4 @@ INSTANTIATE_TEST_CASE_P(KmeansTests, KmeansTestF, ::testing::ValuesIn(inputsf2))

INSTANTIATE_TEST_CASE_P(KmeansTests, KmeansTestD, ::testing::ValuesIn(inputsd2));

} // end namespace ML
} // end namespace ML
Loading

0 comments on commit 532215e

Please sign in to comment.