Skip to content

Commit

Permalink
Update minimum CMake version (NVIDIA#1037)
Browse files Browse the repository at this point in the history
* Set minimum CMake version to 3.21

Stop linking to nvtx.

Signed-off-by: Tim Moon <[email protected]>

* Update .github/workflows/build.yml

Co-authored-by: Kirthi Shankar Sivamani <[email protected]>
Signed-off-by: Tim Moon <[email protected]>

* Revert Python version to 3.9

Signed-off-by: Tim Moon <[email protected]>

---------

Signed-off-by: Tim Moon <[email protected]>
Signed-off-by: Tim Moon <[email protected]>
Co-authored-by: Kirthi Shankar Sivamani <[email protected]>
  • Loading branch information
timmoon10 and ksivaman authored Jul 24, 2024
1 parent 5ee9817 commit 9edcaf0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ jobs:
- name: 'Dependencies'
run: |
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'
uses: actions/checkout@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def setup_requirements() -> Tuple[List[str], List[str], List[str]]:

# Requirements that may be installed outside of Python
if not found_cmake():
setup_reqs.append("cmake>=3.18")
setup_reqs.append("cmake>=3.21")
if not found_ninja():
setup_reqs.append("ninja")
if not found_pybind11():
Expand Down
5 changes: 2 additions & 3 deletions transformer_engine/common/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# See LICENSE for license information.

cmake_minimum_required(VERSION 3.18)
cmake_minimum_required(VERSION 3.21)

if(NOT DEFINED CMAKE_CUDA_ARCHITECTURES)
set(CMAKE_CUDA_ARCHITECTURES 70 80 89 90)
Expand All @@ -18,7 +18,7 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
set(CMAKE_CUDA_FLAGS_DEBUG "${CMAKE_CUDA_FLAGS_DEBUG} -G")
endif()

find_package(CUDAToolkit REQUIRED cublas nvToolsExt)
find_package(CUDAToolkit REQUIRED)

# Check for cuDNN frontend API
set(CUDNN_FRONTEND_INCLUDE_DIR
Expand Down Expand Up @@ -79,7 +79,6 @@ target_link_libraries(transformer_engine PUBLIC
CUDA::cuda_driver
CUDA::cudart
CUDA::nvrtc
CUDA::nvToolsExt
CUDNN::cudnn)
target_include_directories(transformer_engine PRIVATE
${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES})
Expand Down

0 comments on commit 9edcaf0

Please sign in to comment.