Skip to content

Commit c88bf57

Browse files
mmzakharmmzakhar
authored
Updates for 2022.3 (#62)
1 parent 9eed36f commit c88bf57

12 files changed

+487
-60
lines changed

‎.appveyor.yml

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

55
environment:
66
global:
7-
WINDOWS_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/18674/w_BaseKit_p_2022.2.0.252_offline.exe
8-
WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/18680/w_HPCKit_p_2022.2.0.173_offline.exe
9-
LINUX_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18673/l_BaseKit_p_2022.2.0.262_offline.sh
10-
LINUX_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18679/l_HPCKit_p_2022.2.0.191_offline.sh
11-
MACOS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/18681/m_HPCKit_p_2022.2.0.158_offline.dmg
7+
WINDOWS_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18851/w_BaseKit_p_2022.3.0.9573_offline.exe
8+
WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18857/w_HPCKit_p_2022.3.0.9564_offline.exe
9+
LINUX_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18852/l_BaseKit_p_2022.3.0.8767_offline.sh
10+
LINUX_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18856/l_HPCKit_p_2022.3.0.8751_offline.sh
11+
MACOS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18866/m_HPCKit_p_2022.3.0.8685_offline.dmg
1212
WINDOWS_CPP_COMPONENTS: intel.oneapi.win.cpp-compiler
1313
WINDOWS_FORTRAN_COMPONENTS: intel.oneapi.win.ifort-compiler
1414
WINDOWS_DPCPP_COMPONENTS: intel.oneapi.win.dpcpp-compiler
@@ -20,7 +20,7 @@ environment:
2020
LINUX_DPCPP_COMPONENTS_WEB: intel.oneapi.lin.dpcpp-cpp-compiler
2121
MACOS_CPP_COMPONENTS: intel.oneapi.mac.cpp-compiler
2222
MACOS_FORTRAN_COMPONENTS: intel.oneapi.mac.ifort-compiler
23-
SAMPLES_TAG: 2022.2.0
23+
SAMPLES_TAG: 2022.3.0
2424
VS_VER: vs2019
2525

2626
matrix:

‎.azure-pipelines.yml

Lines changed: 154 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ trigger:
77

88
variables:
99
- name: WINDOWS_BASEKIT_URL
10-
value: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/18674/w_BaseKit_p_2022.2.0.252_offline.exe
10+
value: https://registrationcenter-download.intel.com/akdlm/irc_nas/18851/w_BaseKit_p_2022.3.0.9573_offline.exe
1111
- name: WINDOWS_HPCKIT_URL
12-
value: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/18680/w_HPCKit_p_2022.2.0.173_offline.exe
12+
value: https://registrationcenter-download.intel.com/akdlm/irc_nas/18857/w_HPCKit_p_2022.3.0.9564_offline.exe
1313
- name: LINUX_BASEKIT_URL
14-
value: https://registrationcenter-download.intel.com/akdlm/irc_nas/18673/l_BaseKit_p_2022.2.0.262_offline.sh
14+
value: https://registrationcenter-download.intel.com/akdlm/irc_nas/18852/l_BaseKit_p_2022.3.0.8767_offline.sh
1515
- name: LINUX_HPCKIT_URL
16-
value: https://registrationcenter-download.intel.com/akdlm/irc_nas/18679/l_HPCKit_p_2022.2.0.191_offline.sh
16+
value: https://registrationcenter-download.intel.com/akdlm/irc_nas/18856/l_HPCKit_p_2022.3.0.8751_offline.sh
1717
- name: MACOS_HPCKIT_URL
18-
value: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/18681/m_HPCKit_p_2022.2.0.158_offline.dmg
18+
value: https://registrationcenter-download.intel.com/akdlm/irc_nas/18866/m_HPCKit_p_2022.3.0.8685_offline.dmg
1919
- name: WINDOWS_CPP_COMPONENTS
2020
value: intel.oneapi.win.cpp-compiler
2121
- name: WINDOWS_FORTRAN_COMPONENTS
@@ -39,11 +39,11 @@ variables:
3939
- name: MACOS_FORTRAN_COMPONENTS
4040
value: intel.oneapi.mac.ifort-compiler
4141
- name: SAMPLES_TAG
42-
value: 2022.2.0
42+
value: 2022.3.0
4343
- name: COMPILER_VERSION
44-
value: 2022.1.0
44+
value: 2022.2
4545
- name: VS_VER
46-
value: vs2019
46+
value: vs2022
4747

4848
resources:
4949
containers:
@@ -57,30 +57,170 @@ resources:
5757
jobs:
5858
- job: build_windows_cpp
5959
pool:
60-
vmImage: 'windows-2019'
60+
vmImage: 'windows-latest'
6161
steps:
62+
- task: Cache@2 # multiple paths per cache not supported yet. See https://github.com/microsoft/azure-pipelines-agent/pull/2834
63+
inputs:
64+
path: vcvarsall
65+
key: '"install" | "$(WINDOWS_HPCKIT_URL)" | "$(WINDOWS_CPP_COMPONENTS)" | "vcvarsall" | scripts/cache_exclude_windows.sh'
66+
cacheHitVar: CACHE_RESTORED
67+
- task: Cache@2
68+
condition: eq(variables.CACHE_RESTORED, 'true')
69+
inputs:
70+
path: C:\Program Files (x86)\Intel\oneAPI\compiler
71+
key: '"install" | "$(WINDOWS_HPCKIT_URL)" | "$(WINDOWS_CPP_COMPONENTS)" | "compiler" | scripts/cache_exclude_windows.sh'
72+
cacheHitVar: CACHE_RESTORED
6273
- script: scripts/install_windows.bat $(WINDOWS_HPCKIT_URL) $(WINDOWS_CPP_COMPONENTS)
6374
displayName: install
64-
- script: scripts/build_windows.bat c++ ${VS_VER} $(SAMPLES_TAG)
75+
condition: ne(variables.CACHE_RESTORED, 'true')
76+
- bash: cp vcvarsall/setvars-vcvarsall.bat "C:/Program Files (x86)/Intel/oneAPI/"
77+
displayName: restore setvars-vcvarsall.bat from cache
78+
condition: eq(variables.CACHE_RESTORED, 'true')
79+
- script: scripts/build_windows.bat c++ $(VS_VER) $(SAMPLES_TAG)
6580
displayName: build
81+
- bash: scripts/cache_exclude_windows.sh
82+
displayName: exclude unused files from cache
83+
condition: ne(variables.CACHE_RESTORED, 'true')
84+
- bash: |
85+
mkdir -p vcvarsall
86+
cp "C:/Program Files (x86)/Intel/oneAPI/setvars-vcvarsall.bat" vcvarsall/
87+
displayName: copy setvars-vcvarsall.bat to a folder for caching
88+
condition: ne(variables.CACHE_RESTORED, 'true')
89+
90+
# Delete the following if you don't want to save install logs
91+
- task: CopyFiles@2
92+
condition: ne(variables.CACHE_RESTORED, 'true')
93+
inputs:
94+
sourceFolder: '$(Build.SourcesDirectory)'
95+
contents: |
96+
extract.log
97+
bootstrapper*
98+
installer*
99+
targetFolder: '$(Build.ArtifactStagingDirectory)'
100+
- task: PublishBuildArtifacts@1
101+
condition: ne(variables.CACHE_RESTORED, 'true')
102+
inputs:
103+
pathToPublish: '$(Build.ArtifactStagingDirectory)'
104+
artifactName: InstallLogs_$(Agent.JobName)
66105

67106
- job: build_windows_fortran
68107
pool:
69-
vmImage: 'windows-2019'
108+
vmImage: 'windows-latest'
70109
steps:
110+
- task: Cache@2 # multiple paths per cache not supported yet. See https://github.com/microsoft/azure-pipelines-agent/pull/2834
111+
inputs:
112+
path: vcvarsall
113+
key: '"install" | "$(WINDOWS_HPCKIT_URL)" | "$(WINDOWS_FORTRAN_COMPONENTS)" | "vcvarsall" | scripts/cache_exclude_windows.sh'
114+
cacheHitVar: CACHE_RESTORED
115+
- task: Cache@2
116+
condition: eq(variables.CACHE_RESTORED, 'true')
117+
inputs:
118+
path: C:\Program Files (x86)\Intel\oneAPI\compiler
119+
key: '"install" | "$(WINDOWS_HPCKIT_URL)" | "$(WINDOWS_FORTRAN_COMPONENTS)" | "compiler" | scripts/cache_exclude_windows.sh'
120+
cacheHitVar: CACHE_RESTORED
71121
- script: scripts/install_windows.bat $(WINDOWS_HPCKIT_URL) $(WINDOWS_FORTRAN_COMPONENTS)
72122
displayName: install
73-
- script: scripts/build_windows.bat fortran ${VS_VER} $(SAMPLES_TAG)
123+
condition: ne(variables.CACHE_RESTORED, 'true')
124+
- bash: cp vcvarsall/setvars-vcvarsall.bat "C:/Program Files (x86)/Intel/oneAPI/"
125+
displayName: restore setvars-vcvarsall.bat from cache
126+
condition: eq(variables.CACHE_RESTORED, 'true')
127+
- script: scripts/build_windows.bat fortran $(VS_VER) $(SAMPLES_TAG)
74128
displayName: build
129+
- bash: scripts/cache_exclude_windows.sh
130+
displayName: exclude unused files from cache
131+
condition: ne(variables.CACHE_RESTORED, 'true')
132+
- bash: |
133+
mkdir -p vcvarsall
134+
cp "C:/Program Files (x86)/Intel/oneAPI/setvars-vcvarsall.bat" vcvarsall/
135+
displayName: copy setvars-vcvarsall.bat to a folder for caching
136+
condition: ne(variables.CACHE_RESTORED, 'true')
137+
138+
# Delete the following if you don't want to save install logs
139+
- task: CopyFiles@2
140+
condition: ne(variables.CACHE_RESTORED, 'true')
141+
inputs:
142+
sourceFolder: '$(Build.SourcesDirectory)'
143+
contents: |
144+
extract.log
145+
bootstrapper*
146+
installer*
147+
targetFolder: '$(Build.ArtifactStagingDirectory)'
148+
- task: PublishBuildArtifacts@1
149+
condition: ne(variables.CACHE_RESTORED, 'true')
150+
inputs:
151+
pathToPublish: '$(Build.ArtifactStagingDirectory)'
152+
artifactName: InstallLogs_$(Agent.JobName)
75153

76154
- job: build_windows_dpcpp
77155
pool:
78-
vmImage: 'windows-2019'
156+
vmImage: 'windows-latest'
79157
steps:
158+
- task: Cache@2 # multiple paths per cache not supported yet. See https://github.com/microsoft/azure-pipelines-agent/pull/2834
159+
inputs:
160+
path: vcvarsall
161+
key: '"install" | "$(WINDOWS_BASEKIT_URL)" | "$(WINDOWS_DPCPP_COMPONENTS)" | "vcvarsall" | scripts/cache_exclude_windows.sh'
162+
cacheHitVar: CACHE_RESTORED
163+
- task: Cache@2
164+
condition: eq(variables.CACHE_RESTORED, 'true')
165+
inputs:
166+
path: C:\Program Files (x86)\Intel\oneAPI\compiler
167+
key: '"install" | "$(WINDOWS_BASEKIT_URL)" | "$(WINDOWS_DPCPP_COMPONENTS)" | "compiler" | scripts/cache_exclude_windows.sh'
168+
cacheHitVar: CACHE_RESTORED
169+
- task: Cache@2
170+
condition: eq(variables.CACHE_RESTORED, 'true')
171+
inputs:
172+
path: C:\Program Files (x86)\Intel\oneAPI\tbb
173+
key: '"install" | "$(WINDOWS_BASEKIT_URL)" | "$(WINDOWS_DPCPP_COMPONENTS)" | "tbb" | scripts/cache_exclude_windows.sh'
174+
cacheHitVar: CACHE_RESTORED
175+
- task: Cache@2
176+
condition: eq(variables.CACHE_RESTORED, 'true')
177+
inputs:
178+
path: opencl # caching of individual files is not supported, caching OpenCL.dll in a folder as a workaround.
179+
key: '"install" | "$(WINDOWS_BASEKIT_URL)" | "$(WINDOWS_DPCPP_COMPONENTS)" | "opencl_folder" | scripts/cache_exclude_windows.sh'
180+
cacheHitVar: CACHE_RESTORED
80181
- script: scripts/install_windows.bat $(WINDOWS_BASEKIT_URL) $(WINDOWS_DPCPP_COMPONENTS)
81182
displayName: install
82-
- script: scripts/build_windows.bat dpc++ ${VS_VER} $(SAMPLES_TAG)
183+
condition: ne(variables.CACHE_RESTORED, 'true')
184+
- script: scripts/restore_registry.bat $(COMPILER_VERSION)
185+
displayName: restory registry on cache hit
186+
condition: eq(variables.CACHE_RESTORED, 'true')
187+
- bash: cp vcvarsall/setvars-vcvarsall.bat "C:/Program Files (x86)/Intel/oneAPI/"
188+
displayName: restore setvars-vcvarsall.bat from cache
189+
condition: eq(variables.CACHE_RESTORED, 'true')
190+
- bash: cp opencl/OpenCL.dll C:/Windows/System32/
191+
displayName: restore OpenCL.dll from cache
192+
condition: eq(variables.CACHE_RESTORED, 'true')
193+
- script: scripts/build_windows.bat dpc++ $(VS_VER) $(SAMPLES_TAG)
83194
displayName: build
195+
- bash: scripts/cache_exclude_windows.sh
196+
displayName: exclude unused files from cache
197+
condition: ne(variables.CACHE_RESTORED, 'true')
198+
- bash: |
199+
mkdir -p vcvarsall
200+
cp "C:/Program Files (x86)/Intel/oneAPI/setvars-vcvarsall.bat" vcvarsall/
201+
displayName: copy setvars-vcvarsall.bat to a folder for caching
202+
condition: ne(variables.CACHE_RESTORED, 'true')
203+
- bash: |
204+
mkdir -p opencl
205+
cp C:/Windows/System32/OpenCL.dll opencl/
206+
displayName: copy OpenCL.dll to a folder for caching
207+
condition: ne(variables.CACHE_RESTORED, 'true')
208+
209+
# Delete the following if you don't want to save install logs
210+
- task: CopyFiles@2
211+
condition: ne(variables.CACHE_RESTORED, 'true')
212+
inputs:
213+
sourceFolder: '$(Build.SourcesDirectory)'
214+
contents: |
215+
extract.log
216+
bootstrapper*
217+
installer*
218+
targetFolder: '$(Build.ArtifactStagingDirectory)'
219+
- task: PublishBuildArtifacts@1
220+
condition: ne(variables.CACHE_RESTORED, 'true')
221+
inputs:
222+
pathToPublish: '$(Build.ArtifactStagingDirectory)'
223+
artifactName: InstallLogs_$(Agent.JobName)
84224

85225
- job: build_linux_cpp
86226
pool:

0 commit comments

Comments
 (0)