diff --git a/CMakeLists.txt b/CMakeLists.txt index cd7121b39db..54464d6809c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright (c) Advanced Micro Devices, Inc., or its affiliates. # SPDX-License-Identifier: MIT -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.21) if(POLICY CMP0140) # policies CMP0140 not known to CMake until 3.25 cmake_policy(SET CMP0140 NEW) diff --git a/CMakePresets.json b/CMakePresets.json new file mode 100644 index 00000000000..f81dbadb195 --- /dev/null +++ b/CMakePresets.json @@ -0,0 +1,91 @@ +{ + "version": 3, + "cmakeMinimumRequired": { + "major": 3, + "minor": 21, + "patch": 0 + }, + "configurePresets": [ + { + "name": "use-gfx908", + "hidden": true, + "cacheVariables": { + "GPU_TARGETS": "gfx908" + } + }, + { + "name": "use-gfx90a", + "hidden": true, + "cacheVariables": { + "GPU_TARGETS": "gfx90a" + } + }, + { + "name": "use-gfx942", + "hidden": true, + "cacheVariables": { + "GPU_TARGETS": "gfx942" + } + }, + { + "name": "use-gfx950", + "hidden": true, + "cacheVariables": { + "GPU_TARGETS": "gfx950" + } + }, + { + "name": "dev", + "binaryDir": "${sourceDir}/build", + "displayName": "CK Dev", + "environment": {}, + "cacheVariables": { + "CMAKE_PREFIX_PATH": "/opt/rocm/", + "CMAKE_CXX_COMPILER": "/opt/rocm/llvm/bin/clang++", + "CMAKE_HIP_COMPILER": "/opt/rocm/llvm/bin/clang++", + "CMAKE_CXX_FLAGS": "-ftemplate-backtrace-limit=0 -fPIE -Wno-gnu-line-marker -fbracket-depth=512", + "CMAKE_BUILD_TYPE": "Release", + "BUILD_DEV": "ON", + "CMAKE_VERBOSE_MAKEFILE": "ON", + "USE_BITINT_EXTENSION_INT4": "OFF", + "GPU_TARGETS": "gfx908;gfx90a;gfx942" + } + }, + { + "name": "dev-gfx908", + "displayName": "CK Dev - gfx908", + "description": "Development build for AMD GPU gfx908", + "inherits": [ + "use-gfx908", + "dev" + ] + }, + { + "name": "dev-gfx90a", + "displayName": "CK Dev - gfx90a", + "description": "Development build for AMD GPU gfx90a", + "inherits": [ + "use-gfx90a", + "dev" + ] + }, + { + "name": "dev-gfx942", + "displayName": "CK Dev - gfx942", + "description": "Development build for AMD GPU gfx942", + "inherits": [ + "use-gfx942", + "dev" + ] + }, + { + "name": "dev-gfx950", + "displayName": "CK Dev - gfx950", + "description": "Development build for AMD GPU gfx950", + "inherits": [ + "use-gfx950", + "dev" + ] + } + ] +} \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index 2f2229c7a5f..b57638caa76 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1461,7 +1461,7 @@ pipeline { agent{ label rocmnode("gfx90a")} environment{ setup_args = "NO_CK_BUILD" - execute_args = """ ../script/cmake-ck-dev.sh ../ gfx90a && \ + execute_args = """ cmake .. --preset dev-gfx90a && \ make -j64 test_grouped_convnd_fwd_large_cases test_grouped_convnd_bwd_data_large_cases test_grouped_convnd_fwd_bias_clamp_large_cases && \ ./bin/test_grouped_convnd_fwd_large_cases && ./bin/test_grouped_convnd_bwd_data_large_cases && ./bin/test_grouped_convnd_fwd_bias_clamp_large_cases""" } @@ -1490,8 +1490,8 @@ pipeline { environment{ setup_args = "NO_CK_BUILD" execute_args = """ cd ../build && \ - ../script/cmake-ck-dev.sh ../ gfx90a && \ - make -j64 test_grouped_convnd_fwd_dataset_xdl \ + cmake .. --preset dev-gfx90a && \ + make -j64 test_grouped_convnd_fwd_dataset_xdl && \ test_grouped_convnd_bwd_data_dataset_xdl \ test_grouped_convnd_bwd_weight_dataset_xdl && \ cd ../test_data && \ diff --git a/script/cmake-ck-dev.sh b/script/cmake-ck-dev.sh index 31d724deb66..106e496bd5c 100755 --- a/script/cmake-ck-dev.sh +++ b/script/cmake-ck-dev.sh @@ -38,14 +38,4 @@ else REST_ARGS=("$@") fi -cmake \ --D CMAKE_PREFIX_PATH=/opt/rocm/ \ --D CMAKE_CXX_COMPILER=/opt/rocm/llvm/bin/clang++ \ --D CMAKE_CXX_FLAGS="-ftemplate-backtrace-limit=0 -fPIE -Wno-gnu-line-marker -fbracket-depth=512" \ --D CMAKE_BUILD_TYPE=Release \ --D BUILD_DEV=ON \ --D GPU_TARGETS="$GPU_TARGETS" \ --D CMAKE_VERBOSE_MAKEFILE:BOOL=ON \ --D USE_BITINT_EXTENSION_INT4=OFF \ -"${REST_ARGS[@]}" \ -"${MY_PROJECT_SOURCE}" +cmake "${MY_PROJECT_SOURCE}" --preset dev -DGPU_TARGETS="$GPU_TARGETS" "${REST_ARGS[@]}"