Skip to content

Commit e243f57

Browse files
balos1gardner48
authored andcommitted
lock down gitlab ci to ginkgo 1.9.0
1 parent 7df148d commit e243f57

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

.gitlab/jobs/dane.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ dane_clang_tpls:
4242
INDEX_SPEC: [~int64]
4343
PRECISION_SPEC: [double]
4444
variables:
45-
SPEC: "%${COMPILER_SPEC} cstd=99 cxxstd=17 ${INDEX_SPEC} precision=${PRECISION_SPEC} +f2003+mpi+openmp+hypre+superlu-dist+lapack+klu+petsc+ginkgo+kokkos+kokkos-kernels~trilinos ^openblas"
45+
SPEC: "%${COMPILER_SPEC} cstd=99 cxxstd=17 ${INDEX_SPEC} precision=${PRECISION_SPEC} +f2003+mpi+openmp+hypre+superlu-dist+lapack+klu+petsc+ginkgo+kokkos+kokkos-kernels~trilinos ^ginkgo@1.9.0^openblas"
4646
extends: .sundials_job_on_dane
4747

4848
dane_gcc_tpls:
@@ -52,7 +52,7 @@ dane_gcc_tpls:
5252
INDEX_SPEC: [~int64]
5353
PRECISION_SPEC: [double]
5454
variables:
55-
SPEC: "%${COMPILER_SPEC} cstd=99 cxxstd=17 ${INDEX_SPEC} precision=${PRECISION_SPEC} +f2003+mpi+openmp+hypre+superlu-dist+lapack+klu+petsc+ginkgo+kokkos+kokkos-kernels~trilinos ^netlib-lapack"
55+
SPEC: "%${COMPILER_SPEC} cstd=99 cxxstd=17 ${INDEX_SPEC} precision=${PRECISION_SPEC} +f2003+mpi+openmp+hypre+superlu-dist+lapack+klu+petsc+ginkgo+kokkos+kokkos-kernels~trilinos ^ginkgo@1.9.0 ^netlib-lapack"
5656
extends: .sundials_job_on_dane
5757

5858
dane_intel_tpls:
@@ -62,5 +62,5 @@ dane_intel_tpls:
6262
INDEX_SPEC: [~int64]
6363
PRECISION_SPEC: [double]
6464
variables:
65-
SPEC: "%${COMPILER_SPEC} cstd=99 cxxstd=17 ${INDEX_SPEC} precision=${PRECISION_SPEC} ~f2003+mpi+openmp+hypre+superlu-dist+lapack~klu+petsc+ginkgo+kokkos+kokkos-kernels~trilinos ^intel-oneapi-mkl"
65+
SPEC: "%${COMPILER_SPEC} cstd=99 cxxstd=17 ${INDEX_SPEC} precision=${PRECISION_SPEC} ~f2003+mpi+openmp+hypre+superlu-dist+lapack~klu+petsc+ginkgo+kokkos+kokkos-kernels~trilinos ^ginkgo@1.9.0 ^intel-oneapi-mkl"
6666
extends: .sundials_job_on_dane

.gitlab/jobs/tioga.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ tioga_rocmcc_571_tpls:
4848
AMDGPU_TARGET: [gfx90a]
4949
variables:
5050
ON_TIOGA: "OFF" # disable until we can figure out libpgmath.so error
51-
SPEC: "%${COMPILER_SPEC} cstd=99 cxxstd=17 precision=double amdgpu_target=${AMDGPU_TARGET} +rocm+mpi+magma+ginkgo+kokkos ^magma+rocm amdgpu_target=${AMDGPU_TARGET} ^ginkgo+rocm amdgpu_target=${AMDGPU_TARGET} ^kokkos+rocm amdgpu_target=${AMDGPU_TARGET}"
51+
SPEC: "%${COMPILER_SPEC} cstd=99 cxxstd=17 precision=double amdgpu_target=${AMDGPU_TARGET} +rocm+mpi+magma+ginkgo+kokkos ^magma+rocm amdgpu_target=${AMDGPU_TARGET} ^ginkgo@1.9.0+rocm amdgpu_target=${AMDGPU_TARGET} ^kokkos+rocm amdgpu_target=${AMDGPU_TARGET}"
5252
before_script:
5353
- module load rocmcc/5.7.1-magic
5454
extends: [.sundials_job_on_tioga]
@@ -60,7 +60,7 @@ tioga_rocmcc_620_tpls:
6060
AMDGPU_TARGET: [gfx90a]
6161
variables:
6262
# we need a newer magma than available to compile with 'rocm@6:' so we turn it off
63-
SPEC: "%${COMPILER_SPEC} cstd=99 cxxstd=17 precision=double amdgpu_target=${AMDGPU_TARGET} +rocm+mpi~magma+ginkgo+kokkos ^ginkgo+rocm amdgpu_target=${AMDGPU_TARGET} ^kokkos+rocm amdgpu_target=${AMDGPU_TARGET}"
63+
SPEC: "%${COMPILER_SPEC} cstd=99 cxxstd=17 precision=double amdgpu_target=${AMDGPU_TARGET} +rocm+mpi~magma+ginkgo+kokkos ^ginkgo@1.9.0+rocm amdgpu_target=${AMDGPU_TARGET} ^kokkos+rocm amdgpu_target=${AMDGPU_TARGET}"
6464
before_script:
6565
- module load rocmcc/6.2.0-magic
6666
extends: [.sundials_job_on_tioga]
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Copyright 2013-2021 Lawrence Livermore National Security, LLC and other
2+
# Spack Project Developers. See the top-level COPYRIGHT file for details.
3+
#
4+
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
5+
6+
from spack.package import *
7+
import spack.pkg.builtin.ginkgo
8+
9+
class Ginkgo(spack.pkg.builtin.ginkgo.Ginkgo):
10+
11+
# The version of Spack we are using does not include Ginkgo 1.9.0
12+
version("1.9.0", commit="20cfd68795f58078898da9890baa311b46845a8b")

0 commit comments

Comments
 (0)