Skip to content

Commit 9eed36f

Browse files
rscohn2rscohn2
authored
2022.2 (#60)
Enable 2022.2 release. For easier maintenance, disable gitlab and circleci windows. Look at github actions for windows example.
1 parent 44c991d commit 9eed36f

File tree

9 files changed

+58
-425
lines changed

9 files changed

+58
-425
lines changed

‎.appveyor.yml

Lines changed: 10 additions & 9 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/18599/w_BaseKit_p_2022.1.3.210_offline.exe
8-
WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18578/w_HPCKit_p_2022.1.3.145_offline.exe
9-
LINUX_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18487/l_BaseKit_p_2022.1.2.146_offline.sh
10-
LINUX_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18479/l_HPCKit_p_2022.1.2.117_offline.sh
11-
MACOS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18341/m_HPCKit_p_2022.1.0.86_offline.dmg
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
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,8 @@ 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.1.0
23+
SAMPLES_TAG: 2022.2.0
24+
VS_VER: vs2019
2425

2526
matrix:
2627
- job_name: build_windows_cpp
@@ -64,7 +65,7 @@ for:
6465
install:
6566
cmd: scripts/install_windows.bat %WINDOWS_HPCKIT_URL% %WINDOWS_CPP_COMPONENTS%
6667
build_script:
67-
cmd: scripts/build_windows.bat c++ "" %SAMPLES_TAG%
68+
cmd: scripts/build_windows.bat c++ %VS_VER% %SAMPLES_TAG%
6869

6970
# Delete the following if you don't want to save install logs
7071
artifacts:
@@ -80,7 +81,7 @@ for:
8081
install:
8182
cmd: scripts/install_windows.bat %WINDOWS_HPCKIT_URL% %WINDOWS_FORTRAN_COMPONENTS%
8283
build_script:
83-
cmd: scripts/build_windows.bat fortran "" %SAMPLES_TAG%
84+
cmd: scripts/build_windows.bat fortran %VS_VER% %SAMPLES_TAG%
8485

8586
# Delete the following if you don't want to save install logs
8687
artifacts:
@@ -96,7 +97,7 @@ for:
9697
install:
9798
cmd: scripts/install_windows.bat %WINDOWS_BASEKIT_URL% %WINDOWS_DPCPP_COMPONENTS%
9899
build_script:
99-
cmd: scripts/build_windows.bat dpc++ "" %SAMPLES_TAG%
100+
cmd: scripts/build_windows.bat dpc++ %VS_VER% %SAMPLES_TAG%
100101

101102
# Delete the following if you don't want to save install logs
102103
artifacts:

‎.azure-pipelines.yml

Lines changed: 12 additions & 108 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/18599/w_BaseKit_p_2022.1.3.210_offline.exe
10+
value: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/18674/w_BaseKit_p_2022.2.0.252_offline.exe
1111
- name: WINDOWS_HPCKIT_URL
12-
value: https://registrationcenter-download.intel.com/akdlm/irc_nas/18578/w_HPCKit_p_2022.1.3.145_offline.exe
12+
value: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/18680/w_HPCKit_p_2022.2.0.173_offline.exe
1313
- name: LINUX_BASEKIT_URL
14-
value: https://registrationcenter-download.intel.com/akdlm/irc_nas/18487/l_BaseKit_p_2022.1.2.146_offline.sh
14+
value: https://registrationcenter-download.intel.com/akdlm/irc_nas/18673/l_BaseKit_p_2022.2.0.262_offline.sh
1515
- name: LINUX_HPCKIT_URL
16-
value: https://registrationcenter-download.intel.com/akdlm/irc_nas/18479/l_HPCKit_p_2022.1.2.117_offline.sh
16+
value: https://registrationcenter-download.intel.com/akdlm/irc_nas/18679/l_HPCKit_p_2022.2.0.191_offline.sh
1717
- name: MACOS_HPCKIT_URL
18-
value: https://registrationcenter-download.intel.com/akdlm/irc_nas/18341/m_HPCKit_p_2022.1.0.86_offline.dmg
18+
value: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/18681/m_HPCKit_p_2022.2.0.158_offline.dmg
1919
- name: WINDOWS_CPP_COMPONENTS
2020
value: intel.oneapi.win.cpp-compiler
2121
- name: WINDOWS_FORTRAN_COMPONENTS
@@ -39,9 +39,11 @@ variables:
3939
- name: MACOS_FORTRAN_COMPONENTS
4040
value: intel.oneapi.mac.ifort-compiler
4141
- name: SAMPLES_TAG
42-
value: 2022.1.0
42+
value: 2022.2.0
4343
- name: COMPILER_VERSION
44-
value: 2022.0.3
44+
value: 2022.1.0
45+
- name: VS_VER
46+
value: vs2019
4547

4648
resources:
4749
containers:
@@ -57,126 +59,28 @@ jobs:
5759
pool:
5860
vmImage: 'windows-2019'
5961
steps:
60-
- task: Cache@2
61-
inputs:
62-
path: C:\Program Files (x86)\Intel\oneAPI\compiler
63-
key: '"install" | "$(WINDOWS_HPCKIT_URL)" | "$(WINDOWS_CPP_COMPONENTS)" | compiler | scripts/cache_exclude_windows.sh'
64-
cacheHitVar: CACHE_RESTORED
6562
- script: scripts/install_windows.bat $(WINDOWS_HPCKIT_URL) $(WINDOWS_CPP_COMPONENTS)
6663
displayName: install
67-
condition: ne(variables.CACHE_RESTORED, 'true')
68-
- script: scripts/build_windows.bat c++ "" $(SAMPLES_TAG)
64+
- script: scripts/build_windows.bat c++ ${VS_VER} $(SAMPLES_TAG)
6965
displayName: build
70-
- bash: scripts/cache_exclude_windows.sh
71-
displayName: exclude unused files from cache
72-
condition: ne(variables.CACHE_RESTORED, 'true')
73-
74-
# Delete the following if you don't want to save install logs
75-
- task: CopyFiles@2
76-
condition: ne(variables.CACHE_RESTORED, 'true')
77-
inputs:
78-
sourceFolder: '$(Build.SourcesDirectory)'
79-
contents: |
80-
extract.log
81-
bootstrapper*
82-
installer*
83-
targetFolder: '$(Build.ArtifactStagingDirectory)'
84-
- task: PublishBuildArtifacts@1
85-
condition: ne(variables.CACHE_RESTORED, 'true')
86-
inputs:
87-
pathToPublish: '$(Build.ArtifactStagingDirectory)'
88-
artifactName: InstallLogs_$(Agent.JobName)
8966

9067
- job: build_windows_fortran
9168
pool:
9269
vmImage: 'windows-2019'
9370
steps:
94-
- task: Cache@2
95-
inputs:
96-
path: C:\Program Files (x86)\Intel\oneAPI\compiler
97-
key: '"install" | "$(WINDOWS_HPCKIT_URL)" | "$(WINDOWS_FORTRAN_COMPONENTS)" | "compiler" | scripts/cache_exclude_windows.sh'
98-
cacheHitVar: CACHE_RESTORED
9971
- script: scripts/install_windows.bat $(WINDOWS_HPCKIT_URL) $(WINDOWS_FORTRAN_COMPONENTS)
10072
displayName: install
101-
condition: ne(variables.CACHE_RESTORED, 'true')
102-
- script: scripts/build_windows.bat fortran "" $(SAMPLES_TAG)
73+
- script: scripts/build_windows.bat fortran ${VS_VER} $(SAMPLES_TAG)
10374
displayName: build
104-
- bash: scripts/cache_exclude_windows.sh
105-
displayName: exclude unused files from cache
106-
condition: ne(variables.CACHE_RESTORED, 'true')
107-
108-
# Delete the following if you don't want to save install logs
109-
- task: CopyFiles@2
110-
condition: ne(variables.CACHE_RESTORED, 'true')
111-
inputs:
112-
sourceFolder: '$(Build.SourcesDirectory)'
113-
contents: |
114-
extract.log
115-
bootstrapper*
116-
installer*
117-
targetFolder: '$(Build.ArtifactStagingDirectory)'
118-
- task: PublishBuildArtifacts@1
119-
condition: ne(variables.CACHE_RESTORED, 'true')
120-
inputs:
121-
pathToPublish: '$(Build.ArtifactStagingDirectory)'
122-
artifactName: InstallLogs_$(Agent.JobName)
12375

12476
- job: build_windows_dpcpp
12577
pool:
12678
vmImage: 'windows-2019'
12779
steps:
128-
- task: Cache@2 # multiple paths per cache not supported yet. See https://github.com/microsoft/azure-pipelines-agent/pull/2834
129-
inputs:
130-
path: C:\Program Files (x86)\Intel\oneAPI\compiler
131-
key: '"install" | "$(WINDOWS_BASEKIT_URL)" | "$(WINDOWS_DPCPP_COMPONENTS)" | "compiler" | scripts/cache_exclude_windows.sh'
132-
cacheHitVar: CACHE_RESTORED
133-
- task: Cache@2
134-
condition: eq(variables.CACHE_RESTORED, 'true')
135-
inputs:
136-
path: C:\Program Files (x86)\Intel\oneAPI\tbb
137-
key: '"install" | "$(WINDOWS_BASEKIT_URL)" | "$(WINDOWS_DPCPP_COMPONENTS)" | "tbb" | scripts/cache_exclude_windows.sh'
138-
cacheHitVar: CACHE_RESTORED
139-
- task: Cache@2
140-
condition: eq(variables.CACHE_RESTORED, 'true')
141-
inputs:
142-
path: opencl # caching of individual files is not supported, caching OpenCL.dll in a folder as a workaround.
143-
key: '"install" | "$(WINDOWS_BASEKIT_URL)" | "$(WINDOWS_DPCPP_COMPONENTS)" | "opencl_folder" | scripts/cache_exclude_windows.sh'
144-
cacheHitVar: CACHE_RESTORED
14580
- script: scripts/install_windows.bat $(WINDOWS_BASEKIT_URL) $(WINDOWS_DPCPP_COMPONENTS)
14681
displayName: install
147-
condition: ne(variables.CACHE_RESTORED, 'true')
148-
- script: scripts/restore_registry.bat $(COMPILER_VERSION)
149-
displayName: restory registry on cache hit
150-
condition: eq(variables.CACHE_RESTORED, 'true')
151-
- bash: cp opencl/OpenCL.dll C:/Windows/System32/
152-
displayName: restore OpenCL.dll from cache
153-
condition: eq(variables.CACHE_RESTORED, 'true')
154-
- script: scripts/build_windows.bat dpc++ "" $(SAMPLES_TAG)
82+
- script: scripts/build_windows.bat dpc++ ${VS_VER} $(SAMPLES_TAG)
15583
displayName: build
156-
- bash: scripts/cache_exclude_windows.sh
157-
displayName: exclude unused files from cache
158-
condition: ne(variables.CACHE_RESTORED, 'true')
159-
- bash: |
160-
mkdir -p opencl
161-
cp C:/Windows/System32/OpenCL.dll opencl/
162-
displayName: copy OpenCL.dll to a folder for caching
163-
condition: ne(variables.CACHE_RESTORED, 'true')
164-
165-
# Delete the following if you don't want to save install logs
166-
- task: CopyFiles@2
167-
condition: ne(variables.CACHE_RESTORED, 'true')
168-
inputs:
169-
sourceFolder: '$(Build.SourcesDirectory)'
170-
contents: |
171-
extract.log
172-
bootstrapper*
173-
installer*
174-
targetFolder: '$(Build.ArtifactStagingDirectory)'
175-
- task: PublishBuildArtifacts@1
176-
condition: ne(variables.CACHE_RESTORED, 'true')
177-
inputs:
178-
pathToPublish: '$(Build.ArtifactStagingDirectory)'
179-
artifactName: InstallLogs_$(Agent.JobName)
18084

18185
- job: build_linux_cpp
18286
pool:

‎.circleci/config.yml

Lines changed: 4 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,12 @@
44

55
version: 2.1
66
parameters:
7-
WINDOWS_BASEKIT_URL:
8-
type: string
9-
default: "https://registrationcenter-download.intel.com/akdlm/irc_nas/18599/w_BaseKit_p_2022.1.3.210_offline.exe"
10-
WINDOWS_HPCKIT_URL:
11-
type: string
12-
default: "https://registrationcenter-download.intel.com/akdlm/irc_nas/18578/w_HPCKit_p_2022.1.3.145_offline.exe"
137
LINUX_BASEKIT_URL:
148
type: string
15-
default: "https://registrationcenter-download.intel.com/akdlm/irc_nas/18487/l_BaseKit_p_2022.1.2.146_offline.sh"
9+
default: "https://registrationcenter-download.intel.com/akdlm/irc_nas/18673/l_BaseKit_p_2022.2.0.262_offline.sh"
1610
LINUX_HPCKIT_URL:
1711
type: string
18-
default: "https://registrationcenter-download.intel.com/akdlm/irc_nas/18479/l_HPCKit_p_2022.1.2.117_offline.sh"
19-
WINDOWS_CPP_COMPONENTS:
20-
type: string
21-
default: "intel.oneapi.win.cpp-compiler"
22-
WINDOWS_FORTRAN_COMPONENTS:
23-
type: string
24-
default: "intel.oneapi.win.ifort-compiler"
25-
WINDOWS_DPCPP_COMPONENTS:
26-
type: string
27-
default: "intel.oneapi.win.dpcpp-compiler"
12+
default: "https://registrationcenter-download.intel.com/akdlm/irc_nas/18679/l_HPCKit_p_2022.2.0.191_offline.sh"
2813
LINUX_CPP_COMPONENTS:
2914
type: string
3015
default: "intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic"
@@ -45,124 +30,12 @@ parameters:
4530
default: "intel.oneapi.lin.dpcpp-cpp-compiler"
4631
SAMPLES_TAG:
4732
type: string
48-
default: "2022.1.0"
33+
default: "2022.2.0"
4934
COMPILER_VERSION:
5035
type: string
51-
default: "2022.0.3"
52-
53-
orbs:
54-
win: circleci/[email protected]
36+
default: "2022.1.0"
5537

5638
jobs:
57-
build_windows_cpp:
58-
executor:
59-
name: win/default
60-
shell: bash.exe
61-
steps:
62-
- checkout
63-
- restore_cache:
64-
keys:
65-
- install-<< pipeline.parameters.WINDOWS_HPCKIT_URL >>-<< pipeline.parameters.WINDOWS_CPP_COMPONENTS >>-compiler-{{ checksum "scripts/cache_exclude_windows.sh" }}
66-
- run:
67-
name: install
68-
command: |
69-
[ -d "C:\Program Files (x86)\Intel\oneAPI\compiler" ] && exit 0
70-
scripts/install_windows.bat << pipeline.parameters.WINDOWS_HPCKIT_URL >> << pipeline.parameters.WINDOWS_CPP_COMPONENTS >>
71-
- run:
72-
name: build
73-
command: scripts/build_windows.bat c++ 2017_build_tools << pipeline.parameters.SAMPLES_TAG >>
74-
- run:
75-
name: exclude unused files from cache
76-
command: scripts/cache_exclude_windows.sh
77-
- save_cache:
78-
key: install-<< pipeline.parameters.WINDOWS_HPCKIT_URL >>-<< pipeline.parameters.WINDOWS_CPP_COMPONENTS >>-compiler-{{ checksum "scripts/cache_exclude_windows.sh" }}
79-
paths:
80-
- C:\Program Files (x86)\Intel\oneAPI\compiler
81-
82-
# Delete the following if you don't want to save install logs
83-
- run:
84-
command: |
85-
mkdir InstallLogs
86-
cp extract* bootstrapper* installer* InstallLogs || :
87-
when: always
88-
- store_artifacts:
89-
path: InstallLogs
90-
91-
build_windows_fortran:
92-
executor:
93-
name: win/default
94-
shell: bash.exe
95-
steps:
96-
- checkout
97-
- restore_cache:
98-
keys:
99-
- install-<< pipeline.parameters.WINDOWS_HPCKIT_URL >>-<< pipeline.parameters.WINDOWS_FORTRAN_COMPONENTS >>-compiler-{{ checksum "scripts/cache_exclude_windows.sh" }}
100-
- run:
101-
name: install
102-
command: |
103-
[ -d "C:\Program Files (x86)\Intel\oneAPI\compiler" ] && exit 0
104-
scripts/install_windows.bat << pipeline.parameters.WINDOWS_HPCKIT_URL >> << pipeline.parameters.WINDOWS_FORTRAN_COMPONENTS >>
105-
- run:
106-
name: build
107-
command: scripts/build_windows.bat fortran 2017_build_tools << pipeline.parameters.SAMPLES_TAG >>
108-
- run:
109-
name: exclude unused files from cache
110-
command: scripts/cache_exclude_windows.sh
111-
- save_cache:
112-
key: install-<< pipeline.parameters.WINDOWS_HPCKIT_URL >>-<< pipeline.parameters.WINDOWS_FORTRAN_COMPONENTS >>-compiler-{{ checksum "scripts/cache_exclude_windows.sh" }}
113-
paths:
114-
- C:\Program Files (x86)\Intel\oneAPI\compiler
115-
116-
# Delete the following if you don't want to save install logs
117-
- run:
118-
command: |
119-
mkdir InstallLogs
120-
cp extract* bootstrapper* installer* InstallLogs || :
121-
when: always
122-
- store_artifacts:
123-
path: InstallLogs
124-
125-
build_windows_dpcpp:
126-
executor:
127-
name: win/default
128-
shell: bash.exe
129-
steps:
130-
- checkout
131-
- restore_cache:
132-
keys:
133-
- install-<< pipeline.parameters.WINDOWS_BASEKIT_URL >>-<< pipeline.parameters.WINDOWS_DPCPP_COMPONENTS >>-compiler-tbb-opencl-{{ checksum "scripts/cache_exclude_windows.sh" }}
134-
- run:
135-
name: restory registry on cache hit
136-
command: |
137-
[ ! -d "C:\Program Files (x86)\Intel\oneAPI\compiler" ] && exit 0
138-
scripts/restore_registry.bat << pipeline.parameters.COMPILER_VERSION >>
139-
- run:
140-
name: install
141-
command: |
142-
[ -d "C:\Program Files (x86)\Intel\oneAPI\compiler" ] && exit 0
143-
scripts/install_windows.bat << pipeline.parameters.WINDOWS_BASEKIT_URL >> << pipeline.parameters.WINDOWS_DPCPP_COMPONENTS >>
144-
- run:
145-
name: build
146-
command: scripts/build_windows.bat dpc++ 2017_build_tools << pipeline.parameters.SAMPLES_TAG >>
147-
- run:
148-
name: exclude unused files from cache
149-
command: scripts/cache_exclude_windows.sh
150-
- save_cache:
151-
key: install-<< pipeline.parameters.WINDOWS_BASEKIT_URL >>-<< pipeline.parameters.WINDOWS_DPCPP_COMPONENTS >>-compiler-tbb-opencl-{{ checksum "scripts/cache_exclude_windows.sh" }}
152-
paths:
153-
- C:\Program Files (x86)\Intel\oneAPI\compiler
154-
- C:\Program Files (x86)\Intel\oneAPI\tbb
155-
- C:\Windows\System32\OpenCL.dll
156-
157-
# Delete the following if you don't want to save install logs
158-
- run:
159-
command: |
160-
mkdir InstallLogs
161-
cp extract* bootstrapper* installer* InstallLogs || :
162-
when: always
163-
- store_artifacts:
164-
path: InstallLogs
165-
16639
build_linux_cpp:
16740
docker:
16841
- image: ubuntu:20.04
@@ -511,9 +384,6 @@ jobs:
511384
workflows:
512385
build-all:
513386
jobs:
514-
- build_windows_cpp
515-
- build_windows_fortran
516-
- build_windows_dpcpp
517387
- build_linux_cpp
518388
- build_linux_fortran
519389
- build_linux_dpcpp

0 commit comments

Comments
 (0)