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

Update to CMake 3.26.4 #5464

Merged
merged 2 commits into from
Jun 13, 2023
Merged

Update to CMake 3.26.4 #5464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81788a4
Update to CMake 3.26.4
vyasr Jun 8, 2023
e92ba91
Fix remaining cases
vyasr Jun 8, 2023
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
2 changes: 1 addition & 1 deletion BUILD.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ To install cuML from source, ensure the following dependencies are met:

1. [cuDF](https://github.com/rapidsai/cudf) (Same as cuML Version)
2. zlib
3. cmake (>= 3.23.1)
3. cmake (>= 3.26.4)
4. CUDA (>= 11+)
5. Cython (>= 0.29)
6. gcc (>= 9.0)
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-118_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ channels:
- nvidia
dependencies:
- c-compiler
- cmake>=3.23.1,!=3.25.0
- cmake>=3.26.4
- cuda-python>=11.7.1,<12.0
- cudatoolkit=11.8
- cudf==23.8.*
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/cpp_all_cuda-118_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ channels:
- nvidia
dependencies:
- c-compiler
- cmake>=3.23.1,!=3.25.0
- cmake>=3.26.4
- cudatoolkit=11.8
- cxx-compiler
- gcc_linux-64=11.*
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/cuml/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ cuda_compiler:
- nvcc

cmake_version:
- ">=3.23.1,!=3.25.0"
- ">=3.26.4"

sysroot_version:
- "=2.17"
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/libcuml/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ sysroot_version:
- "=2.17"

cmake_version:
- ">=3.23.1,!=3.25.0"
- ">=3.26.4"

treelite_version:
- "=3.2.0"
Expand Down
2 changes: 1 addition & 1 deletion cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# limitations under the License.
#=============================================================================

cmake_minimum_required(VERSION 3.23.1 FATAL_ERROR)
cmake_minimum_required(VERSION 3.26.4 FATAL_ERROR)

include(../fetch_rapids.cmake)

Expand Down
2 changes: 1 addition & 1 deletion cpp/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ The `test` directory has subdirectories that reflect this distinction between th
## Setup
### Dependencies

1. cmake (>= 3.23.1)
1. cmake (>= 3.26.4)
2. CUDA (>= 11.0)
3. gcc (>=9.3.0)
4. clang-format (= 16.0.1) - enforces uniform C++ coding style; required to build cuML from source. The packages `clang=16` and `clang-tools=16` 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.
Expand Down
2 changes: 1 addition & 1 deletion cpp/examples/dbscan/CMakeLists_standalone.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
cmake_minimum_required(VERSION 3.23.1 FATAL_ERROR)
cmake_minimum_required(VERSION 3.26.4 FATAL_ERROR)
project(dbscan_example LANGUAGES CXX CUDA)

set(CMAKE_CXX_STANDARD 17)
Expand Down
2 changes: 1 addition & 1 deletion cpp/examples/kmeans/CMakeLists_standalone.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
cmake_minimum_required(VERSION 3.23.1 FATAL_ERROR)
cmake_minimum_required(VERSION 3.26.4 FATAL_ERROR)
project(kmeans_example LANGUAGES CXX CUDA)

set(CMAKE_CXX_STANDARD 17)
Expand Down
2 changes: 1 addition & 1 deletion dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ dependencies:
common:
- output_types: [conda, requirements, pyproject]
packages:
- cmake>=3.23.1,!=3.25.0
- cmake>=3.26.4
- ninja
- output_types: conda
packages:
Expand Down
2 changes: 1 addition & 1 deletion python/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# the License.
# =============================================================================

cmake_minimum_required(VERSION 3.23.1 FATAL_ERROR)
cmake_minimum_required(VERSION 3.26.4 FATAL_ERROR)

include(../fetch_rapids.cmake)

Expand Down
2 changes: 1 addition & 1 deletion python/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

[build-system]
requires = [
"cmake>=3.23.1,!=3.25.0",
"cmake>=3.26.4",
"cuda-python>=11.7.1,<12.0",
"cython>=0.29,<0.30",
"ninja",
Expand Down