Skip to content

Commit a3c49e7

Browse files
Replaced the old oneAPI Base and HPC Toolkit with the new unified oneAPI Toolkit. (#117)
* Replaced references to the old oneAPI Base and HPC Toolkit URLs with the new unified oneAPI Toolkit. Updated component versions to 2026.0 and adjusted the samples tag to 'master'. * Update Docker images from Fedora 37 to Fedora 43 in CI configuration files.
1 parent 8a58891 commit a3c49e7

8 files changed

Lines changed: 118 additions & 143 deletions

File tree

.appveyor.yml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
44

55
environment:
66
global:
7-
WINDOWS_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/1f18901e-877d-469d-a41a-a10f11b39336/intel-oneapi-base-toolkit-2025.3.0.372_offline.exe
8-
WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/3a871580-f839-46ed-aeae-685084127279/intel-oneapi-hpc-toolkit-2025.3.0.378_offline.exe
9-
LINUX_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/d640da34-77cc-4ab2-8019-ac5592f4ec19/intel-oneapi-base-toolkit-2025.3.0.375_offline.sh
10-
LINUX_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/66021d90-934d-41f4-bedf-b8c00bbe98bc/intel-oneapi-hpc-toolkit-2025.3.0.381_offline.sh
7+
WINDOWS_TOOLKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/bae85ab1-cfcd-4251-8d42-a0c27949ea33/intel-oneapi-toolkit-2026.0.0.193_offline.exe
8+
LINUX_TOOLKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/71180075-e4e3-4c6f-bbbb-19017ed0cf7d/intel-oneapi-toolkit-2026.0.0.198_offline.sh
119
WINDOWS_CPP_COMPONENTS: intel.oneapi.win.cpp-dpcpp-common
1210
WINDOWS_FORTRAN_COMPONENTS: intel.oneapi.win.ifort-compiler
1311
WINDOWS_DPCPP_COMPONENTS: intel.oneapi.win.cpp-dpcpp-common
@@ -17,7 +15,7 @@ environment:
1715
LINUX_CPP_COMPONENTS_WEB: intel.oneapi.lin.dpcpp-cpp-compiler
1816
LINUX_FORTRAN_COMPONENTS_WEB: intel.oneapi.lin.ifort-compiler
1917
LINUX_DPCPP_COMPONENTS_WEB: intel.oneapi.lin.dpcpp-cpp-compiler
20-
SAMPLES_TAG: 2025.3.0
18+
SAMPLES_TAG: master
2119
VS_VER: vs2019
2220

2321
matrix:
@@ -54,7 +52,7 @@ for:
5452
only:
5553
- job_name: build_windows_cpp
5654
install:
57-
cmd: scripts/install_windows.bat %WINDOWS_HPCKIT_URL% %WINDOWS_CPP_COMPONENTS%
55+
cmd: scripts/install_windows.bat %WINDOWS_TOOLKIT_URL% %WINDOWS_CPP_COMPONENTS%
5856
build_script:
5957
cmd: scripts/build_windows.bat c++ %VS_VER% %SAMPLES_TAG%
6058

@@ -70,7 +68,7 @@ for:
7068
only:
7169
- job_name: build_windows_fortran
7270
install:
73-
cmd: scripts/install_windows.bat %WINDOWS_HPCKIT_URL% %WINDOWS_FORTRAN_COMPONENTS%
71+
cmd: scripts/install_windows.bat %WINDOWS_TOOLKIT_URL% %WINDOWS_FORTRAN_COMPONENTS%
7472
build_script:
7573
cmd: scripts/build_windows.bat fortran %VS_VER% %SAMPLES_TAG%
7674

@@ -86,7 +84,7 @@ for:
8684
only:
8785
- job_name: build_windows_dpcpp
8886
install:
89-
cmd: scripts/install_windows.bat %WINDOWS_BASEKIT_URL% %WINDOWS_DPCPP_COMPONENTS%
87+
cmd: scripts/install_windows.bat %WINDOWS_TOOLKIT_URL% %WINDOWS_DPCPP_COMPONENTS%
9088
build_script:
9189
cmd: scripts/build_windows.bat dpc++ %VS_VER% %SAMPLES_TAG%
9290

@@ -103,7 +101,7 @@ for:
103101
- job_name: build_linux_cpp
104102
install:
105103
sh: |
106-
scripts/install_linux.sh $LINUX_HPCKIT_URL $LINUX_CPP_COMPONENTS_WEB
104+
scripts/install_linux.sh $LINUX_TOOLKIT_URL $LINUX_CPP_COMPONENTS_WEB
107105
build_script:
108106
sh: scripts/build_linux.sh c++ $SAMPLES_TAG
109107

@@ -121,7 +119,7 @@ for:
121119
- job_name: build_linux_fortran
122120
install:
123121
sh: |
124-
scripts/install_linux.sh $LINUX_HPCKIT_URL $LINUX_FORTRAN_COMPONENTS_WEB
122+
scripts/install_linux.sh $LINUX_TOOLKIT_URL $LINUX_FORTRAN_COMPONENTS_WEB
125123
build_script:
126124
sh: scripts/build_linux.sh fortran $SAMPLES_TAG
127125

@@ -139,7 +137,7 @@ for:
139137
- job_name: build_linux_dpcpp
140138
install:
141139
sh: |
142-
scripts/install_linux.sh $LINUX_BASEKIT_URL $LINUX_DPCPP_COMPONENTS_WEB
140+
scripts/install_linux.sh $LINUX_TOOLKIT_URL $LINUX_DPCPP_COMPONENTS_WEB
143141
build_script:
144142
sh: scripts/build_linux.sh dpc++ $SAMPLES_TAG
145143

.azure-pipelines.yml

Lines changed: 27 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,10 @@ trigger:
66
- master
77

88
variables:
9-
- name: WINDOWS_BASEKIT_URL
10-
value: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/1f18901e-877d-469d-a41a-a10f11b39336/intel-oneapi-base-toolkit-2025.3.0.372_offline.exe
11-
- name: WINDOWS_HPCKIT_URL
12-
value: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/3a871580-f839-46ed-aeae-685084127279/intel-oneapi-hpc-toolkit-2025.3.0.378_offline.exe
13-
- name: LINUX_BASEKIT_URL
14-
value: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/d640da34-77cc-4ab2-8019-ac5592f4ec19/intel-oneapi-base-toolkit-2025.3.0.375_offline.sh
15-
- name: LINUX_HPCKIT_URL
16-
value: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/66021d90-934d-41f4-bedf-b8c00bbe98bc/intel-oneapi-hpc-toolkit-2025.3.0.381_offline.sh
9+
- name: WINDOWS_TOOLKIT_URL
10+
value: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/bae85ab1-cfcd-4251-8d42-a0c27949ea33/intel-oneapi-toolkit-2026.0.0.193_offline.exe
11+
- name: LINUX_TOOLKIT_URL
12+
value: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/71180075-e4e3-4c6f-bbbb-19017ed0cf7d/intel-oneapi-toolkit-2026.0.0.198_offline.sh
1713
- name: WINDOWS_CPP_COMPONENTS
1814
value: intel.oneapi.win.cpp-dpcpp-common
1915
- name: WINDOWS_FORTRAN_COMPONENTS
@@ -33,21 +29,18 @@ variables:
3329
- name: LINUX_DPCPP_COMPONENTS_WEB
3430
value: intel.oneapi.lin.dpcpp-cpp-compiler
3531
- name: SAMPLES_TAG
36-
value: 2025.1.0
32+
value: master
3733
- name: COMPILER_VERSION
38-
value: 2025.3
34+
value: 2026.0
3935
- name: TBB_VERSION
40-
value: 2022.3
36+
value: 2023.0
4137
- name: VS_VER
4238
value: vs2022
4339

4440
resources:
4541
containers:
46-
- container: oneapi-hpckit
47-
image: intel/oneapi-hpckit:latest
48-
options: '-v /usr/bin/sudo:/usr/bin/sudo -v /usr/lib/sudo/libsudo_util.so.0:/usr/lib/sudo/libsudo_util.so.0 -v /usr/lib/sudo/sudoers.so:/usr/lib/sudo/sudoers.so'
49-
- container: oneapi-basekit
50-
image: intel/oneapi-basekit:latest
42+
- container: oneapi-toolkit
43+
image: intel/oneapi-toolkit:latest
5144
options: '-v /usr/bin/sudo:/usr/bin/sudo -v /usr/lib/sudo/libsudo_util.so.0:/usr/lib/sudo/libsudo_util.so.0 -v /usr/lib/sudo/sudoers.so:/usr/lib/sudo/sudoers.so'
5245

5346
jobs:
@@ -58,15 +51,15 @@ jobs:
5851
- task: Cache@2 # multiple paths per cache not supported yet. See https://github.com/microsoft/azure-pipelines-agent/pull/2834
5952
inputs:
6053
path: vcvarsall
61-
key: '"install" | "$(WINDOWS_HPCKIT_URL)" | "$(WINDOWS_CPP_COMPONENTS)" | "vcvarsall" | scripts/cache_exclude_windows.sh'
54+
key: '"install" | "$(WINDOWS_TOOLKIT_URL)" | "$(WINDOWS_CPP_COMPONENTS)" | "vcvarsall" | scripts/cache_exclude_windows.sh'
6255
cacheHitVar: CACHE_RESTORED
6356
- task: Cache@2
6457
condition: eq(variables.CACHE_RESTORED, 'true')
6558
inputs:
6659
path: C:\Program Files (x86)\Intel\oneAPI\compiler
67-
key: '"install" | "$(WINDOWS_HPCKIT_URL)" | "$(WINDOWS_CPP_COMPONENTS)" | "compiler" | scripts/cache_exclude_windows.sh'
60+
key: '"install" | "$(WINDOWS_TOOLKIT_URL)" | "$(WINDOWS_CPP_COMPONENTS)" | "compiler" | scripts/cache_exclude_windows.sh'
6861
cacheHitVar: CACHE_RESTORED
69-
- script: scripts/install_windows.bat $(WINDOWS_HPCKIT_URL) $(WINDOWS_CPP_COMPONENTS)
62+
- script: scripts/install_windows.bat $(WINDOWS_TOOLKIT_URL) $(WINDOWS_CPP_COMPONENTS)
7063
displayName: install
7164
condition: ne(variables.CACHE_RESTORED, 'true')
7265
- bash: cp vcvarsall/setvars-vcvarsall.bat "C:/Program Files (x86)/Intel/oneAPI/"
@@ -106,15 +99,15 @@ jobs:
10699
- task: Cache@2 # multiple paths per cache not supported yet. See https://github.com/microsoft/azure-pipelines-agent/pull/2834
107100
inputs:
108101
path: vcvarsall
109-
key: '"install" | "$(WINDOWS_HPCKIT_URL)" | "$(WINDOWS_FORTRAN_COMPONENTS)" | "vcvarsall" | scripts/cache_exclude_windows.sh'
102+
key: '"install" | "$(WINDOWS_TOOLKIT_URL)" | "$(WINDOWS_FORTRAN_COMPONENTS)" | "vcvarsall" | scripts/cache_exclude_windows.sh'
110103
cacheHitVar: CACHE_RESTORED
111104
- task: Cache@2
112105
condition: eq(variables.CACHE_RESTORED, 'true')
113106
inputs:
114107
path: C:\Program Files (x86)\Intel\oneAPI\compiler
115-
key: '"install" | "$(WINDOWS_HPCKIT_URL)" | "$(WINDOWS_FORTRAN_COMPONENTS)" | "compiler" | scripts/cache_exclude_windows.sh'
108+
key: '"install" | "$(WINDOWS_TOOLKIT_URL)" | "$(WINDOWS_FORTRAN_COMPONENTS)" | "compiler" | scripts/cache_exclude_windows.sh'
116109
cacheHitVar: CACHE_RESTORED
117-
- script: scripts/install_windows.bat $(WINDOWS_HPCKIT_URL) $(WINDOWS_FORTRAN_COMPONENTS)
110+
- script: scripts/install_windows.bat $(WINDOWS_TOOLKIT_URL) $(WINDOWS_FORTRAN_COMPONENTS)
118111
displayName: install
119112
condition: ne(variables.CACHE_RESTORED, 'true')
120113
- bash: cp vcvarsall/setvars-vcvarsall.bat "C:/Program Files (x86)/Intel/oneAPI/"
@@ -154,27 +147,27 @@ jobs:
154147
- task: Cache@2 # multiple paths per cache not supported yet. See https://github.com/microsoft/azure-pipelines-agent/pull/2834
155148
inputs:
156149
path: vcvarsall
157-
key: '"install" | "$(WINDOWS_BASEKIT_URL)" | "$(WINDOWS_DPCPP_COMPONENTS)" | "vcvarsall" | scripts/cache_exclude_windows.sh'
150+
key: '"install" | "$(WINDOWS_TOOLKIT_URL)" | "$(WINDOWS_DPCPP_COMPONENTS)" | "vcvarsall" | scripts/cache_exclude_windows.sh'
158151
cacheHitVar: CACHE_RESTORED
159152
- task: Cache@2
160153
condition: eq(variables.CACHE_RESTORED, 'true')
161154
inputs:
162155
path: C:\Program Files (x86)\Intel\oneAPI\compiler
163-
key: '"install" | "$(WINDOWS_BASEKIT_URL)" | "$(WINDOWS_DPCPP_COMPONENTS)" | "compiler" | scripts/cache_exclude_windows.sh'
156+
key: '"install" | "$(WINDOWS_TOOLKIT_URL)" | "$(WINDOWS_DPCPP_COMPONENTS)" | "compiler" | scripts/cache_exclude_windows.sh'
164157
cacheHitVar: CACHE_RESTORED
165158
- task: Cache@2
166159
condition: eq(variables.CACHE_RESTORED, 'true')
167160
inputs:
168161
path: C:\Program Files (x86)\Intel\oneAPI\tbb
169-
key: '"install" | "$(WINDOWS_BASEKIT_URL)" | "$(WINDOWS_DPCPP_COMPONENTS)" | "tbb" | scripts/cache_exclude_windows.sh'
162+
key: '"install" | "$(WINDOWS_TOOLKIT_URL)" | "$(WINDOWS_DPCPP_COMPONENTS)" | "tbb" | scripts/cache_exclude_windows.sh'
170163
cacheHitVar: CACHE_RESTORED
171164
- task: Cache@2
172165
condition: eq(variables.CACHE_RESTORED, 'true')
173166
inputs:
174167
path: opencl # caching of individual files is not supported, caching OpenCL.dll in a folder as a workaround.
175-
key: '"install" | "$(WINDOWS_BASEKIT_URL)" | "$(WINDOWS_DPCPP_COMPONENTS)" | "opencl_folder" | scripts/cache_exclude_windows.sh'
168+
key: '"install" | "$(WINDOWS_TOOLKIT_URL)" | "$(WINDOWS_DPCPP_COMPONENTS)" | "opencl_folder" | scripts/cache_exclude_windows.sh'
176169
cacheHitVar: CACHE_RESTORED
177-
- script: scripts/install_windows.bat $(WINDOWS_BASEKIT_URL) $(WINDOWS_DPCPP_COMPONENTS)
170+
- script: scripts/install_windows.bat $(WINDOWS_TOOLKIT_URL) $(WINDOWS_DPCPP_COMPONENTS)
178171
displayName: install
179172
condition: ne(variables.CACHE_RESTORED, 'true')
180173
- script: scripts/restore_registry.bat $(COMPILER_VERSION) $(TBB_VERSION)
@@ -225,9 +218,9 @@ jobs:
225218
- task: Cache@2
226219
inputs:
227220
path: /opt/intel/oneapi/compiler
228-
key: '"install" | "$(LINUX_HPCKIT_URL)" | "$(LINUX_CPP_COMPONENTS_WEB)" | "compiler" | scripts/cache_exclude_linux.sh'
221+
key: '"install" | "$(LINUX_TOOLKIT_URL)" | "$(LINUX_CPP_COMPONENTS_WEB)" | "compiler" | scripts/cache_exclude_linux.sh'
229222
cacheHitVar: CACHE_RESTORED
230-
- script: scripts/install_linux.sh $(LINUX_HPCKIT_URL) $(LINUX_CPP_COMPONENTS_WEB)
223+
- script: scripts/install_linux.sh $(LINUX_TOOLKIT_URL) $(LINUX_CPP_COMPONENTS_WEB)
231224
displayName: install
232225
condition: ne(variables.CACHE_RESTORED, 'true')
233226
- script: scripts/build_linux.sh c++ $(SAMPLES_TAG)
@@ -259,9 +252,9 @@ jobs:
259252
- task: Cache@2
260253
inputs:
261254
path: /opt/intel/oneapi/compiler
262-
key: '"install" | "$(LINUX_HPCKIT_URL)" | "$(LINUX_FORTRAN_COMPONENTS_WEB)" | "compiler" | scripts/cache_exclude_linux.sh'
255+
key: '"install" | "$(LINUX_TOOLKIT_URL)" | "$(LINUX_FORTRAN_COMPONENTS_WEB)" | "compiler" | scripts/cache_exclude_linux.sh'
263256
cacheHitVar: CACHE_RESTORED
264-
- script: scripts/install_linux.sh $(LINUX_HPCKIT_URL) $(LINUX_FORTRAN_COMPONENTS_WEB)
257+
- script: scripts/install_linux.sh $(LINUX_TOOLKIT_URL) $(LINUX_FORTRAN_COMPONENTS_WEB)
265258
displayName: install
266259
condition: ne(variables.CACHE_RESTORED, 'true')
267260
- script: scripts/build_linux.sh fortran $(SAMPLES_TAG)
@@ -293,13 +286,13 @@ jobs:
293286
- task: Cache@2
294287
inputs:
295288
path: /opt/intel/oneapi/compiler
296-
key: '"install" | "$(LINUX_BASEKIT_URL)" | "$(LINUX_DPCPP_COMPONENTS_WEB)" | "compiler" | scripts/cache_exclude_linux.sh'
289+
key: '"install" | "$(LINUX_TOOLKIT_URL)" | "$(LINUX_DPCPP_COMPONENTS_WEB)" | "compiler" | scripts/cache_exclude_linux.sh'
297290
- task: Cache@2
298291
inputs:
299292
path: /opt/intel/oneapi/tbb
300-
key: '"install" | "$(LINUX_BASEKIT_URL)" | "$(LINUX_DPCPP_COMPONENTS_WEB)" | "tbb" | scripts/cache_exclude_linux.sh'
293+
key: '"install" | "$(LINUX_TOOLKIT_URL)" | "$(LINUX_DPCPP_COMPONENTS_WEB)" | "tbb" | scripts/cache_exclude_linux.sh'
301294
cacheHitVar: CACHE_RESTORED
302-
- script: scripts/install_linux.sh $(LINUX_BASEKIT_URL) $(LINUX_DPCPP_COMPONENTS_WEB)
295+
- script: scripts/install_linux.sh $(LINUX_TOOLKIT_URL) $(LINUX_DPCPP_COMPONENTS_WEB)
303296
displayName: install
304297
condition: ne(variables.CACHE_RESTORED, 'true')
305298
- script: scripts/build_linux.sh dpc++ $(SAMPLES_TAG)

0 commit comments

Comments
 (0)