From 72a460b18edb25d439af9e1e4afb4553ebcb362c Mon Sep 17 00:00:00 2001 From: David Williams-Young Date: Wed, 16 Jun 2021 11:34:19 -0700 Subject: [PATCH 1/2] [CMAKE] Bump ScaLAPACK++ to point to updated BLACS++ which decoupled MPI from ScaLAPACK dependencies in the case of shared linkage --- external/versions.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/external/versions.cmake b/external/versions.cmake index 6ebeb1aa32..cf1b6020fd 100644 --- a/external/versions.cmake +++ b/external/versions.cmake @@ -36,8 +36,8 @@ set(TA_TRACKED_UMPIRE_PREVIOUS_TAG f04abd1dd038c84262915a493d8f78576bb80fd0) #set(TA_TRACKED_BLACSPP_TAG 20cfd414c5b719be1c958f4a2d57abef06df83b6 ) #set(TA_TRACKED_BLACSPP_PREVIOUS_TAG da4ada57e578cf944325a7152164306742551596 ) -set(TA_TRACKED_SCALAPACKPP_TAG 1152672fc1852e5cfbd6510e3c621e0981a207d6 ) -set(TA_TRACKED_SCALAPACKPP_PREVIOUS_TAG 1152672fc1852e5cfbd6510e3c621e0981a207d6 ) +set(TA_TRACKED_SCALAPACKPP_TAG 00632c25bc871e3f0d84b1e7ee71ed154c2e6549 ) +set(TA_TRACKED_SCALAPACKPP_PREVIOUS_TAG 00632c25bc871e3f0d84b1e7ee71ed154c2e6549 ) set(TA_TRACKED_RANGEV3_TAG 2e0591c57fce2aca6073ad6e4fdc50d841827864) set(TA_TRACKED_RANGEV3_PREVIOUS_TAG dbdaa247a25a0daa24c68f1286a5693c72ea0006) From 99b0763a137550b2396399e10fdb15674a02975e Mon Sep 17 00:00:00 2001 From: David Williams-Young Date: Wed, 16 Jun 2021 11:47:41 -0700 Subject: [PATCH 2/2] [CI] Remove MPI linkage in ScaLAPACK spec in CI --- .gitlab-ci.yml | 2 +- external/versions.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9df4cafc7a..b0e1cb4662 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -38,7 +38,7 @@ ubuntu: ${TA_CONFIG} ${TA_TARGETS} MPIEXEC_PREFLAGS='--bind-to;none;--allow-run-as-root' - ScaLAPACK_LIBRARIES="scalapack-openmpi;lapack;blas;MPI::MPI_C" + ScaLAPACK_LIBRARIES="scalapack-openmpi;lapack;blas" #blacs_LIBRARIES=scalapack-openmpi #scalapack_LIBRARIES=scalapack-openmpi #lapack_LIBRARIES=lapack diff --git a/external/versions.cmake b/external/versions.cmake index cf1b6020fd..848443afdc 100644 --- a/external/versions.cmake +++ b/external/versions.cmake @@ -36,8 +36,8 @@ set(TA_TRACKED_UMPIRE_PREVIOUS_TAG f04abd1dd038c84262915a493d8f78576bb80fd0) #set(TA_TRACKED_BLACSPP_TAG 20cfd414c5b719be1c958f4a2d57abef06df83b6 ) #set(TA_TRACKED_BLACSPP_PREVIOUS_TAG da4ada57e578cf944325a7152164306742551596 ) -set(TA_TRACKED_SCALAPACKPP_TAG 00632c25bc871e3f0d84b1e7ee71ed154c2e6549 ) -set(TA_TRACKED_SCALAPACKPP_PREVIOUS_TAG 00632c25bc871e3f0d84b1e7ee71ed154c2e6549 ) +set(TA_TRACKED_SCALAPACKPP_TAG 043f85d7f31ec6009740ab466bcb5008af7b0814 ) +set(TA_TRACKED_SCALAPACKPP_PREVIOUS_TAG 043f85d7f31ec6009740ab466bcb5008af7b0814 ) set(TA_TRACKED_RANGEV3_TAG 2e0591c57fce2aca6073ad6e4fdc50d841827864) set(TA_TRACKED_RANGEV3_PREVIOUS_TAG dbdaa247a25a0daa24c68f1286a5693c72ea0006)