Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .gitlab/jobs/dane.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ dane_clang_tpls:
INDEX_SPEC: [~int64]
PRECISION_SPEC: [double]
variables:
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"
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"
extends: .sundials_job_on_dane

dane_gcc_tpls:
Expand All @@ -52,7 +52,7 @@ dane_gcc_tpls:
INDEX_SPEC: [~int64]
PRECISION_SPEC: [double]
variables:
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"
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"
extends: .sundials_job_on_dane

dane_intel_tpls:
Expand All @@ -62,5 +62,5 @@ dane_intel_tpls:
INDEX_SPEC: [~int64]
PRECISION_SPEC: [double]
variables:
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"
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"
extends: .sundials_job_on_dane
4 changes: 2 additions & 2 deletions .gitlab/jobs/tioga.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ tioga_rocmcc_571_tpls:
AMDGPU_TARGET: [gfx90a]
variables:
ON_TIOGA: "OFF" # disable until we can figure out libpgmath.so error
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}"
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}"
before_script:
- module load rocmcc/5.7.1-magic
extends: [.sundials_job_on_tioga]
Expand All @@ -60,7 +60,7 @@ tioga_rocmcc_620_tpls:
AMDGPU_TARGET: [gfx90a]
variables:
# we need a newer magma than available to compile with 'rocm@6:' so we turn it off
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}"
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}"
before_script:
- module load rocmcc/6.2.0-magic
extends: [.sundials_job_on_tioga]
Expand Down
13 changes: 13 additions & 0 deletions scripts/spack/packages/ginkgo/package.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Copyright 2013-2021 Lawrence Livermore National Security, LLC and other
# Spack Project Developers. See the top-level COPYRIGHT file for details.
#
# SPDX-License-Identifier: (Apache-2.0 OR MIT)

from spack.package import *
import spack.pkg.builtin.ginkgo


class Ginkgo(spack.pkg.builtin.ginkgo.Ginkgo):

# The version of Spack we are using does not include Ginkgo 1.9.0
version("1.9.0", commit="20cfd68795f58078898da9890baa311b46845a8b")
Loading