Skip to content

Commit a900734

Browse files
authored
Switch to Gold, added list_components workflow (#32)
2 parents 8cf4a7e + 55f6748 commit a900734

11 files changed

+194
-95
lines changed

.appveyor.yml

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,18 @@
44

55
environment:
66
global:
7-
WINDOWS_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17191/w_BaseKit_b_2021.1.10.2260_offline.exe
8-
WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17163/w_HPCKit_b_2021.1.10.2266_offline.exe
9-
MACOS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17230/m_HPCKit_b_2021.1.10.2260.dmg
7+
WINDOWS_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17453/w_BaseKit_p_2021.1.0.2664_offline.exe
8+
WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17392/w_HPCKit_p_2021.1.0.2682_offline.exe
9+
MACOS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17398/m_HPCKit_p_2021.1.0.2681_offline.dmg
1010
WINDOWS_CPP_COMPONENTS: intel.oneapi.win.cpp-compiler
1111
WINDOWS_FORTRAN_COMPONENTS: intel.oneapi.win.ifort-compiler
1212
WINDOWS_DPCPP_COMPONENTS: intel.oneapi.win.dpcpp-compiler
13-
LINUX_CPP_COMPONENTS: intel-oneapi-dpcpp-cpp-compiler-pro
14-
LINUX_FORTRAN_COMPONENTS: intel-oneapi-ifort
15-
LINUX_DPCPP_COMPONENTS: intel-oneapi-dpcpp-cpp-compiler
13+
LINUX_CPP_COMPONENTS: intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic
14+
LINUX_FORTRAN_COMPONENTS: intel-oneapi-compiler-fortran
15+
LINUX_DPCPP_COMPONENTS: intel-oneapi-compiler-dpcpp-cpp
1616
MACOS_CPP_COMPONENTS: intel.oneapi.mac.cpp-compiler
1717
MACOS_FORTRAN_COMPONENTS: intel.oneapi.mac.ifort-compiler
18+
ONEAPI_RELEASE: 2021.1.1
1819

1920
matrix:
2021
- job_name: build_windows_cpp
@@ -27,13 +28,13 @@ environment:
2728
appveyor_build_worker_image: Visual Studio 2019
2829

2930
- job_name: build_linux_apt_cpp
30-
appveyor_build_worker_image: Ubuntu
31+
appveyor_build_worker_image: ubuntu2004
3132

3233
- job_name: build_linux_apt_fortran
33-
appveyor_build_worker_image: Ubuntu
34+
appveyor_build_worker_image: ubuntu2004
3435

3536
- job_name: build_linux_apt_dpcpp
36-
appveyor_build_worker_image: Ubuntu
37+
appveyor_build_worker_image: ubuntu2004
3738

3839
- job_name: build_mac_cpp
3940
appveyor_build_worker_image: macos
@@ -49,7 +50,7 @@ for:
4950
install:
5051
cmd: scripts/install_windows.bat %WINDOWS_HPCKIT_URL% %WINDOWS_CPP_COMPONENTS%
5152
build_script:
52-
cmd: scripts/build_windows.bat c++
53+
cmd: scripts/build_windows.bat c++ - %ONEAPI_RELEASE%
5354

5455
# Delete the following if you don't want to save install logs
5556
artifacts:
@@ -65,7 +66,7 @@ for:
6566
install:
6667
cmd: scripts/install_windows.bat %WINDOWS_HPCKIT_URL% %WINDOWS_FORTRAN_COMPONENTS%
6768
build_script:
68-
cmd: scripts/build_windows.bat fortran
69+
cmd: scripts/build_windows.bat fortran - %ONEAPI_RELEASE%
6970

7071
# Delete the following if you don't want to save install logs
7172
artifacts:
@@ -81,7 +82,7 @@ for:
8182
install:
8283
cmd: scripts/install_windows.bat %WINDOWS_BASEKIT_URL% %WINDOWS_DPCPP_COMPONENTS%
8384
build_script:
84-
cmd: scripts/build_windows.bat dpc++
85+
cmd: scripts/build_windows.bat dpc++ - %ONEAPI_RELEASE%
8586

8687
# Delete the following if you don't want to save install logs
8788
artifacts:
@@ -99,7 +100,7 @@ for:
99100
scripts/setup_apt_repo_linux.sh
100101
scripts/install_linux_apt.sh $LINUX_CPP_COMPONENTS
101102
build_script:
102-
sh: scripts/build_linux.sh c++
103+
sh: scripts/build_linux.sh c++ $ONEAPI_RELEASE
103104
-
104105
matrix:
105106
only:
@@ -109,7 +110,7 @@ for:
109110
scripts/setup_apt_repo_linux.sh
110111
scripts/install_linux_apt.sh $LINUX_FORTRAN_COMPONENTS
111112
build_script:
112-
sh: scripts/build_linux.sh fortran
113+
sh: scripts/build_linux.sh fortran $ONEAPI_RELEASE
113114
-
114115
matrix:
115116
only:
@@ -119,7 +120,7 @@ for:
119120
scripts/setup_apt_repo_linux.sh
120121
scripts/install_linux_apt.sh $LINUX_DPCPP_COMPONENTS
121122
build_script:
122-
sh: scripts/build_linux.sh dpc++
123+
sh: scripts/build_linux.sh dpc++ $ONEAPI_RELEASE
123124

124125
-
125126
matrix:

.azure-pipelines.yml

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,29 @@ trigger:
77

88
variables:
99
- name: WINDOWS_BASEKIT_URL
10-
value: https://registrationcenter-download.intel.com/akdlm/irc_nas/17191/w_BaseKit_b_2021.1.10.2260_offline.exe
10+
value: https://registrationcenter-download.intel.com/akdlm/irc_nas/17453/w_BaseKit_p_2021.1.0.2664_offline.exe
1111
- name: WINDOWS_HPCKIT_URL
12-
value: https://registrationcenter-download.intel.com/akdlm/irc_nas/17163/w_HPCKit_b_2021.1.10.2266_offline.exe
12+
value: https://registrationcenter-download.intel.com/akdlm/irc_nas/17392/w_HPCKit_p_2021.1.0.2682_offline.exe
1313
- name: MACOS_HPCKIT_URL
14-
value: https://registrationcenter-download.intel.com/akdlm/irc_nas/17230/m_HPCKit_b_2021.1.10.2260.dmg
14+
value: https://registrationcenter-download.intel.com/akdlm/irc_nas/17398/m_HPCKit_p_2021.1.0.2681_offline.dmg
1515
- name: WINDOWS_CPP_COMPONENTS
1616
value: intel.oneapi.win.cpp-compiler
1717
- name: WINDOWS_FORTRAN_COMPONENTS
1818
value: intel.oneapi.win.ifort-compiler
1919
- name: WINDOWS_DPCPP_COMPONENTS
2020
value: intel.oneapi.win.dpcpp-compiler
2121
- name: LINUX_CPP_COMPONENTS
22-
value: intel-oneapi-dpcpp-cpp-compiler-pro
22+
value: intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic
2323
- name: LINUX_FORTRAN_COMPONENTS
24-
value: intel-oneapi-ifort
24+
value: intel-oneapi-compiler-fortran
2525
- name: LINUX_DPCPP_COMPONENTS
26-
value: intel-oneapi-dpcpp-cpp-compiler
26+
value: intel-oneapi-compiler-dpcpp-cpp
2727
- name: MACOS_CPP_COMPONENTS
2828
value: intel.oneapi.mac.cpp-compiler
2929
- name: MACOS_FORTRAN_COMPONENTS
3030
value: intel.oneapi.mac.ifort-compiler
31+
- name: ONEAPI_RELEASE
32+
value: 2021.1.1
3133

3234
resources:
3335
containers:
@@ -51,7 +53,7 @@ jobs:
5153
- script: scripts/install_windows.bat $(WINDOWS_HPCKIT_URL) $(WINDOWS_CPP_COMPONENTS)
5254
displayName: install
5355
condition: ne(variables.CACHE_RESTORED, 'true')
54-
- script: scripts/build_windows.bat c++
56+
- script: scripts/build_windows.bat c++ - $(ONEAPI_RELEASE)
5557
displayName: build
5658
- bash: scripts/cache_exclude_windows.sh
5759
displayName: exclude unused files from cache
@@ -85,7 +87,7 @@ jobs:
8587
- script: scripts/install_windows.bat $(WINDOWS_HPCKIT_URL) $(WINDOWS_FORTRAN_COMPONENTS)
8688
displayName: install
8789
condition: ne(variables.CACHE_RESTORED, 'true')
88-
- script: scripts/build_windows.bat fortran
90+
- script: scripts/build_windows.bat fortran - $(ONEAPI_RELEASE)
8991
displayName: build
9092
- bash: scripts/cache_exclude_windows.sh
9193
displayName: exclude unused files from cache
@@ -130,7 +132,7 @@ jobs:
130132
- bash: cp opencl/OpenCL.dll C:/Windows/System32/
131133
displayName: restore OpenCL.dll from cache
132134
condition: eq(variables.CACHE_RESTORED, 'true')
133-
- script: scripts/build_windows.bat dpc++
135+
- script: scripts/build_windows.bat dpc++ - $(ONEAPI_RELEASE)
134136
displayName: build
135137
- bash: scripts/cache_exclude_windows.sh
136138
displayName: exclude unused files from cache
@@ -159,7 +161,7 @@ jobs:
159161

160162
- job: build_linux_apt_cpp
161163
pool:
162-
vmImage: 'ubuntu-latest'
164+
vmImage: 'ubuntu-20.04'
163165
steps:
164166
- script: scripts/setup_apt_repo_linux.sh
165167
displayName: setup apt repo
@@ -173,15 +175,15 @@ jobs:
173175
- script: scripts/install_linux_apt.sh $(LINUX_CPP_COMPONENTS)
174176
displayName: install
175177
condition: ne(variables.CACHE_RESTORED, 'true')
176-
- script: scripts/build_linux.sh c++
178+
- script: scripts/build_linux.sh c++ $(ONEAPI_RELEASE)
177179
displayName: build
178180
- bash: scripts/cache_exclude_linux.sh
179181
displayName: exclude unused files from cache
180182
condition: ne(variables.CACHE_RESTORED, 'true')
181183

182184
- job: build_linux_apt_fortran
183185
pool:
184-
vmImage: 'ubuntu-latest'
186+
vmImage: 'ubuntu-20.04'
185187
steps:
186188
- script: scripts/setup_apt_repo_linux.sh
187189
displayName: setup apt repo
@@ -195,15 +197,15 @@ jobs:
195197
- script: scripts/install_linux_apt.sh $(LINUX_FORTRAN_COMPONENTS)
196198
displayName: install
197199
condition: ne(variables.CACHE_RESTORED, 'true')
198-
- script: scripts/build_linux.sh fortran
200+
- script: scripts/build_linux.sh fortran $(ONEAPI_RELEASE)
199201
displayName: build
200202
- bash: scripts/cache_exclude_linux.sh
201203
displayName: exclude unused files from cache
202204
condition: ne(variables.CACHE_RESTORED, 'true')
203205

204206
- job: build_linux_apt_dpcpp
205207
pool:
206-
vmImage: 'ubuntu-latest'
208+
vmImage: 'ubuntu-20.04'
207209
steps:
208210
- script: scripts/setup_apt_repo_linux.sh
209211
displayName: setup apt repo
@@ -221,7 +223,7 @@ jobs:
221223
- script: scripts/install_linux_apt.sh $(LINUX_DPCPP_COMPONENTS)
222224
displayName: install
223225
condition: ne(variables.CACHE_RESTORED, 'true')
224-
- script: scripts/build_linux.sh dpc++
226+
- script: scripts/build_linux.sh dpc++ $(ONEAPI_RELEASE)
225227
displayName: build
226228
- bash: scripts/cache_exclude_linux.sh
227229
displayName: exclude unused files from cache
@@ -234,7 +236,7 @@ jobs:
234236
steps:
235237
- script: sudo apt-get update && sudo apt-get install -y git
236238
displayName: install_git
237-
- script: scripts/build_linux.sh c++
239+
- script: scripts/build_linux.sh c++ $(ONEAPI_RELEASE)
238240
displayName: build
239241

240242
- job: build_linux_container_fortran
@@ -244,7 +246,7 @@ jobs:
244246
steps:
245247
- script: sudo apt-get update && sudo apt-get install -y git
246248
displayName: install_git
247-
- script: scripts/build_linux.sh fortran
249+
- script: scripts/build_linux.sh fortran $(ONEAPI_RELEASE)
248250
displayName: build
249251

250252
- job: build_linux_container_dpcpp
@@ -254,7 +256,7 @@ jobs:
254256
steps:
255257
- script: sudo apt-get update && sudo apt-get install -y git
256258
displayName: install_git
257-
- script: scripts/build_linux.sh dpc++
259+
- script: scripts/build_linux.sh dpc++ $(ONEAPI_RELEASE)
258260
displayName: build
259261

260262
- job: build_macOS_cpp

.circleci/config.yml

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ version: 2.1
66
parameters:
77
WINDOWS_BASEKIT_URL:
88
type: string
9-
default: "https://registrationcenter-download.intel.com/akdlm/irc_nas/17191/w_BaseKit_b_2021.1.10.2260_offline.exe"
9+
default: "https://registrationcenter-download.intel.com/akdlm/irc_nas/17453/w_BaseKit_p_2021.1.0.2664_offline.exe"
1010
WINDOWS_HPCKIT_URL:
1111
type: string
12-
default: "https://registrationcenter-download.intel.com/akdlm/irc_nas/17163/w_HPCKit_b_2021.1.10.2266_offline.exe"
12+
default: "https://registrationcenter-download.intel.com/akdlm/irc_nas/17392/w_HPCKit_p_2021.1.0.2682_offline.exe"
1313
MACOS_HPCKIT_URL:
1414
type: string
15-
default: "https://registrationcenter-download.intel.com/akdlm/irc_nas/17230/m_HPCKit_b_2021.1.10.2260.dmg"
15+
default: "https://registrationcenter-download.intel.com/akdlm/irc_nas/17398/m_HPCKit_p_2021.1.0.2681_offline.dmg"
1616
WINDOWS_CPP_COMPONENTS:
1717
type: string
1818
default: "intel.oneapi.win.cpp-compiler"
@@ -24,19 +24,22 @@ parameters:
2424
default: "intel.oneapi.win.dpcpp-compiler"
2525
LINUX_CPP_COMPONENTS:
2626
type: string
27-
default: "intel-oneapi-dpcpp-cpp-compiler-pro"
27+
default: "intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic"
2828
LINUX_FORTRAN_COMPONENTS:
2929
type: string
30-
default: "intel-oneapi-ifort"
30+
default: "intel-oneapi-compiler-fortran"
3131
LINUX_DPCPP_COMPONENTS:
3232
type: string
33-
default: "intel-oneapi-dpcpp-cpp-compiler"
33+
default: "intel-oneapi-compiler-dpcpp-cpp"
3434
MACOS_CPP_COMPONENTS:
3535
type: string
3636
default: "intel.oneapi.mac.cpp-compiler"
3737
MACOS_FORTRAN_COMPONENTS:
3838
type: string
3939
default: "intel.oneapi.mac.ifort-compiler"
40+
ONEAPI_RELEASE:
41+
type: string
42+
default: "2021.1.1"
4043

4144
orbs:
4245
win: circleci/[email protected]
@@ -58,7 +61,7 @@ jobs:
5861
scripts/install_windows.bat << pipeline.parameters.WINDOWS_HPCKIT_URL >> << pipeline.parameters.WINDOWS_CPP_COMPONENTS >>
5962
- run:
6063
name: build
61-
command: scripts/build_windows.bat c++ 2017_build_tools
64+
command: scripts/build_windows.bat c++ 2017_build_tools << pipeline.parameters.ONEAPI_RELEASE >>
6265
- run:
6366
name: exclude unused files from cache
6467
command: scripts/cache_exclude_windows.sh
@@ -92,7 +95,7 @@ jobs:
9295
scripts/install_windows.bat << pipeline.parameters.WINDOWS_HPCKIT_URL >> << pipeline.parameters.WINDOWS_FORTRAN_COMPONENTS >>
9396
- run:
9497
name: build
95-
command: scripts/build_windows.bat fortran 2017_build_tools
98+
command: scripts/build_windows.bat fortran 2017_build_tools << pipeline.parameters.ONEAPI_RELEASE >>
9699
- run:
97100
name: exclude unused files from cache
98101
command: scripts/cache_exclude_windows.sh
@@ -126,7 +129,7 @@ jobs:
126129
scripts/install_windows.bat << pipeline.parameters.WINDOWS_BASEKIT_URL >> << pipeline.parameters.WINDOWS_DPCPP_COMPONENTS >>
127130
- run:
128131
name: build
129-
command: scripts/build_windows.bat dpc++ 2017_build_tools
132+
command: scripts/build_windows.bat dpc++ 2017_build_tools << pipeline.parameters.ONEAPI_RELEASE >>
130133
- run:
131134
name: exclude unused files from cache
132135
command: scripts/cache_exclude_windows.sh
@@ -148,7 +151,7 @@ jobs:
148151

149152
build_linux_apt_cpp:
150153
docker:
151-
- image: ubuntu:latest
154+
- image: ubuntu:20.04
152155
steps:
153156
- checkout
154157
- run:
@@ -170,7 +173,7 @@ jobs:
170173
. scripts/install_linux_apt_no_sudo.sh << pipeline.parameters.LINUX_CPP_COMPONENTS >>
171174
- run:
172175
name: build
173-
command: scripts/build_linux.sh c++
176+
command: scripts/build_linux.sh c++ << pipeline.parameters.ONEAPI_RELEASE >>
174177
- run:
175178
name: exclude unused files from cache
176179
command: . scripts/cache_exclude_linux_no_sudo.sh
@@ -181,7 +184,7 @@ jobs:
181184

182185
build_linux_apt_fortran:
183186
docker:
184-
- image: ubuntu:latest
187+
- image: ubuntu:20.04
185188
steps:
186189
- checkout
187190
- run:
@@ -203,7 +206,7 @@ jobs:
203206
. scripts/install_linux_apt_no_sudo.sh << pipeline.parameters.LINUX_FORTRAN_COMPONENTS >>
204207
- run:
205208
name: build
206-
command: scripts/build_linux.sh fortran
209+
command: scripts/build_linux.sh fortran << pipeline.parameters.ONEAPI_RELEASE >>
207210
- run:
208211
name: exclude unused files from cache
209212
command: . scripts/cache_exclude_linux_no_sudo.sh
@@ -214,7 +217,7 @@ jobs:
214217

215218
build_linux_apt_dpcpp:
216219
docker:
217-
- image: ubuntu:latest
220+
- image: ubuntu:20.04
218221
steps:
219222
- checkout
220223
- run:
@@ -236,7 +239,7 @@ jobs:
236239
. scripts/install_linux_apt_no_sudo.sh << pipeline.parameters.LINUX_DPCPP_COMPONENTS >>
237240
- run:
238241
name: build
239-
command: scripts/build_linux.sh dpc++
242+
command: scripts/build_linux.sh dpc++ << pipeline.parameters.ONEAPI_RELEASE >>
240243
- run:
241244
name: exclude unused files from cache
242245
command: . scripts/cache_exclude_linux_no_sudo.sh
@@ -256,7 +259,7 @@ jobs:
256259
- checkout
257260
- run:
258261
name: build
259-
command: scripts/build_linux.sh c++
262+
command: scripts/build_linux.sh c++ << pipeline.parameters.ONEAPI_RELEASE >>
260263

261264
build_linux_container_fortran:
262265
docker:
@@ -268,7 +271,7 @@ jobs:
268271
- checkout
269272
- run:
270273
name: build
271-
command: scripts/build_linux.sh fortran
274+
command: scripts/build_linux.sh fortran << pipeline.parameters.ONEAPI_RELEASE >>
272275

273276
build_linux_container_dpcpp:
274277
docker:
@@ -280,7 +283,7 @@ jobs:
280283
- checkout
281284
- run:
282285
name: build
283-
command: scripts/build_linux.sh dpc++
286+
command: scripts/build_linux.sh dpc++ << pipeline.parameters.ONEAPI_RELEASE >>
284287

285288
workflows:
286289
build-all:

0 commit comments

Comments
 (0)