Unverified Commit 9edcaf0e authored by Tim Moon's avatar Tim Moon Committed by GitHub
Browse files

Update minimum CMake version (#1037)



* Set minimum CMake version to 3.21

Stop linking to nvtx.
Signed-off-by: default avatarTim Moon <tmoon@nvidia.com>

* Update .github/workflows/build.yml
Co-authored-by: default avatarKirthi Shankar Sivamani <ksivamani@nvidia.com>
Signed-off-by: default avatarTim Moon <4406448+timmoon10@users.noreply.github.com>

* Revert Python version to 3.9
Signed-off-by: default avatarTim Moon <4406448+timmoon10@users.noreply.github.com>

---------
Signed-off-by: default avatarTim Moon <tmoon@nvidia.com>
Signed-off-by: default avatarTim Moon <4406448+timmoon10@users.noreply.github.com>
Co-authored-by: default avatarKirthi Shankar Sivamani <ksivamani@nvidia.com>
parent 5ee98175
...@@ -18,7 +18,8 @@ jobs: ...@@ -18,7 +18,8 @@ jobs:
- name: 'Dependencies' - name: 'Dependencies'
run: | run: |
apt-get update apt-get update
apt-get install -y git python3.9 pip cmake ninja-build cudnn9-cuda-12 apt-get install -y git python3.9 pip ninja-build cudnn9-cuda-12
pip install cmake==3.21.0
- name: 'Checkout' - name: 'Checkout'
uses: actions/checkout@v3 uses: actions/checkout@v3
with: with:
......
...@@ -68,7 +68,7 @@ def setup_requirements() -> Tuple[List[str], List[str], List[str]]: ...@@ -68,7 +68,7 @@ def setup_requirements() -> Tuple[List[str], List[str], List[str]]:
# Requirements that may be installed outside of Python # Requirements that may be installed outside of Python
if not found_cmake(): if not found_cmake():
setup_reqs.append("cmake>=3.18") setup_reqs.append("cmake>=3.21")
if not found_ninja(): if not found_ninja():
setup_reqs.append("ninja") setup_reqs.append("ninja")
if not found_pybind11(): if not found_pybind11():
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# #
# See LICENSE for license information. # See LICENSE for license information.
cmake_minimum_required(VERSION 3.18) cmake_minimum_required(VERSION 3.21)
if(NOT DEFINED CMAKE_CUDA_ARCHITECTURES) if(NOT DEFINED CMAKE_CUDA_ARCHITECTURES)
set(CMAKE_CUDA_ARCHITECTURES 70 80 89 90) set(CMAKE_CUDA_ARCHITECTURES 70 80 89 90)
...@@ -18,7 +18,7 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug") ...@@ -18,7 +18,7 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
set(CMAKE_CUDA_FLAGS_DEBUG "${CMAKE_CUDA_FLAGS_DEBUG} -G") set(CMAKE_CUDA_FLAGS_DEBUG "${CMAKE_CUDA_FLAGS_DEBUG} -G")
endif() endif()
find_package(CUDAToolkit REQUIRED cublas nvToolsExt) find_package(CUDAToolkit REQUIRED)
# Check for cuDNN frontend API # Check for cuDNN frontend API
set(CUDNN_FRONTEND_INCLUDE_DIR set(CUDNN_FRONTEND_INCLUDE_DIR
...@@ -79,7 +79,6 @@ target_link_libraries(transformer_engine PUBLIC ...@@ -79,7 +79,6 @@ target_link_libraries(transformer_engine PUBLIC
CUDA::cuda_driver CUDA::cuda_driver
CUDA::cudart CUDA::cudart
CUDA::nvrtc CUDA::nvrtc
CUDA::nvToolsExt
CUDNN::cudnn) CUDNN::cudnn)
target_include_directories(transformer_engine PRIVATE target_include_directories(transformer_engine PRIVATE
${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}) ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES})
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment