Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into hip-memcpy-no-default
Browse files Browse the repository at this point in the history
  • Loading branch information
msimberg committed Mar 7, 2024
2 parents 2a54766 + c766691 commit 1f47ef8
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ cmake_dependent_option(
)
cmake_dependent_option(
DLAF_WITH_MPI_GPU_FORCE_CONTIGUOUS "Force GPU buffers to be contiguous before communicating" ON
"DLAF_WITH_MPI_GPU_SUPPORT" OFF
"DLAF_WITH_MPI_GPU_AWARE" OFF
)
option(DLAF_WITH_HDF5 "Enable HDF5 support" OFF)
mark_as_advanced(DLAF_WITH_HDF5)
Expand Down
1 change: 1 addition & 0 deletions ci/.gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ include:
- local: 'ci/cpu/clang13_release_cxx20.yml'
- local: 'ci/cpu/clang14_release_stdexec.yml'
- local: 'ci/cpu/clang15_release.yml'
- local: 'ci/cpu/clang16_release.yml'
- local: 'ci/cpu/gcc11_codecov.yml'
- local: 'ci/cpu/gcc11_release.yml'
- local: 'ci/cpu/gcc11_release_stdexec.yml'
Expand Down
2 changes: 1 addition & 1 deletion ci/common-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ stages:
reports:
dotenv: build.env
variables:
SPACK_SHA: be4eae3fa86308bb9a476d217dd716e088bfe4e1
SPACK_SHA: c7df258ca64809a1cfa7f1d5324e7a713b80fc99
SPACK_DLAF_REPO: ./spack
DOCKER_BUILD_ARGS: '[
"BASE_IMAGE",
Expand Down
31 changes: 31 additions & 0 deletions ci/cpu/clang16_release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
include:
- local: 'ci/common-ci.yml'

cpu clang16 release deps:
extends: .build_deps_common
variables:
EXTRA_APTGET: "clang-16 libomp-16-dev"
COMPILER: clang@16
USE_MKL: "ON"
SPACK_ENVIRONMENT: ci/docker/release-cpu.yaml
BASE_IMAGE: docker.io/ubuntu:23.10
BUILD_IMAGE: $CSCS_REGISTRY_PATH/cpu-clang16-release/build

cpu clang16 release build:
extends:
- .build_common
- .build_for_daint-mc
needs:
- cpu clang16 release deps
variables:
DEPLOY_IMAGE: $CSCS_REGISTRY_PATH/cpu-clang16-release/deploy:$CI_COMMIT_SHA
DEPLOY_BASE_IMAGE: docker.io/ubuntu:23.10

cpu clang16 release test:
extends: .run_common
needs:
- cpu clang16 release build
trigger:
include:
- artifact: pipeline.yml
job: cpu clang16 release build

0 comments on commit 1f47ef8

Please sign in to comment.