diff --git a/.github/workflows/dispatch-build-and-test.yml b/.github/workflows/dispatch-build-and-test.yml index f7870b9..ce682e6 100644 --- a/.github/workflows/dispatch-build-and-test.yml +++ b/.github/workflows/dispatch-build-and-test.yml @@ -46,6 +46,6 @@ jobs: include: ${{ fromJSON(inputs.per_cuda_compiler_matrix) }} with: test_name: ${{matrix.cpu}}/${{matrix.compiler.name}}${{matrix.compiler.version}}/C++${{matrix.std}} - build_script: "./ci/windows/build_${{ inputs.project_name }}.ps1 -std ${{matrix.std}}" - test_script: "./ci/windows/test_${{ inputs.project_name }}.ps1 -std ${{matrix.std}}" + build_script: './ci/windows/build_${{ inputs.project_name }}.ps1 -std ${{matrix.std}} "${{matrix.extra_build_args}}"' + test_script: './ci/windows/test_${{ inputs.project_name }}.ps1 -std ${{matrix.std}} "${{matrix.extra_build_args}}"' container_image: rapidsai/devcontainers:${{inputs.devcontainer_version}}-cuda${{matrix.cuda}}-${{matrix.compiler.name}}${{matrix.compiler.version}}-${{matrix.os}} diff --git a/ci/windows/build_nvbench.ps1 b/ci/windows/build_nvbench.ps1 index 31b4f7c..94bef7c 100644 --- a/ci/windows/build_nvbench.ps1 +++ b/ci/windows/build_nvbench.ps1 @@ -4,7 +4,11 @@ Param( [Alias("std")] [ValidateNotNullOrEmpty()] [ValidateSet(17)] - [int]$CXX_STANDARD = 17 + [int]$CXX_STANDARD = 17, + [Parameter(Mandatory = $false)] + [Alias("cmake-options")] + [ValidateNotNullOrEmpty()] + [int]$ARG_CMAKE_OPTIONS = "" ) $CURRENT_PATH = Split-Path $pwd -leaf @@ -19,6 +23,11 @@ Import-Module $PSScriptRoot/build_common.psm1 -ArgumentList $CXX_STANDARD $PRESET = "nvbench-cpp$CXX_STANDARD" $CMAKE_OPTIONS = "" +# Append any arguments pass in on the command line +If($ARG_CMAKE_OPTIONS -ne "") { + $CMAKE_OPTIONS += "$ARG_CMAKE_OPTIONS" +} + configure_and_build_preset "NVBench" "$PRESET" "$CMAKE_OPTIONS" If($CURRENT_PATH -ne "ci") { diff --git a/ci/windows/test_nvbench.ps1 b/ci/windows/test_nvbench.ps1 index 3492fe2..0af15c7 100644 --- a/ci/windows/test_nvbench.ps1 +++ b/ci/windows/test_nvbench.ps1 @@ -4,7 +4,11 @@ Param( [Alias("std")] [ValidateNotNullOrEmpty()] [ValidateSet(17)] - [int]$CXX_STANDARD = 17 + [int]$CXX_STANDARD = 17, + [Parameter(Mandatory = $false)] + [Alias("cmake-options")] + [ValidateNotNullOrEmpty()] + [int]$ARG_CMAKE_OPTIONS = "" ) $CURRENT_PATH = Split-Path $pwd -leaf @@ -19,6 +23,11 @@ Import-Module $PSScriptRoot/build_common.psm1 -ArgumentList $CXX_STANDARD $PRESET = "nvbench-cpp$CXX_STANDARD" $CMAKE_OPTIONS = "" +# Append any arguments pass in on the command line +If($ARG_CMAKE_OPTIONS -ne "") { + $CMAKE_OPTIONS += "$ARG_CMAKE_OPTIONS" +} + configure_and_build_preset "NVBench" "$PRESET" "$CMAKE_OPTIONS" test_preset "NVBench" "$PRESET"