From 113e231abede39837f52370352d4abd38b0a6cfb Mon Sep 17 00:00:00 2001 From: Stephen Sachs Date: Thu, 20 Jun 2024 13:07:27 +0200 Subject: Remove deprecated intel-* packages (#44700) Packages will be removed with https://github.com/spack/spack/pull/44689. This PR makes sure that the `aws-pcluster-x86_64_v4` stack still works as expected. --- .../stacks/aws-pcluster-x86_64_v4/packages.yaml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-x86_64_v4/packages.yaml b/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-x86_64_v4/packages.yaml index ca8cf09ef6..cf6a99a62f 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-x86_64_v4/packages.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-x86_64_v4/packages.yaml @@ -19,8 +19,6 @@ packages: - "+intel_provided_gcc ^intel-oneapi-mkl target=x86_64_v4" - "+intel_provided_gcc ^intel-oneapi-mkl target=x86_64_v3" when: "%intel" - intel-mpi: - variants: +external-libfabric intel-oneapi-compilers: require: "intel-oneapi-compilers %gcc target=x86_64_v3" intel-oneapi-mpi: @@ -110,12 +108,15 @@ packages: read: world write: user providers: - blas: [intel-oneapi-mkl, intel-mkl] - daal: [intel-oneapi-dal, intel-daal] - fftw-api: [intel-oneapi-mkl, intel-mkl] - ipp: [intel-oneapi-ipp, intel-ipp] - lapack: [intel-oneapi-mkl, intel-mkl] - mkl: [intel-oneapi-mkl, intel-mkl] + blas: [intel-oneapi-mkl] + daal: [intel-oneapi-dal] + fftw-api: [intel-oneapi-mkl] + ipp: [intel-oneapi-ipp] + lapack: [intel-oneapi-mkl] + mkl: [intel-oneapi-mkl] mpi: [intel-oneapi-mpi, openmpi, mpich] tbb: [intel-oneapi-tbb, intel-tbb] - scalapack: [intel-oneapi-mkl, intel-mkl] + scalapack: [intel-oneapi-mkl] + + + -- cgit v1.2.3-70-g09d2