|
5 | 5 | AIS_INPUT_BUILD_ID: ${{ inputs.build_id }} |
6 | 6 | AIS_INPUT_CI_IMAGE: ${{ inputs.ci_image }} |
7 | 7 | AIS_INPUT_CXX_COMPILER: ${{ inputs.cxx_compiler }} |
| 8 | + AIS_INPUT_CXX_STANDARD: ${{ inputs.cxx_standard }} |
8 | 9 | AIS_INPUT_JOB_DESIGNATOR: ${{ inputs.job_designator }} |
9 | 10 | AIS_INPUT_PLATFORM: ${{ inputs.platform }} |
10 | 11 | AIS_INPUT_UPLOAD_ARTIFACTS: ${{ inputs.upload_artifacts }} |
|
18 | 19 | AIS_PKG_TYPE: ${{ inputs.platform == 'ubuntu' && 'DEB' || 'RPM' }} |
19 | 20 | AIS_INPUT_ROCM_VERSION: ${{ inputs.rocm_version }} |
20 | 21 | # Code coverage report only vetted to work for amdclang++ on Ubuntu |
21 | | - AIS_USE_CODE_COVERAGE: ${{ inputs.cxx_compiler == 'amdclang++' && inputs.platform == 'ubuntu' }} |
| 22 | + AIS_USE_CODE_COVERAGE: ${{ inputs.cxx_compiler == 'amdclang++' && inputs.platform == 'ubuntu' && inputs.generate_coverage }} |
22 | 23 | AIS_HIP_ARCHITECTURES: gfx950;gfx1201;gfx1200;gfx1101;gfx1100;gfx1030;gfx942;gfx90a;gfx908 |
23 | 24 | on: |
24 | 25 | workflow_call: |
|
34 | 35 | cxx_compiler: |
35 | 36 | required: true |
36 | 37 | type: string |
| 38 | + cxx_standard: |
| 39 | + required: false |
| 40 | + type: number |
| 41 | + default: 17 |
| 42 | + generate_coverage: |
| 43 | + default: true |
| 44 | + description: "Allow coverage to be generated" |
| 45 | + required: false |
| 46 | + type: boolean |
37 | 47 | job_designator: |
38 | 48 | description: "Qualifies the type of job building hipFile." |
39 | 49 | required: false |
@@ -67,7 +77,7 @@ permissions: |
67 | 77 | packages: read |
68 | 78 | jobs: |
69 | 79 | compile_on_AMD: |
70 | | - name: compile_on_AMD (${{ inputs.cxx_compiler }}) |
| 80 | + name: compile_on_AMD (${{ inputs.cxx_compiler }} C++${{ inputs.cxx_standard}}) |
71 | 81 | outputs: |
72 | 82 | ais_hipfile_pkg_dev_filename: ${{ steps.pkg-metadata.outputs.AIS_HIPFILE_PKG_DEV_FILENAME }} |
73 | 83 | ais_hipfile_pkg_filename: ${{ steps.pkg-metadata.outputs.AIS_HIPFILE_PKG_FILENAME }} |
|
90 | 100 | # We should expect that there are multiple instances of this job with different cxx_compilers. |
91 | 101 | # On non-pull_request triggering workflows, AIS_PR_NUMBER may be empty. |
92 | 102 | run: | |
93 | | - echo "AIS_CONTAINER_NAME=${AIS_PR_NUMBER:=${GITHUB_RUN_ID}}_${GITHUB_JOB}_${AIS_INPUT_PLATFORM}_${AIS_INPUT_ROCM_VERSION}_${AIS_SAFE_COMPILER_NAME}" >> "${GITHUB_ENV}" |
| 103 | + echo "AIS_CONTAINER_NAME=${AIS_PR_NUMBER:=${GITHUB_RUN_ID}}_${GITHUB_JOB}_${AIS_INPUT_PLATFORM}_${AIS_INPUT_ROCM_VERSION}_${AIS_SAFE_COMPILER_NAME}_${AIS_INPUT_CXX_STANDARD}" >> "${GITHUB_ENV}" |
94 | 104 | - name: Fetching code repository... |
95 | 105 | uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2 |
96 | 106 | with: |
@@ -142,6 +152,7 @@ jobs: |
142 | 152 | cmake \ |
143 | 153 | -DCMAKE_BUILD_TYPE=Debug \ |
144 | 154 | -DCMAKE_CXX_COMPILER="${_AIS_INPUT_CXX_COMPILER}" \ |
| 155 | + -DAIS_CXX_STANDARD="${{ env.AIS_INPUT_CXX_STANDARD }}" \ |
145 | 156 | -DCMAKE_CXX_FLAGS="-Werror" \ |
146 | 157 | -DCMAKE_HIP_ARCHITECTURES="${{ env.AIS_HIP_ARCHITECTURES }}" \ |
147 | 158 | -DCMAKE_HIP_PLATFORM=amd \ |
|
0 commit comments