Skip to content
This repository was archived by the owner on May 9, 2024. It is now read-only.

Commit 281beeb

Browse files
Devjiukurapov-peter
authored andcommitted
[Namings] Update job names
This commit unified gcc/clanf build/tests. Signed-off-by: Dmitrii Makarenko <[email protected]>
1 parent e35584d commit 281beeb

File tree

9 files changed

+48
-45
lines changed

9 files changed

+48
-45
lines changed

.github/workflows/build-docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
default: None
88
name:
99
type: string
10-
default: cpu
10+
default: None
1111
options:
1212
type: string
1313
default: -DENABLE_CUDA=off

.github/workflows/build.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@ on:
44
inputs:
55
name:
66
type: string
7-
default: cpu
87
options:
98
type: string
10-
default:
119
cuda_compiler_version:
1210
type: string
1311

@@ -81,7 +79,7 @@ jobs:
8179
conda install -n omnisci-dev -c conda-forge level-zero-devel pkg-config
8280
8381
- name: Install clang
84-
if: inputs.name == 'clang'
82+
if: inputs.name == 'clang-cpu'
8583
run: |
8684
conda install -n omnisci-dev -c conda-forge compiler-rt
8785
@@ -93,11 +91,14 @@ jobs:
9391
key: maven-${{ hashFiles('**/pom.xml') }}
9492
restore-keys: maven-
9593

96-
- name: Configure and build
94+
- name: Debug conda list
9795
run: |
98-
set -vx
9996
conda info
10097
conda list -n omnisci-dev
98+
99+
- name: Configure and build
100+
run: |
101+
conda info --env
101102
conda run --no-capture-output -n omnisci-dev sh -vx omniscidb/scripts/conda/build.sh ${{ inputs.options }}
102103
tar -zcf /tmp/build.tgz .
103104

.github/workflows/main.yml

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ jobs:
1616
build:
1717
name: Build
1818
uses: ./.github/workflows/build.yml
19+
with:
20+
name: 'gcc-cpu'
1921

2022
build-cuda:
2123
name: Build
@@ -26,10 +28,10 @@ jobs:
2628
options: -DENABLE_CUDA=on
2729

2830
build-clang:
29-
name: Build Clang
31+
name: Build
3032
uses: ./.github/workflows/build.yml
3133
with:
32-
name: clang
34+
name: 'clang-cpu'
3335
options: -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
3436

3537
build-asan:
@@ -62,43 +64,45 @@ jobs:
6264
cache-suffix: ${{ needs.build.outputs.cache-suffix }}
6365
test: style
6466

65-
sanity:
66-
name: Sanity test (Gtests)
67+
test:
68+
name: Gtests (Sanity)
6769
needs: build
6870
uses: ./.github/workflows/test.yml
6971
with:
72+
name: 'gcc-cpu'
7073
cache-suffix: ${{ needs.build.outputs.cache-suffix }}
7174
test: sanity
7275

73-
sanity-cpu:
74-
name: CPU-only Sanity tests (Gtests)
76+
test-l0:
77+
name: CPU-only Gtests (Sanity)
7578
needs: build-l0
7679
uses: ./.github/workflows/test.yml
7780
with:
7881
name: l0
7982
cache-suffix: ${{ needs.build.outputs.cache-suffix }}
8083
test: sanity_cpu
81-
82-
sanity-clang:
83-
name: Sanity test (Gtests, Clang)
84+
85+
test-clang:
86+
name: Gtests (Sanity)
8487
needs: build-clang
8588
uses: ./.github/workflows/test.yml
8689
with:
87-
name: clang
90+
name: 'clang-cpu'
8891
cache-suffix: ${{ needs.build.outputs.cache-suffix }}
8992
test: sanity
9093

9194
asan:
92-
name: ASAN generate cache (Gtests)
93-
needs: build
95+
name: ASAN Gtests
96+
needs: build-asan
9497
uses: ./.github/workflows/test.yml
9598
with:
9699
cache-suffix: ${{ needs.build.outputs.cache-suffix }}
97100
test: asan
98101

102+
# Dependency of 'asan' job issued by RelAlg cache reusage
99103
test-asan-docker:
100-
name: ASAN docker test (Gtests)
101-
needs: [build-asan, asan]
104+
name: ASAN Gtests
105+
needs: asan
102106
uses: ./.github/workflows/test-docker.yml
103107
with:
104108
name: conda
@@ -113,14 +117,14 @@ jobs:
113117
options: -DENABLE_PYTHON=off -DENABLE_CUDA=on
114118

115119
build-clang-docker:
116-
name: Build Clang
120+
name: Build
117121
uses: ./.github/workflows/build-docker.yml
118122
with:
119-
name: clang
123+
name: 'clang-cpu'
120124
options: -DENABLE_PYTHON=off -DENABLE_CUDA=on -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
121125

122126
test-cuda-docker:
123-
name: Sanity test (Gtests)
127+
name: Gtests (Sanity)
124128
needs: build-cuda-docker
125129
uses: ./.github/workflows/test-docker.yml
126130
with:
@@ -129,11 +133,11 @@ jobs:
129133
reset-cache: ${{ !!inputs.reset-cache }}
130134

131135
test-clang-docker:
132-
name: Sanity test (Gtests)
133-
needs: build-cuda-docker
136+
name: Gtests (Sanity)
137+
needs: build-clang-docker
134138
uses: ./.github/workflows/test-docker.yml
135139
with:
136-
name: clang
140+
name: 'clang-cpu'
137141
# input for a push event is an empty string, convert it to boolean
138142
reset-cache: ${{ !!inputs.reset-cache }}
139143

@@ -145,27 +149,27 @@ jobs:
145149
options: -DENABLE_L0=on -DENABLE_CUDA=off -DENABLE_PYTHON=off
146150

147151
test-l0-docker:
148-
name: Sanity test (Gtests)
152+
name: Gtests (Sanity)
149153
needs: build-l0-docker
150154
uses: ./.github/workflows/test-docker.yml
151155
with:
152156
name: l0
153157
reset-cache: ${{ !!inputs.reset-cache }}
154158
runner: intel-ai.hdk.l0
155159

156-
windows-build:
160+
build-windows:
157161
name: Build
158162
uses: ./.github/workflows/build-windows.yml
159163
with:
160-
name: cpu
164+
name: 'gcc-cpu'
161165
options: -DCMAKE_BUILD_TYPE=Release -DENABLE_FOLLY=off -G "Visual Studio 17 2022"
162166

163-
windows-sanity:
164-
name: Sanity test (Gtests)
165-
needs: windows-build
167+
test-windows:
168+
name: Gtests (Sanity)
169+
needs: build-windows
166170
uses: ./.github/workflows/test-windows.yml
167171
with:
168-
cache-suffix: ${{ needs.windows-build.outputs.cache-suffix }}
172+
cache-suffix: ${{ needs.build-windows.outputs.cache-suffix }}
169173
test: sanity
170174

171175
modin:
@@ -175,5 +179,3 @@ jobs:
175179
pytest:
176180
name: PyHDK (Pytest)
177181
uses: ./.github/workflows/pytest.yml
178-
179-

.github/workflows/modin.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
build:
11-
name: Build and Test (Linux - Conda - cpu)
11+
name: Build and Test (Linux - Conda - gcc-cpu)
1212
runs-on: ubuntu-latest
1313

1414
env:
@@ -23,7 +23,7 @@ jobs:
2323

2424
- name: Set env context
2525
run: |
26-
echo RUN_STAMP=${{ runner.os }}-${{ (env.cuda_compiler_version != 'None') && format('cuda{0}', env.cuda_compiler_version) || 'cpu' }} >>$GITHUB_ENV
26+
echo RUN_STAMP=${{ runner.os }}-${{ (env.cuda_compiler_version != 'None') && format('cuda{0}', env.cuda_compiler_version) || 'gcc-cpu' }} >>$GITHUB_ENV
2727
echo CONDA_ENV_PATH=$CONDA/envs/${{ env.CONDA_ENV }} >>$GITHUB_ENV
2828
2929
- name: Update Conda

.github/workflows/pytest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44

55
jobs:
66
build:
7-
name: Build and Test (Linux - Conda - cpu)
7+
name: Build and Test (Linux - Conda - gcc-cpu)
88
runs-on: ubuntu-latest
99

1010
env:
@@ -16,7 +16,7 @@ jobs:
1616
- name: Set env context
1717
run: |
1818
echo CONDA_PATH=$CONDA >>$GITHUB_ENV
19-
echo RUN_STAMP=${{ runner.os }}-${{ (env.cuda_compiler_version != 'None') && format('cuda{0}', env.cuda_compiler_version) || 'cpu' }} >>$GITHUB_ENV
19+
echo RUN_STAMP=${{ runner.os }}-${{ (env.cuda_compiler_version != 'None') && format('cuda{0}', env.cuda_compiler_version) || 'gcc-cpu' }} >>$GITHUB_ENV
2020
echo CONDA_ENV_PATH=$CONDA/envs/${{ env.CONDA_ENV }} >>$GITHUB_ENV
2121
2222
- name: Restore Conda env cache

.github/workflows/test-docker.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
default: None
88
name:
99
type: string
10-
default: cpu
10+
default: None
1111
build-name:
1212
type: string
1313
default: build
@@ -19,7 +19,7 @@ on:
1919
default: cuda
2020

2121
jobs:
22-
build:
22+
test:
2323
name: Test (Linux - Docker - ${{ inputs.name }})
2424
runs-on: [self-hosted, linux, "${{ inputs.runner }}"]
2525
steps:
@@ -76,7 +76,7 @@ jobs:
7676
docker exec -u ghrunner hdk-build.${{ inputs.name }} tar -zxf /_work/build.tgz -C /_work/
7777
7878
- name: Sanity test
79-
if: inputs.name == 'cuda'
79+
if: inputs.name == 'cuda'|| inputs.name == 'clang-cpu'
8080
run: |
8181
docker exec -u ghrunner hdk-build.${{ inputs.name }} dpkg -l
8282
docker exec -u ghrunner hdk-build.${{ inputs.name }} bash /_work/omniscidb/scripts/conda/test.sh

.github/workflows/test-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
inputs:
55
name:
66
type: string
7-
default: cpu
7+
default: 'gcc-cpu'
88
cache-suffix:
99
type: string
1010
required: true

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
inputs:
55
name:
66
type: string
7-
default: cpu
7+
default: 'gcc-cpu'
88
cache-suffix:
99
type: string
1010
required: true
@@ -73,7 +73,7 @@ jobs:
7373
7474
- name: Run sanity tests
7575
if: inputs.test == 'sanity_cpu'
76-
# skip large buffer tests due to limited memory on ghrunnners instances
76+
# Runs in cpu-only mode
7777
run: |
7878
conda run --no-capture-output -n omnisci-dev bash omniscidb/scripts/conda/test.sh -s -c
7979
File renamed without changes.

0 commit comments

Comments
 (0)