From de0d9fa465c5b159fa14e5297800ce9e22f76198 Mon Sep 17 00:00:00 2001 From: David Galiffi Date: Tue, 5 Nov 2024 20:07:26 -0500 Subject: [PATCH] Update internal CMake files to match with cmake_minimum_requred(VERSION 3.18.4) This was the latest version used all the project's cmake_minimum_required definitions. Signed-off-by: David Galiffi --- .github/workflows/opensuse.yml | 5 +++-- .github/workflows/redhat.yml | 5 +++-- .github/workflows/ubuntu-focal.yml | 18 +++++++++++------- .github/workflows/ubuntu-jammy.yml | 5 +++-- CMakeLists.txt | 2 +- examples/CMakeLists.txt | 2 +- examples/causal/CMakeLists.txt | 2 +- examples/code-coverage/CMakeLists.txt | 2 +- examples/fork/CMakeLists.txt | 2 +- examples/lulesh/CMakeLists.txt | 2 +- examples/mpi/CMakeLists.txt | 2 +- examples/openmp/CMakeLists.txt | 2 +- examples/parallel-overhead/CMakeLists.txt | 2 +- examples/python/CMakeLists.txt | 2 +- examples/rccl/CMakeLists.txt | 2 +- examples/rewrite-caller/CMakeLists.txt | 2 +- examples/trace-time-window/CMakeLists.txt | 2 +- examples/transpose/CMakeLists.txt | 2 +- examples/user-api/CMakeLists.txt | 2 +- scripts/run-ci.sh | 2 +- scripts/test-find-package.sh | 2 +- scripts/write-rocprof-sys-install.cmake | 2 +- 22 files changed, 38 insertions(+), 31 deletions(-) diff --git a/.github/workflows/opensuse.yml b/.github/workflows/opensuse.yml index 2eee369a..f6de06e6 100644 --- a/.github/workflows/opensuse.yml +++ b/.github/workflows/opensuse.yml @@ -63,8 +63,9 @@ jobs: chmod +x /opt/trace_processor/bin/trace_processor_shell fi python3 -m pip install --upgrade pip && - python3 -m pip install numpy perfetto dataclasses && - for i in 6 7 8 9 10 11; do /opt/conda/envs/py3.${i}/bin/python -m pip install numpy perfetto dataclasses; done + python3 -m pip install --upgrade numpy perfetto dataclasses && + python3 -m pip install 'cmake==3.18.4' && + for i in 6 7 8 9 10 11; do /opt/conda/envs/py3.${i}/bin/python -m pip install --upgrade numpy perfetto dataclasses; done - name: Configure Env run: diff --git a/.github/workflows/redhat.yml b/.github/workflows/redhat.yml index 6f6b336c..d48ab579 100644 --- a/.github/workflows/redhat.yml +++ b/.github/workflows/redhat.yml @@ -67,8 +67,9 @@ jobs: chmod +x /opt/trace_processor/bin/trace_processor_shell fi python3 -m pip install --upgrade pip && - python3 -m pip install numpy perfetto dataclasses && - for i in 6 7 8 9 10 11; do /opt/conda/envs/py3.${i}/bin/python -m pip install numpy perfetto dataclasses; done + python3 -m pip install --upgrade numpy perfetto dataclasses && + python3 -m pip install 'cmake==3.18.4' && + for i in 6 7 8 9 10 11; do /opt/conda/envs/py3.${i}/bin/python -m pip install --upgrade numpy perfetto dataclasses; done - name: Install ROCm Packages if: ${{ matrix.rocm-version > 0 }} diff --git a/.github/workflows/ubuntu-focal.yml b/.github/workflows/ubuntu-focal.yml index 242576aa..b8e40d4c 100644 --- a/.github/workflows/ubuntu-focal.yml +++ b/.github/workflows/ubuntu-focal.yml @@ -97,8 +97,9 @@ jobs: wget https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v47.0/linux-amd64/trace_processor_shell -P /opt/trace_processor/bin && chmod +x /opt/trace_processor/bin/trace_processor_shell && python3 -m pip install --upgrade pip && - python3 -m pip install numpy perfetto dataclasses && - for i in 6 7 8 9 10 11; do /opt/conda/envs/py3.${i}/bin/python -m pip install numpy perfetto dataclasses; done && + python3 -m pip install --upgrade numpy perfetto dataclasses && + python3 -m pip install 'cmake==3.18.4' && + for i in 6 7 8 9 10 11; do /opt/conda/envs/py3.${i}/bin/python -m pip install --upgrade numpy perfetto dataclasses; done && apt-get -y --purge autoremove && apt-get -y clean && /opt/conda/bin/conda clean -y -a @@ -278,8 +279,9 @@ jobs: wget https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v47.0/linux-amd64/trace_processor_shell -P /opt/trace_processor/bin && chmod +x /opt/trace_processor/bin/trace_processor_shell && python3 -m pip install --upgrade pip && - python3 -m pip install numpy perfetto dataclasses && - for i in 6 7 8 9 10 11; do /opt/conda/envs/py3.${i}/bin/python -m pip install numpy perfetto dataclasses; done && + python3 -m pip install --upgrade numpy perfetto dataclasses && + python3 -m pip install 'cmake==3.18.4' && + for i in 6 7 8 9 10 11; do /opt/conda/envs/py3.${i}/bin/python -m pip install --upgrade numpy perfetto dataclasses; done && apt-get -y --purge autoremove && apt-get -y clean && /opt/conda/bin/conda clean -y -a @@ -440,7 +442,8 @@ jobs: wget https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v47.0/linux-amd64/trace_processor_shell -P /opt/trace_processor/bin && chmod +x /opt/trace_processor/bin/trace_processor_shell && python3 -m pip install --upgrade pip && - python3 -m pip install numpy perfetto dataclasses && + python3 -m pip install --upgrade numpy perfetto dataclasses && + python3 -m pip install 'cmake==3.18.4' && sudo apt-get -y --purge autoremove && sudo apt-get -y clean @@ -592,8 +595,9 @@ jobs: wget https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v47.0/linux-amd64/trace_processor_shell -P /opt/trace_processor/bin && chmod +x /opt/trace_processor/bin/trace_processor_shell && python3 -m pip install --upgrade pip && - python3 -m pip install numpy perfetto dataclasses && - for i in 6 7 8 9 10 11; do /opt/conda/envs/py3.${i}/bin/python -m pip install numpy perfetto dataclasses; done && + python3 -m pip install --upgrade numpy perfetto dataclasses && + python3 -m pip install 'cmake==3.18.4' && + for i in 6 7 8 9 10 11; do /opt/conda/envs/py3.${i}/bin/python -m pip install --upgrade numpy perfetto dataclasses; done && apt-get -y --purge autoremove && apt-get -y clean && /opt/conda/bin/conda clean -y -a diff --git a/.github/workflows/ubuntu-jammy.yml b/.github/workflows/ubuntu-jammy.yml index 78574f03..b69b0634 100644 --- a/.github/workflows/ubuntu-jammy.yml +++ b/.github/workflows/ubuntu-jammy.yml @@ -111,8 +111,9 @@ jobs: apt-get upgrade -y && apt-get install -y autoconf bison build-essential clang environment-modules gettext libfabric-dev libiberty-dev libomp-dev libopenmpi-dev libtool m4 openmpi-bin python3-pip texinfo ${{ matrix.compiler }} && python3 -m pip install --upgrade pip && - python3 -m pip install numpy perfetto dataclasses && - for i in 6 7 8 9 10 11; do /opt/conda/envs/py3.${i}/bin/python -m pip install numpy perfetto dataclasses; done + python3 -m pip install --upgrade numpy perfetto dataclasses && + python3 -m pip install 'cmake==3.18.4' && + for i in 6 7 8 9 10 11; do /opt/conda/envs/py3.${i}/bin/python -m pip install --upgrade numpy perfetto dataclasses; done - name: Install ROCm Packages timeout-minutes: 25 diff --git a/CMakeLists.txt b/CMakeLists.txt index bd161996..a3e3b60d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.16 FATAL_ERROR) +cmake_minimum_required(VERSION 3.18.4 FATAL_ERROR) if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR AND CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 8415afa4..4a2bda45 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.16 FATAL_ERROR) +cmake_minimum_required(VERSION 3.18.4 FATAL_ERROR) project(rocprofiler-systems-examples LANGUAGES C CXX) diff --git a/examples/causal/CMakeLists.txt b/examples/causal/CMakeLists.txt index 100f868b..27daf654 100644 --- a/examples/causal/CMakeLists.txt +++ b/examples/causal/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.16 FATAL_ERROR) +cmake_minimum_required(VERSION 3.18.4 FATAL_ERROR) project(rocprofiler-systems-causal-example LANGUAGES CXX) diff --git a/examples/code-coverage/CMakeLists.txt b/examples/code-coverage/CMakeLists.txt index 536fb21a..06fdb936 100644 --- a/examples/code-coverage/CMakeLists.txt +++ b/examples/code-coverage/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.15 FATAL_ERROR) +cmake_minimum_required(VERSION 3.18.4 FATAL_ERROR) project(rocprofiler-systems-code-coverage-example LANGUAGES CXX) diff --git a/examples/fork/CMakeLists.txt b/examples/fork/CMakeLists.txt index 5245f69d..4408265f 100644 --- a/examples/fork/CMakeLists.txt +++ b/examples/fork/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.15 FATAL_ERROR) +cmake_minimum_required(VERSION 3.18.4 FATAL_ERROR) project(rocprofiler-systems-fork LANGUAGES CXX) diff --git a/examples/lulesh/CMakeLists.txt b/examples/lulesh/CMakeLists.txt index 9c5fe99a..34ce262e 100644 --- a/examples/lulesh/CMakeLists.txt +++ b/examples/lulesh/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.16 FATAL_ERROR) +cmake_minimum_required(VERSION 3.18.4 FATAL_ERROR) project(rocprofiler-systems-lulesh-example LANGUAGES C CXX) diff --git a/examples/mpi/CMakeLists.txt b/examples/mpi/CMakeLists.txt index aec66705..109c7ed2 100644 --- a/examples/mpi/CMakeLists.txt +++ b/examples/mpi/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.16 FATAL_ERROR) +cmake_minimum_required(VERSION 3.18.4 FATAL_ERROR) project(rocprofiler-systems-mpi-examples LANGUAGES C CXX) diff --git a/examples/openmp/CMakeLists.txt b/examples/openmp/CMakeLists.txt index 496c7d64..c7451766 100644 --- a/examples/openmp/CMakeLists.txt +++ b/examples/openmp/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.16 FATAL_ERROR) +cmake_minimum_required(VERSION 3.18.4 FATAL_ERROR) project(rocprofiler-systems-openmp LANGUAGES CXX) diff --git a/examples/parallel-overhead/CMakeLists.txt b/examples/parallel-overhead/CMakeLists.txt index f8afbfc7..5733a18d 100644 --- a/examples/parallel-overhead/CMakeLists.txt +++ b/examples/parallel-overhead/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.16 FATAL_ERROR) +cmake_minimum_required(VERSION 3.18.4 FATAL_ERROR) project(rocprofiler-systems-parallel-overhead-example LANGUAGES CXX) diff --git a/examples/python/CMakeLists.txt b/examples/python/CMakeLists.txt index b882031f..c57e4625 100644 --- a/examples/python/CMakeLists.txt +++ b/examples/python/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.16 FATAL_ERROR) +cmake_minimum_required(VERSION 3.18.4 FATAL_ERROR) project(rocprofiler-systems-python) diff --git a/examples/rccl/CMakeLists.txt b/examples/rccl/CMakeLists.txt index 004a6cbd..799bf6d5 100644 --- a/examples/rccl/CMakeLists.txt +++ b/examples/rccl/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.16 FATAL_ERROR) +cmake_minimum_required(VERSION 3.18.4 FATAL_ERROR) project(rocprofiler-systems-rccl-example LANGUAGES CXX) diff --git a/examples/rewrite-caller/CMakeLists.txt b/examples/rewrite-caller/CMakeLists.txt index 1245b823..47f3a645 100644 --- a/examples/rewrite-caller/CMakeLists.txt +++ b/examples/rewrite-caller/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.15 FATAL_ERROR) +cmake_minimum_required(VERSION 3.18.4 FATAL_ERROR) project(rocprofiler-systems-rewrite-caller-example LANGUAGES CXX) diff --git a/examples/trace-time-window/CMakeLists.txt b/examples/trace-time-window/CMakeLists.txt index 2ab3d671..3b3716d5 100644 --- a/examples/trace-time-window/CMakeLists.txt +++ b/examples/trace-time-window/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.15 FATAL_ERROR) +cmake_minimum_required(VERSION 3.18.4 FATAL_ERROR) project(rocprofiler-systems-trace-time-window-example LANGUAGES CXX) diff --git a/examples/transpose/CMakeLists.txt b/examples/transpose/CMakeLists.txt index cff00c42..001571f5 100644 --- a/examples/transpose/CMakeLists.txt +++ b/examples/transpose/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.16 FATAL_ERROR) +cmake_minimum_required(VERSION 3.18.4 FATAL_ERROR) project(rocprofiler-systems-transpose-example LANGUAGES CXX) diff --git a/examples/user-api/CMakeLists.txt b/examples/user-api/CMakeLists.txt index 19e1eee6..f002f662 100644 --- a/examples/user-api/CMakeLists.txt +++ b/examples/user-api/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.16 FATAL_ERROR) +cmake_minimum_required(VERSION 3.18.4 FATAL_ERROR) project(rocprofiler-systems-user-api-example LANGUAGES CXX) diff --git a/scripts/run-ci.sh b/scripts/run-ci.sh index 78b7cf97..94091dff 100755 --- a/scripts/run-ci.sh +++ b/scripts/run-ci.sh @@ -207,7 +207,7 @@ EOF verbose-run cd ${BINARY_DIR} cat << EOF > dashboard.cmake -cmake_minimum_required(VERSION 3.16 FATAL_ERROR) +cmake_minimum_required(VERSION 3.18.4 FATAL_ERROR) include("\${CMAKE_CURRENT_LIST_DIR}/CTestCustom.cmake") diff --git a/scripts/test-find-package.sh b/scripts/test-find-package.sh index d872a3e8..cd0dab61 100755 --- a/scripts/test-find-package.sh +++ b/scripts/test-find-package.sh @@ -112,7 +112,7 @@ verbose-run cp -v -r ${EXAMPLE_DIR}/${EXAMPLE_NAME}/* ${SOURCE_DIR}/ verbose-run pushd ${SOURCE_DIR} cat << EOF > CMakeLists.txt -cmake_minimum_required(VERSION 3.16.0 FATAL_ERROR) +cmake_minimum_required(VERSION 3.18.4.0 FATAL_ERROR) project(test LANGUAGES C CXX) diff --git a/scripts/write-rocprof-sys-install.cmake b/scripts/write-rocprof-sys-install.cmake index 6ee620d8..9552722a 100644 --- a/scripts/write-rocprof-sys-install.cmake +++ b/scripts/write-rocprof-sys-install.cmake @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.18.4) if(NOT DEFINED ROCPROFSYS_VERSION) file(READ "${CMAKE_CURRENT_LIST_DIR}/../VERSION" FULL_VERSION_STRING LIMIT_COUNT 1)