Skip to content

#43: upgrade icpx build to 2023 #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lifflander merged 7 commits into from
Jul 7, 2026
Merged

#43: upgrade icpx build to 2023 #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b9b6303
#43: upgrade icpx build to 2023
antoinemeyer5 Jun 26, 2026
9bb3ca5
#43: upgrade ubuntu version
antoinemeyer5 Jun 26, 2026
2d7b8aa
#43: upgrade icpx build to 2023
antoinemeyer5 Jun 26, 2026
6141576
#43: upgrade icpx build to 2023
antoinemeyer5 Jun 26, 2026
18f50bf
#43: upgrade icpx build to 2023
antoinemeyer5 Jun 26, 2026
4dbec33
#43: upgrade icpx build to 2023
antoinemeyer5 Jun 30, 2026
ff9b839
#43: upgrade icpx build to 2023
antoinemeyer5 Jun 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/build-docker-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ jobs:
TAG=${TAG/11-2-2/11.2.2}
TAG=${TAG/11-4-3/11.4.3}
TAG=${TAG/12-2-0/12.2.0}
TAG=${TAG/12-9-0/12.9.0}
docker run \
--name test-container \
"lifflander1/vt:wf-$TAG" \
Expand Down
32 changes: 26 additions & 6 deletions ci/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,14 @@ setup:
<<: *amd64-ubuntu-20_04-gcc-9-cuda-12_2_0-cpp
label: nvidia cuda 11.2.2, gcc-9, ubuntu, mpich

amd64-ubuntu-24.04-gcc-13-cuda-12.9.0-cpp:
label: nvidia cuda 12.9.0, gcc-13, ubuntu, mpich
env: { <<: *env, CC: gcc-13, CXX: nvcc_wrapper }
deps:
cmake: ['3.23.4']
mpich: { env: { CC: gcc-13, CXX: g++-13 }, args: ['4.0.2', '-j4'] }
nvcc_wrapper: ~

# ubuntu / clang
amd64-ubuntu-20.04-clang-9-cpp:
label: clang-9, ubuntu, mpich
Expand Down Expand Up @@ -302,7 +310,7 @@ setup:
cmake: ['3.23.4']
mpich: { env: { CC: icc, CXX: icpc }, args: ['4.0.2', '-j4'] }

amd64-ubuntu-20.04-icpx-cpp:
amd64-ubuntu-24.04-icpx-cpp:
<<: *amd64-ubuntu-20_04-icpc-icpc-cpp
label: intel icpx, ubuntu, mpich
env:
Expand Down Expand Up @@ -402,6 +410,13 @@ images:
base: nvidia/cuda:11.2.2-devel-ubuntu20.04
setup: amd64-ubuntu-20.04-gcc-9-cuda-11.2.2-cpp

-
repository: *docker-repository
tag: wf-amd64-ubuntu-24.04-gcc-13-cuda-12.9.0-cpp
arch: linux/amd64
base: nvidia/cuda:12.9.0-devel-ubuntu24.04
setup: amd64-ubuntu-24.04-gcc-13-cuda-12.9.0-cpp

# ubuntu / clang
-
repository: *docker-repository
Expand Down Expand Up @@ -497,10 +512,10 @@ images:

-
repository: *docker-repository
tag: wf-amd64-ubuntu-20.04-icpx-cpp
tag: wf-amd64-ubuntu-24.04-icpx-cpp
arch: linux/amd64
base: intel/oneapi:os-tools-ubuntu20.04
setup: amd64-ubuntu-20.04-icpx-cpp
base: intel/oneapi:2026.0.0-devel-ubuntu24.04
setup: amd64-ubuntu-24.04-icpx-cpp

# List of test configurations available to the CI runners/agents
runners:
Expand Down Expand Up @@ -529,8 +544,8 @@ runners:

-
type: *runner-types
runs-on: ubuntu-20.04
image: { repository: *docker-repository, tag: wf-amd64-ubuntu-20.04-icpx-cpp }
runs-on: ubuntu-24.04
image: { repository: *docker-repository, tag: wf-amd64-ubuntu-24.04-icpx-cpp }

# ubuntu / gcc
-
Expand Down Expand Up @@ -589,6 +604,11 @@ runners:
runs-on: ubuntu-20.04
image: { repository: *docker-repository, tag: wf-amd64-ubuntu-20.04-gcc-9-cuda-11.2.2-cpp }

-
type: *runner-types
runs-on: ubuntu-24.04
image: { repository: *docker-repository, tag: wf-amd64-ubuntu-24.04-gcc-13-cuda-12.9.0-cpp }

# ubuntu / clang
-
type: *runner-types
Expand Down
14 changes: 10 additions & 4 deletions ci/shared/matrix/azure.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
"image": "lifflander1/vt:wf-amd64-ubuntu-20.04-icpc-cpp",
"name": "wf-amd64-ubuntu-20.04-icpc-cpp"
},
"wf-amd64-ubuntu-20-04-icpx-cpp": {
"wf-amd64-ubuntu-24-04-icpx-cpp": {
"label": "intel icpx, ubuntu, mpich",
"vmImage": "ubuntu-20.04",
"image": "lifflander1/vt:wf-amd64-ubuntu-20.04-icpx-cpp",
"name": "wf-amd64-ubuntu-20.04-icpx-cpp"
"vmImage": "ubuntu-24.04",
"image": "lifflander1/vt:wf-amd64-ubuntu-24.04-icpx-cpp",
"name": "wf-amd64-ubuntu-24.04-icpx-cpp"
},
"wf-amd64-ubuntu-20-04-gcc-9-cpp": {
"label": "gcc-9, ubuntu, mpich",
Expand Down Expand Up @@ -97,6 +97,12 @@
"image": "lifflander1/vt:wf-amd64-ubuntu-20.04-gcc-9-cuda-11.2.2-cpp",
"name": "wf-amd64-ubuntu-20.04-gcc-9-cuda-11.2.2-cpp"
},
"wf-amd64-ubuntu-24-04-gcc-13-cuda-12-9-0-cpp": {
"label": "nvidia cuda 12.9.0, gcc-13, ubuntu, mpich",
"vmImage": "ubuntu-24.04",
"image": "lifflander1/vt:wf-amd64-ubuntu-24.04-gcc-13-cuda-12.9.0-cpp",
"name": "wf-amd64-ubuntu-24.04-gcc-13-cuda-12.9.0-cpp"
},
"wf-amd64-ubuntu-20-04-clang-9-cpp": {
"label": "clang-9, ubuntu, mpich",
"vmImage": "ubuntu-20.04",
Expand Down
12 changes: 9 additions & 3 deletions ci/shared/matrix/github.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
},
{
"label": "intel icpx, ubuntu, mpich",
"runs-on": "ubuntu-20.04",
"image": "lifflander1/vt:wf-amd64-ubuntu-20.04-icpx-cpp",
"name": "wf-amd64-ubuntu-20.04-icpx-cpp"
"runs-on": "ubuntu-24.04",
"image": "lifflander1/vt:wf-amd64-ubuntu-24.04-icpx-cpp",
"name": "wf-amd64-ubuntu-24.04-icpx-cpp"
},
{
"label": "gcc-9, ubuntu, mpich",
Expand Down Expand Up @@ -97,6 +97,12 @@
"image": "lifflander1/vt:wf-amd64-ubuntu-20.04-gcc-9-cuda-11.2.2-cpp",
"name": "wf-amd64-ubuntu-20.04-gcc-9-cuda-11.2.2-cpp"
},
{
"label": "nvidia cuda 12.9.0, gcc-13, ubuntu, mpich",
"runs-on": "ubuntu-24.04",
"image": "lifflander1/vt:wf-amd64-ubuntu-24.04-gcc-13-cuda-12.9.0-cpp",
"name": "wf-amd64-ubuntu-24.04-gcc-13-cuda-12.9.0-cpp"
},
{
"label": "clang-9, ubuntu, mpich",
"runs-on": "ubuntu-20.04",
Expand Down
21 changes: 16 additions & 5 deletions docker-bake.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,17 @@ function "distro-version" {
result = lookup(item, "distro_version", DISTRO_VERSION)
}

function "setup-distro-version" {
params = [item]
result = lookup(
item,
"setup_distro_version",
equal(distro(item), "nvidia/cuda") || equal(distro(item), "intel/oneapi") ?
"ubuntu-20.04" :
"${distro(item)}-${distro-version(item)}"
)
}

function "compiler" {
params = [item]
result = lookup(item, "compiler", COMPILER)
Expand Down Expand Up @@ -167,9 +178,7 @@ function "setup-id" {
params = [item]
result = join("-", [
arch(item),
equal(distro(item), "nvidia/cuda") || equal(distro(item), "intel/oneapi") ?
"ubuntu-20.04" :
"${distro(item)}-${distro-version(item)}",
setup-distro-version(item),
compiler(item),
equal(variant(item), "") ? "cpp" : "${variant(item)}-cpp"
])
Expand Down Expand Up @@ -439,6 +448,7 @@ target "build-all" {
compiler = "gcc-13"
distro = "nvidia/cuda"
distro_version = "12.9.0-devel-ubuntu24.04"
setup_distro_version = "ubuntu-24.04"
path_prefix = "/opt/nvcc_wrapper/build:"
variant = "cuda-12.9.0"
deps = <<EOF
Expand All @@ -464,8 +474,9 @@ target "build-all" {
{
compiler = "icpx"
distro = "intel/oneapi"
distro_version = "os-tools-ubuntu20.04"
extra_packages = "intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic-2022.2.1"
distro_version = "2026.0.0-devel-ubuntu24.04"
setup_distro_version = "ubuntu-24.04"
extra_packages = "intel-oneapi-compiler-dpcpp-cpp-2023.2.0"
ld_library_path = "/opt/intel/oneapi/tbb/latest/env/../lib/intel64/gcc4.8:/opt/intel/oneapi/debugger/10.1.1/dep/lib:/opt/intel/oneapi/debugger/10.1.1/libipt/intel64/lib:/opt/intel/oneapi/debugger/10.1.1/gdb/intel64/lib:/opt/intel/oneapi/compiler/latest/linux/lib:/opt/intel/oneapi/compiler/latest/linux/lib/x64:/opt/intel/oneapi/compiler/latest/linux/lib/emu:/opt/intel/oneapi/compiler/latest/linux/compiler/lib/intel64_lin:/opt/intel/oneapi/compiler/latest/linux/compiler/lib"
path_prefix = "/opt/intel/oneapi/dev-utilities/latest/bin:/opt/intel/oneapi/compiler/latest/linux/bin/intel64:/opt/intel/oneapi/compiler/latest/linux/bin:"
deps = <<EOF
Expand Down
Loading