From bdac08b396acaec4c088de2df65def27425a8003 Mon Sep 17 00:00:00 2001 From: Originns Date: Tue, 8 Jul 2025 10:59:33 +0000 Subject: [PATCH 1/2] Fix automatic linking of ScaLAPACK with MKL --- src/main/CMakeLists.txt | 10 ++++++---- src/math/CMakeLists.txt | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt index 50f238d946..08ef2a0794 100644 --- a/src/main/CMakeLists.txt +++ b/src/main/CMakeLists.txt @@ -27,10 +27,12 @@ if (TARGET ELPA::OpenMP) elseif (TARGET ELPA::elpa) target_link_libraries(Octopus_octopus PRIVATE ELPA::elpa) endif () -if (TARGET MKL::${MKL_SCALAPACK}) - target_link_libraries(Octopus_octopus PRIVATE MKL::${MKL_SCALAPACK}) -elseif (TARGET SCALAPACK::scalapack) - target_link_libraries(Octopus_octopus PRIVATE SCALAPACK::scalapack) +if (OCTOPUS_ScaLAPACK) + if (TARGET MKL::${MKL_SCALAPACK}) + target_link_libraries(Octopus_octopus PRIVATE MKL::${MKL_SCALAPACK}) + elseif (TARGET SCALAPACK::scalapack) + target_link_libraries(Octopus_octopus PRIVATE SCALAPACK::scalapack) + endif () endif () if (TARGET MPI::MPI_Fortran) target_link_libraries(Octopus_octopus PUBLIC MPI::MPI_Fortran) diff --git a/src/math/CMakeLists.txt b/src/math/CMakeLists.txt index 674a072d19..dbdaf1eb68 100644 --- a/src/math/CMakeLists.txt +++ b/src/math/CMakeLists.txt @@ -54,12 +54,12 @@ if (TARGET MKL::MKL) target_link_libraries(Octopus_lib PRIVATE MKL::MKL) # FFTW interface for mkl is not automatically set target_include_directories(Octopus_lib PRIVATE ${MKL_ROOT}/include/fftw) - if (TARGET MKL::${MKL_SCALAPACK}) - target_link_libraries(Octopus_lib PRIVATE MKL::${MKL_SCALAPACK}) - endif () if (OCTOPUS_ScaLAPACK AND NOT TARGET MKL::${MKL_SCALAPACK}) message(FATAL_ERROR "Missing MKL ScaLAPACK target") endif () + if (OCTOPUS_ScaLAPACK) + target_link_libraries(Octopus_lib PRIVATE MKL::${MKL_SCALAPACK}) + endif () else () target_link_libraries(Octopus_lib PRIVATE BLAS::BLAS) target_link_libraries(Octopus_lib PRIVATE LAPACK::LAPACK) -- GitLab From 9929a02e30a984417f0e7ed199f0baeaf796a33f Mon Sep 17 00:00:00 2001 From: Henri Menke Date: Mon, 14 Jul 2025 16:12:15 +0200 Subject: [PATCH 2/2] Pass repository URL to website trigger job --- .gitlab-ci.d/auxiliary-jobs.gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.d/auxiliary-jobs.gitlab-ci.yml b/.gitlab-ci.d/auxiliary-jobs.gitlab-ci.yml index 96793db1ce..167fef30c9 100644 --- a/.gitlab-ci.d/auxiliary-jobs.gitlab-ci.yml +++ b/.gitlab-ci.d/auxiliary-jobs.gitlab-ci.yml @@ -113,7 +113,7 @@ documentation: website_trigger: stage: build_website_content variables: - OCTOPUS_COMMIT_REF: $CI_COMMIT_REF_NAME + OCTOPUS_COMMIT_REF: $CI_COMMIT_SHA trigger: project: octopus-code/octopus-documentation strategy: depend -- GitLab