Skip to content
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

Jump to bottom

update CI container to version 3.2 #2306

Merged
merged 1 commit into from
Jul 5, 2024
Merged

update CI container to version 3.2 #2306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ variables:
# container version of the generated jobs
# should be merged with ALPAKA_GITLAB_CI_CONTAINER_VERSION
# see: script/job_generator/generate_job_yaml.py
ALPAKA_GITLAB_CI_GENERATOR_CONTAINER_VERSION: "3.1"
ALPAKA_GITLAB_CI_GENERATOR_CONTAINER_VERSION: "3.2"

generate:
stage: generator
Expand Down
4 changes: 2 additions & 2 deletions script/gitlabci/job_cuda.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# nvcc + g++
linux_nvcc12.0_gcc12_debug_relocatable_device_code_compile_only:
extends: .base_cuda_gcc_compile_only
image: registry.hzdr.de/crp/alpaka-group-container/alpaka-ci-ubuntu20.04-cuda110-gcc:3.1
image: registry.hzdr.de/crp/alpaka-group-container/alpaka-ci-ubuntu20.04-cuda110-gcc:3.2
variables:
ALPAKA_CI_UBUNTU_VER: "20.04"
ALPAKA_CI_CUDA_VERSION: "12.0"
Expand All @@ -15,7 +15,7 @@ linux_nvcc12.0_gcc12_debug_relocatable_device_code_compile_only:

linux_nvcc12.0_gcc12_release_extended_lambda_off_compile_only:
extends: .base_cuda_gcc_compile_only
image: registry.hzdr.de/crp/alpaka-group-container/alpaka-ci-ubuntu20.04-cuda110-gcc:3.1
image: registry.hzdr.de/crp/alpaka-group-container/alpaka-ci-ubuntu20.04-cuda110-gcc:3.2
variables:
ALPAKA_CI_UBUNTU_VER: "20.04"
ALPAKA_CI_CUDA_VERSION: "12.0"
Expand Down
16 changes: 15 additions & 1 deletion script/job_generator/alpaka_filter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,21 @@ def alpaka_post_filter(row: List) -> bool:
# https://github.com/alpaka-group/alpaka/issues/639
if row_check_name(row, DEVICE_COMPILER, "==", CLANG_CUDA) and (
row_check_backend_version(row, ALPAKA_ACC_CPU_B_OMP2_T_SEQ_ENABLE, "==", ON_VER)
or row_check_backend_version(row, ALPAKA_ACC_CPU_B_SEQ_T_OMP2_ENABLE, "==", ON_VER)
or row_check_backend_version(
row, ALPAKA_ACC_CPU_B_SEQ_T_OMP2_ENABLE, "==", ON_VER
)
):
return False

# there is a compiler bug in GCC 11.4 which avoids working with NVCC 11.5
if (
row_check_name(row, DEVICE_COMPILER, "==", NVCC)
and (
row_check_version(row, DEVICE_COMPILER, "==", "11.4")
or row_check_version(row, DEVICE_COMPILER, "==", "11.5")
)
and row_check_name(row, HOST_COMPILER, "==", GCC)
and row_check_version(row, HOST_COMPILER, "==", "11")
):
return False

Expand Down
Loading