From d7a92800089cecd13e7c1839fa034b71dcc5bfc2 Mon Sep 17 00:00:00 2001 From: Daniel Su Date: Tue, 13 May 2025 17:15:54 -0400 Subject: [PATCH] Ex CI: set cmakeSourceDir for all components that set cmakeBuildDir (#4738) --- .azuredevops/components/HIP.yml | 2 ++ .azuredevops/components/HIPIFY.yml | 1 + .azuredevops/components/aomp.yml | 3 +++ .azuredevops/components/hipSOLVER.yml | 1 + .azuredevops/components/llvm-project.yml | 4 ++++ .azuredevops/components/rdc.yml | 1 + .azuredevops/components/rocAL.yml | 2 ++ .azuredevops/components/rocSOLVER.yml | 1 + .azuredevops/dependencies/grpc.yml | 1 + .azuredevops/dependencies/gtest.yml | 1 + 10 files changed, 17 insertions(+) diff --git a/.azuredevops/components/HIP.yml b/.azuredevops/components/HIP.yml index 8574aff81..7ebbb56b0 100644 --- a/.azuredevops/components/HIP.yml +++ b/.azuredevops/components/HIP.yml @@ -78,6 +78,7 @@ jobs: parameters: componentName: clr cmakeBuildDir: 'clr/build' + cmakeSourceDir: 'clr' extraBuildFlags: >- -DHIP_COMMON_DIR=$(Build.SourcesDirectory)/HIP -DHIP_PLATFORM=amd @@ -139,6 +140,7 @@ jobs: parameters: componentName: clr cmakeBuildDir: 'clr/build' + cmakeSourceDir: 'clr' extraBuildFlags: >- -DHIP_COMMON_DIR=$(Build.SourcesDirectory)/HIP -DHIP_PLATFORM=nvidia diff --git a/.azuredevops/components/HIPIFY.yml b/.azuredevops/components/HIPIFY.yml index 8ad063bfa..57381db3a 100644 --- a/.azuredevops/components/HIPIFY.yml +++ b/.azuredevops/components/HIPIFY.yml @@ -73,6 +73,7 @@ jobs: parameters: componentName: upstream-llvm cmakeBuildDir: $(Pipeline.Workspace)/llvm-project/llvm/build + cmakeSourceDir: $(Pipeline.Workspace)/llvm-project/llvm installDir: $(Pipeline.Workspace)/llvm extraBuildFlags: >- -DCMAKE_BUILD_TYPE=Release diff --git a/.azuredevops/components/aomp.yml b/.azuredevops/components/aomp.yml index 061a77078..a05140bf9 100644 --- a/.azuredevops/components/aomp.yml +++ b/.azuredevops/components/aomp.yml @@ -118,6 +118,7 @@ jobs: parameters: componentName: extras cmakeBuildDir: '$(Build.SourcesDirectory)/aomp-extras/build' + cmakeSourceDir: '$(Build.SourcesDirectory)/aomp-extras' installDir: '$(Build.BinariesDirectory)/llvm' extraBuildFlags: >- -DLLVM_DIR=$(Agent.BuildDirectory)/rocm/llvm @@ -129,6 +130,7 @@ jobs: parameters: componentName: openmp cmakeBuildDir: '$(Build.SourcesDirectory)/llvm-project/openmp/build' + cmakeSourceDir: '$(Build.SourcesDirectory)/llvm-project/openmp' installDir: '$(Build.BinariesDirectory)/llvm' extraBuildFlags: >- -DCMAKE_PREFIX_PATH="$(Agent.BuildDirectory)/rocm;$(Build.BinariesDirectory)" @@ -155,6 +157,7 @@ jobs: parameters: componentName: offload cmakeBuildDir: '$(Build.SourcesDirectory)/llvm-project/offload/build' + cmakeSourceDir: '$(Build.SourcesDirectory)/llvm-project/offload' installDir: '$(Build.BinariesDirectory)/llvm' extraBuildFlags: >- -DCMAKE_PREFIX_PATH="$(Agent.BuildDirectory)/rocm;$(Build.BinariesDirectory)" diff --git a/.azuredevops/components/hipSOLVER.yml b/.azuredevops/components/hipSOLVER.yml index 0981cf112..27ac8b847 100644 --- a/.azuredevops/components/hipSOLVER.yml +++ b/.azuredevops/components/hipSOLVER.yml @@ -93,6 +93,7 @@ jobs: parameters: componentName: external cmakeBuildDir: 'deps/build' + cmakeSourceDir: 'deps' installDir: '$(Pipeline.Workspace)/deps-install' extraBuildFlags: >- -DBUILD_BOOST=OFF diff --git a/.azuredevops/components/llvm-project.yml b/.azuredevops/components/llvm-project.yml index c421b8b8d..5d5d6322f 100644 --- a/.azuredevops/components/llvm-project.yml +++ b/.azuredevops/components/llvm-project.yml @@ -84,6 +84,7 @@ jobs: -DROCM_LLVM_BACKWARD_COMPAT_LINK_TARGET=./lib/llvm -GNinja cmakeBuildDir: 'llvm/build' + cmakeSourceDir: 'llvm' installDir: '$(Build.BinariesDirectory)/llvm' # use llvm-lit to run unit tests for llvm, clang, and lld - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/test.yml @@ -122,6 +123,7 @@ jobs: -DCMAKE_PREFIX_PATH="$(Build.SourcesDirectory)/llvm/build" -DCMAKE_BUILD_TYPE=Release cmakeBuildDir: 'amd/device-libs/build' + cmakeSourceDir: 'amd/device-libs' - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml parameters: componentName: comgr @@ -130,6 +132,7 @@ jobs: -DCOMGR_DISABLE_SPIRV=1 -DCMAKE_BUILD_TYPE=Release cmakeBuildDir: 'amd/comgr/build' + cmakeSourceDir: 'amd/comgr' - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/test.yml parameters: componentName: comgr @@ -143,6 +146,7 @@ jobs: -DCMAKE_BUILD_TYPE=Release -DHIPCC_BACKWARD_COMPATIBILITY=OFF cmakeBuildDir: 'amd/hipcc/build' + cmakeSourceDir: 'amd/hipcc' - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/manifest.yml - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-links.yml diff --git a/.azuredevops/components/rdc.yml b/.azuredevops/components/rdc.yml index d7ed7f517..ab567033e 100644 --- a/.azuredevops/components/rdc.yml +++ b/.azuredevops/components/rdc.yml @@ -105,6 +105,7 @@ jobs: - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml parameters: cmakeBuildDir: $(Build.SourcesDirectory)/grpc/build + cmakeSourceDir: $(Build.SourcesDirectory)/grpc installDir: $(Build.SourcesDirectory)/bin extraBuildFlags: >- -DgRPC_INSTALL=ON diff --git a/.azuredevops/components/rocAL.yml b/.azuredevops/components/rocAL.yml index 59d3b6657..26010749e 100644 --- a/.azuredevops/components/rocAL.yml +++ b/.azuredevops/components/rocAL.yml @@ -125,6 +125,7 @@ jobs: parameters: componentName: PyBind11 cmakeBuildDir: '$(Build.SourcesDirectory)/pybind11/build' + cmakeSourceDir: '$(Build.SourcesDirectory)/pybind11' customInstallPath: false installEnabled: false extraBuildFlags: >- @@ -141,6 +142,7 @@ jobs: parameters: componentName: RapidJSON cmakeBuildDir: '$(Build.SourcesDirectory)/rapidjson/build' + cmakeSourceDir: '$(Build.SourcesDirectory)/rapidjson' customInstallPath: false installEnabled: false extraBuildFlags: >- diff --git a/.azuredevops/components/rocSOLVER.yml b/.azuredevops/components/rocSOLVER.yml index e972e4e47..9c981bc8a 100644 --- a/.azuredevops/components/rocSOLVER.yml +++ b/.azuredevops/components/rocSOLVER.yml @@ -105,6 +105,7 @@ jobs: -DLAPACKE=OFF -GNinja cmakeBuildDir: '$(Build.SourcesDirectory)/lapack/build' + cmakeSourceDir: '$(Build.SourcesDirectory)/lapack' installDir: '$(Pipeline.Workspace)/deps-install' - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml parameters: diff --git a/.azuredevops/dependencies/grpc.yml b/.azuredevops/dependencies/grpc.yml index dd6b65345..155fd859b 100644 --- a/.azuredevops/dependencies/grpc.yml +++ b/.azuredevops/dependencies/grpc.yml @@ -38,6 +38,7 @@ jobs: - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml parameters: cmakeBuildDir: $(Agent.BuildDirectory)/grpc/build + cmakeSourceDir: $(Agent.BuildDirectory)/grpc extraBuildFlags: >- -DgRPC_INSTALL=ON -DgRPC_BUILD_TESTS=OFF diff --git a/.azuredevops/dependencies/gtest.yml b/.azuredevops/dependencies/gtest.yml index 5d18d9baa..da4e99b9e 100644 --- a/.azuredevops/dependencies/gtest.yml +++ b/.azuredevops/dependencies/gtest.yml @@ -38,6 +38,7 @@ jobs: - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml parameters: cmakeBuildDir: $(Agent.BuildDirectory)/googletest/build + cmakeSourceDir: $(Agent.BuildDirectory)/googletest extraBuildFlags: >- -DGTEST_FORCE_SHARED_CRT=ON -DCMAKE_DEBUG_POSTFIX=d