Skip to content

Commit c402f54

Browse files
authored
Merge pull request #44 from oneapi-src/dev/2021.2_switch
Switch to 2021.2, remove examples for big containers
2 parents b2c46c2 + 2bf617c commit c402f54

File tree

6 files changed

+41
-97
lines changed

6 files changed

+41
-97
lines changed

.appveyor.yml

Lines changed: 5 additions & 5 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/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-
LINUX_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17431/l_BaseKit_p_2021.1.0.2659_offline.sh
10-
LINUX_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17427/l_HPCKit_p_2021.1.0.2684_offline.sh
11-
MACOS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17398/m_HPCKit_p_2021.1.0.2681_offline.dmg
7+
WINDOWS_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17768/w_BaseKit_p_2021.2.0.2871_offline.exe
8+
WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17762/w_HPCKit_p_2021.2.0.2901_offline.exe
9+
LINUX_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17769/l_BaseKit_p_2021.2.0.2883_offline.sh
10+
LINUX_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17764/l_HPCKit_p_2021.2.0.2997_offline.sh
11+
MACOS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17643/m_HPCKit_p_2021.2.0.2903_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

.azure-pipelines.yml

Lines changed: 9 additions & 35 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/17453/w_BaseKit_p_2021.1.0.2664_offline.exe
10+
value: https://registrationcenter-download.intel.com/akdlm/irc_nas/17768/w_BaseKit_p_2021.2.0.2871_offline.exe
1111
- name: WINDOWS_HPCKIT_URL
12-
value: https://registrationcenter-download.intel.com/akdlm/irc_nas/17392/w_HPCKit_p_2021.1.0.2682_offline.exe
12+
value: https://registrationcenter-download.intel.com/akdlm/irc_nas/17762/w_HPCKit_p_2021.2.0.2901_offline.exe
1313
- name: LINUX_BASEKIT_URL
14-
value: https://registrationcenter-download.intel.com/akdlm/irc_nas/17431/l_BaseKit_p_2021.1.0.2659_offline.sh
14+
value: https://registrationcenter-download.intel.com/akdlm/irc_nas/17769/l_BaseKit_p_2021.2.0.2883_offline.sh
1515
- name: LINUX_HPCKIT_URL
16-
value: https://registrationcenter-download.intel.com/akdlm/irc_nas/17427/l_HPCKit_p_2021.1.0.2684_offline.sh
16+
value: https://registrationcenter-download.intel.com/akdlm/irc_nas/17764/l_HPCKit_p_2021.2.0.2997_offline.sh
1717
- name: MACOS_HPCKIT_URL
18-
value: https://registrationcenter-download.intel.com/akdlm/irc_nas/17398/m_HPCKit_p_2021.1.0.2681_offline.dmg
18+
value: https://registrationcenter-download.intel.com/akdlm/irc_nas/17643/m_HPCKit_p_2021.2.0.2903_offline.dmg
1919
- name: WINDOWS_CPP_COMPONENTS
2020
value: intel.oneapi.win.cpp-compiler
2121
- name: WINDOWS_FORTRAN_COMPONENTS
@@ -125,11 +125,15 @@ jobs:
125125
inputs:
126126
path: C:\Program Files (x86)\Intel\oneAPI\compiler
127127
key: '"install" | "$(WINDOWS_BASEKIT_URL)" | "$(WINDOWS_DPCPP_COMPONENTS)" | "compiler" | scripts/cache_exclude_windows.sh'
128+
cacheHitVar: CACHE_RESTORED
128129
- task: Cache@2
130+
condition: eq(variables.CACHE_RESTORED, 'true')
129131
inputs:
130132
path: C:\Program Files (x86)\Intel\oneAPI\tbb
131133
key: '"install" | "$(WINDOWS_BASEKIT_URL)" | "$(WINDOWS_DPCPP_COMPONENTS)" | "tbb" | scripts/cache_exclude_windows.sh'
134+
cacheHitVar: CACHE_RESTORED
132135
- task: Cache@2
136+
condition: eq(variables.CACHE_RESTORED, 'true')
133137
inputs:
134138
path: opencl # caching of individual files is not supported, caching OpenCL.dll in a folder as a workaround.
135139
key: '"install" | "$(WINDOWS_BASEKIT_URL)" | "$(WINDOWS_DPCPP_COMPONENTS)" | "opencl_folder" | scripts/cache_exclude_windows.sh'
@@ -394,36 +398,6 @@ jobs:
394398
- script: scripts/build_linux.sh dpc++
395399
displayName: build
396400

397-
- job: build_linux_container_cpp
398-
pool:
399-
vmImage: 'ubuntu-20.04'
400-
container: oneapi-hpckit
401-
steps:
402-
- script: sudo apt-get update && sudo apt-get install -y git
403-
displayName: install_git
404-
- script: scripts/build_linux.sh c++
405-
displayName: build
406-
407-
- job: build_linux_container_fortran
408-
pool:
409-
vmImage: 'ubuntu-20.04'
410-
container: oneapi-hpckit
411-
steps:
412-
- script: sudo apt-get update && sudo apt-get install -y git
413-
displayName: install_git
414-
- script: scripts/build_linux.sh fortran
415-
displayName: build
416-
417-
- job: build_linux_container_dpcpp
418-
pool:
419-
vmImage: 'ubuntu-20.04'
420-
container: oneapi-basekit
421-
steps:
422-
- script: sudo apt-get update && sudo apt-get install -y git
423-
displayName: install_git
424-
- script: scripts/build_linux.sh dpc++
425-
displayName: build
426-
427401
- job: build_macOS_cpp
428402
pool:
429403
vmImage: 'macOS-latest'

.circleci/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ version: 2.1
66
parameters:
77
WINDOWS_BASEKIT_URL:
88
type: string
9-
default: "https://registrationcenter-download.intel.com/akdlm/irc_nas/17453/w_BaseKit_p_2021.1.0.2664_offline.exe"
9+
default: "https://registrationcenter-download.intel.com/akdlm/irc_nas/17768/w_BaseKit_p_2021.2.0.2871_offline.exe"
1010
WINDOWS_HPCKIT_URL:
1111
type: string
12-
default: "https://registrationcenter-download.intel.com/akdlm/irc_nas/17392/w_HPCKit_p_2021.1.0.2682_offline.exe"
12+
default: "https://registrationcenter-download.intel.com/akdlm/irc_nas/17762/w_HPCKit_p_2021.2.0.2901_offline.exe"
1313
LINUX_BASEKIT_URL:
1414
type: string
15-
default: "https://registrationcenter-download.intel.com/akdlm/irc_nas/17431/l_BaseKit_p_2021.1.0.2659_offline.sh"
15+
default: "https://registrationcenter-download.intel.com/akdlm/irc_nas/17769/l_BaseKit_p_2021.2.0.2883_offline.sh"
1616
LINUX_HPCKIT_URL:
1717
type: string
18-
default: "https://registrationcenter-download.intel.com/akdlm/irc_nas/17427/l_HPCKit_p_2021.1.0.2684_offline.sh"
18+
default: "https://registrationcenter-download.intel.com/akdlm/irc_nas/17764/l_HPCKit_p_2021.2.0.2997_offline.sh"
1919
WINDOWS_CPP_COMPONENTS:
2020
type: string
2121
default: "intel.oneapi.win.cpp-compiler"

.github/workflows/build_all.yml

Lines changed: 5 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ name: build_all
77
on: push
88

99
env:
10-
WINDOWS_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17453/w_BaseKit_p_2021.1.0.2664_offline.exe
11-
WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17392/w_HPCKit_p_2021.1.0.2682_offline.exe
12-
LINUX_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17431/l_BaseKit_p_2021.1.0.2659_offline.sh
13-
LINUX_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17427/l_HPCKit_p_2021.1.0.2684_offline.sh
14-
MACOS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17398/m_HPCKit_p_2021.1.0.2681_offline.dmg
10+
WINDOWS_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17768/w_BaseKit_p_2021.2.0.2871_offline.exe
11+
WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17762/w_HPCKit_p_2021.2.0.2901_offline.exe
12+
LINUX_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17769/l_BaseKit_p_2021.2.0.2883_offline.sh
13+
LINUX_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17764/l_HPCKit_p_2021.2.0.2997_offline.sh
14+
MACOS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17643/m_HPCKit_p_2021.2.0.2903_offline.dmg
1515
WINDOWS_CPP_COMPONENTS: intel.oneapi.win.cpp-compiler
1616
WINDOWS_FORTRAN_COMPONENTS: intel.oneapi.win.ifort-compiler
1717
WINDOWS_DPCPP_COMPONENTS: intel.oneapi.win.dpcpp-compiler
@@ -409,36 +409,6 @@ jobs:
409409
if: steps.cache-install.outputs.cache-hit != 'true'
410410
run: scripts/cache_exclude_linux.sh
411411

412-
build_linux_container_cpp:
413-
runs-on: ubuntu-20.04
414-
container: intel/oneapi-hpckit
415-
steps:
416-
- uses: actions/checkout@v2
417-
- name: install_git
418-
run: apt update && apt install -y git
419-
- name: build
420-
run: scripts/build_linux.sh c++
421-
422-
build_linux_container_fortran:
423-
runs-on: ubuntu-20.04
424-
container: intel/oneapi-hpckit
425-
steps:
426-
- uses: actions/checkout@v2
427-
- name: install_git
428-
run: apt update && apt install -y git
429-
- name: build
430-
run: scripts/build_linux.sh fortran
431-
432-
build_linux_container_dpcpp:
433-
runs-on: ubuntu-20.04
434-
container: intel/oneapi-basekit
435-
steps:
436-
- uses: actions/checkout@v2
437-
- name: install_git
438-
run: apt update && apt install -y git
439-
- name: build
440-
run: scripts/build_linux.sh dpc++
441-
442412
build_macos_cpp:
443413
runs-on: macos-latest
444414
defaults:

.github/workflows/list_components.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@ on:
1111
- cron: '0 0 * * *'
1212

1313
env:
14-
WINDOWS_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17453/w_BaseKit_p_2021.1.0.2664.exe
15-
WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17392/w_HPCKit_p_2021.1.0.2682.exe
16-
WINDOWS_IOTKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17406/w_IoTKit_p_2021.1.0.1220.exe
17-
WINDOWS_RENDERKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17405/w_RenderKit_p_2021.1.0.626.exe
18-
LINUX_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17431/l_BaseKit_p_2021.1.0.2659.sh
19-
LINUX_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17427/l_HPCKit_p_2021.1.0.2684.sh
20-
LINUX_IOTKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17420/l_IoTKit_p_2021.1.0.2658.sh
21-
LINUX_AIKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17421/l_AIKit_p_2021.1.0.935.sh
22-
LINUX_DLFDKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17399/l_DLFDKit_p_2021.1.0.1920.sh
23-
LINUX_RENDERKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17448/l_RenderKit_p_2021.1.0.627.sh
24-
MACOS_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17426/m_BaseKit_p_2021.1.0.2427.dmg
25-
MACOS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17398/m_HPCKit_p_2021.1.0.2681.dmg
26-
MACOS_RENDERKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17444/m_RenderKit_p_2021.1.0.626.dmg
14+
WINDOWS_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17768/w_BaseKit_p_2021.2.0.2871.exe
15+
WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17762/w_HPCKit_p_2021.2.0.2901.exe
16+
WINDOWS_IOTKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17753/w_IoTKit_p_2021.2.0.1296.exe
17+
WINDOWS_RENDERKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17744/w_RenderKit_p_2021.2.0.726.exe
18+
LINUX_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17769/l_BaseKit_p_2021.2.0.2883.sh
19+
LINUX_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17764/l_HPCKit_p_2021.2.0.2997.sh
20+
LINUX_IOTKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17763/l_IoTKit_p_2021.2.0.2742.sh
21+
LINUX_AIKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17766/l_AIKit_p_2021.2.0.1101.sh
22+
LINUX_DLFDKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17748/l_DLFDKit_p_2021.2.0.1999.sh
23+
LINUX_RENDERKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17746/l_RenderKit_p_2021.2.0.739.sh
24+
MACOS_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17714/m_BaseKit_p_2021.2.0.2855.dmg
25+
MACOS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17643/m_HPCKit_p_2021.2.0.2903.dmg
26+
MACOS_RENDERKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17584/m_RenderKit_p_2021.2.0.700.dmg
2727

2828
jobs:
2929
windows:

.gitlab-ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ stages:
66
- build
77

88
variables:
9-
WINDOWS_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17453/w_BaseKit_p_2021.1.0.2664_offline.exe
10-
WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17392/w_HPCKit_p_2021.1.0.2682_offline.exe
11-
LINUX_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17431/l_BaseKit_p_2021.1.0.2659_offline.sh
12-
LINUX_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17427/l_HPCKit_p_2021.1.0.2684_offline.sh
9+
WINDOWS_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17768/w_BaseKit_p_2021.2.0.2871_offline.exe
10+
WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17762/w_HPCKit_p_2021.2.0.2901_offline.exe
11+
LINUX_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17769/l_BaseKit_p_2021.2.0.2883_offline.sh
12+
LINUX_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17764/l_HPCKit_p_2021.2.0.2997_offline.sh
1313
WINDOWS_CPP_COMPONENTS: intel.oneapi.win.cpp-compiler
1414
WINDOWS_FORTRAN_COMPONENTS: intel.oneapi.win.ifort-compiler
1515
WINDOWS_DPCPP_COMPONENTS: intel.oneapi.win.dpcpp-compiler
@@ -19,7 +19,7 @@ variables:
1919
LINUX_CPP_COMPONENTS_WEB: intel.oneapi.lin.dpcpp-cpp-compiler-pro
2020
LINUX_FORTRAN_COMPONENTS_WEB: intel.oneapi.lin.ifort-compiler
2121
LINUX_DPCPP_COMPONENTS_WEB: intel.oneapi.lin.dpcpp-cpp-compiler
22-
LINUX_APT_DNF_CACHE_NUMBER: 1
22+
LINUX_APT_DNF_CACHE_NUMBER: 2
2323

2424
.shared_windows_runners:
2525
tags:

0 commit comments

Comments
 (0)