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

[REVIEW] updated clang version to 11.0.0 #3121

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from 2 commits
Commits
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 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
- PR #3115: Speeding up MNMG UMAP testing
- PR #3112: Speed test_array
- PR #3111: Adding Cython to Code Coverage
- PR #3121: clang version updated to 11.0.0

## Bug Fixes
- PR #3065: Refactoring prims metrics function names from camelcase to underscore format
Expand Down
5 changes: 3 additions & 2 deletions cpp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ The `test` directory has subdirectories that reflect this distinction between th
2. CUDA (>= 10.0)
3. gcc (>=5.4.0)
4. BLAS - Any BLAS compatible with cmake's [FindBLAS](https://cmake.org/cmake/help/v3.14/module/FindBLAS.html). Note that the blas has to be installed to the same folder system as cmake, for example if using conda installed cmake, the blas implementation should also be installed in the conda environment.
5. clang-format (= 8.0.1) - enforces uniform C++ coding style; required to build cuML from source. The packages `clang=8` and `clang-tools=8` from the conda-forge channel should be sufficient, if you are on conda. If not using conda, install the right version using your OS package manager.
6. UCX with CUDA support [optional] (>=1.7) - enables point-to-point messaging in the cuML communicator.
5. clang-format (= 11.0.0) - enforces uniform C++ coding style; required to build cuML from source. The packages `clang=11.0.0` and `clang-tools=11.0.0` from the conda-forge channel should be sufficient, if you are on conda. If not using conda, install the right version using your OS package manager.
6. clang-tidy(= 11.0.0) - enforces uniform C++ coding standard; required to build cuML from source. Installation instructions are the same as above.
7. UCX with CUDA support [optional] (>=1.7) - enables point-to-point messaging in the cuML communicator.

### Building cuML:

Expand Down
2 changes: 1 addition & 1 deletion cpp/scripts/run-clang-format.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import tempfile


EXPECTED_VERSION = "8.0.1"
EXPECTED_VERSION = "11.0.0"
VERSION_REGEX = re.compile(r"clang-format version ([0-9.]+)")
# NOTE: populate this list with more top-level dirs as we add more of them to
# to the cuml repo
Expand Down
2 changes: 1 addition & 1 deletion cpp/scripts/run-clang-tidy.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import multiprocessing as mp


EXPECTED_VERSION = "8.0.1"
EXPECTED_VERSION = "11.0.0"
VERSION_REGEX = re.compile(r" LLVM version ([0-9.]+)")
GPU_ARCH_REGEX = re.compile(r"sm_(\d+)")
SPACES = re.compile(r"\s+")
Expand Down
2 changes: 1 addition & 1 deletion cpp/src_prims/distance/fused_l2_nn.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ struct FusedL2NN : public BaseClass {

DI void stsXY() { pipe.wait_prior<0>(); }
#endif // ENABLE_MEMCPY_ASYNC
}; // struct FusedL2NN
}; // struct FusedL2NN

template <typename DataT, typename OutT, typename IdxT, bool Sqrt,
typename Policy, typename ReduceOpT>
Expand Down
4 changes: 2 additions & 2 deletions cpp/test/sg/nvtx_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ uint32_t generateNextColor(const std::string &tag);

class nvtxNextColorTest : public ::testing::Test {
protected:
void SetUp() override {
void SetUp() override { // NOLINT
const std::string temp1 = "foo";
const std::string temp2 = "bar";

Expand All @@ -35,7 +35,7 @@ class nvtxNextColorTest : public ::testing::Test {
if (ML::generateNextColor(temp1) == ML::generateNextColor(temp1))
same_string_same_color = true;
}
void TearDown() {}

JohnZed marked this conversation as resolved.
Show resolved Hide resolved
bool diff_string_diff_color = false;
bool same_string_same_color = false;
};
Expand Down