Remove xsdk@0.2.0 and associated versions and xsdktrilinos

These versions can cause weird concretizations, and it looks like the
old version of xsdk may not even work because of xsdktrilinos being
disabled. The hypre version tagged for xsdk@0.2 no longer exists at the
described location.

8 files changed, 0 insertions, 103 deletions

diff --git a/var/spack/repos/builtin/packages/alquimia/package.py b/var/spack/repos/builtin/packages/alquimia/package.py
index eaa94afd09..5462da1255 100644
--- a/var/spack/repos/builtin/packages/alquimia/package.py
+++ b/var/spack/repos/builtin/packages/alquimia/package.py
@@ -20,7 +20,6 @@ class Alquimia(CMakePackage):
     version('xsdk-0.5.0', commit='8397c3b00a09534c5473ff3ab21f0e32bb159380')
     version('xsdk-0.4.0', commit='2edad6733106142d014bb6e6a73c2b21d5e3cf2d')
     version('xsdk-0.3.0', tag='xsdk-0.3.0')
-    version('xsdk-0.2.0', tag='xsdk-0.2.0')
 
     variant('shared', default=True,
             description='Enables the build of shared libraries')
@@ -35,7 +34,6 @@ class Alquimia(CMakePackage):
     depends_on('pflotran@develop', when='@develop')
     depends_on('petsc@3.10.0:3.10.99', when='@xsdk-0.4.0')
     depends_on('petsc@3.8.0:3.8.99', when='@xsdk-0.3.0')
-    depends_on('petsc@xsdk-0.2.0', when='@xsdk-0.2.0')
     depends_on('petsc@3.10:', when='@develop')
 
     def cmake_args(self):
diff --git a/var/spack/repos/builtin/packages/hypre/package.py b/var/spack/repos/builtin/packages/hypre/package.py
index 674cf7f98c..15eaa19e35 100644
--- a/var/spack/repos/builtin/packages/hypre/package.py
+++ b/var/spack/repos/builtin/packages/hypre/package.py
@@ -41,7 +41,6 @@ class Hypre(Package, CudaPackage):
     version('2.11.1', sha256='6bb2ff565ff694596d0e94d0a75f0c3a2cd6715b8b7652bc71feb8698554db93')
     version('2.10.1', sha256='a4a9df645ebdc11e86221b794b276d1e17974887ead161d5050aaf0b43bb183a')
     version('2.10.0b', sha256='b55dbdc692afe5a00490d1ea1c38dd908dae244f7bdd7faaf711680059824c11')
-    version('xsdk-0.2.0', tag='xsdk-0.2.0', git='https://github.com/LLNL/hypre.git')
 
     # Versions 2.13.0 and later can be patched to build shared
     # libraries on Darwin; the patch for this capability does not
diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py
index 9ac0eab56f..10f476228b 100644
--- a/var/spack/repos/builtin/packages/petsc/package.py
+++ b/var/spack/repos/builtin/packages/petsc/package.py
@@ -17,7 +17,6 @@ class Petsc(Package, CudaPackage, ROCmPackage):
     maintainers = ['balay', 'barrysmith', 'jedbrown']
 
     version('main', branch='main')
-    version('xsdk-0.2.0', tag='xsdk-0.2.0')
 
     version('3.15.2', sha256='3b10c19c69fc42e01a38132668724a01f1da56f5c353105cd28f1120cc9041d8')
     version('3.15.1', sha256='c0ac6566e69d1d70b431e07e7598e9de95e84891c2452db1367c846b75109deb')
diff --git a/var/spack/repos/builtin/packages/pflotran/package.py b/var/spack/repos/builtin/packages/pflotran/package.py
index a51299d441..e6f4b64468 100644
--- a/var/spack/repos/builtin/packages/pflotran/package.py
+++ b/var/spack/repos/builtin/packages/pflotran/package.py
@@ -22,7 +22,6 @@ class Pflotran(AutotoolsPackage):
     version('xsdk-0.5.0', commit='98a959c591b72f73373febf5f9735d2c523b4c20')
     version('xsdk-0.4.0', commit='c851cbc94fc56a32cfdb0678f3c24b9936a5584e')
     version('xsdk-0.3.0', branch='release/xsdk-0.3.0')
-    version('xsdk-0.2.0', commit='4da763c6136df57caff43f98c926433958cfdea6')
 
     depends_on('mpi')
     depends_on('hdf5@1.8.12:+mpi+fortran+hl')
@@ -30,7 +29,6 @@ class Pflotran(AutotoolsPackage):
     depends_on('petsc@3.14:+hdf5+metis', when='@xsdk-0.6.0')
     depends_on('petsc@3.12:+hdf5+metis', when='@xsdk-0.5.0')
     depends_on('petsc@3.10:+hdf5+metis', when='@xsdk-0.4.0')
-    depends_on('petsc@xsdk-0.2.0+hdf5+metis', when='@xsdk-0.2.0')
     depends_on('petsc@3.8.0:+hdf5+metis', when='@xsdk-0.3.0')
 
     @property
diff --git a/var/spack/repos/builtin/packages/superlu-dist/package.py b/var/spack/repos/builtin/packages/superlu-dist/package.py
index adb53a740e..a757ee7102 100644
--- a/var/spack/repos/builtin/packages/superlu-dist/package.py
+++ b/var/spack/repos/builtin/packages/superlu-dist/package.py
@@ -17,7 +17,6 @@ class SuperluDist(CMakePackage, CudaPackage):
     maintainers = ['xiaoye', 'gchavez2', 'balay', 'pghysels']
 
     version('develop', branch='master')
-    version('xsdk-0.2.0', tag='xsdk-0.2.0')
     version('6.4.0', sha256='cb9c0b2ba4c28e5ed5817718ba19ae1dd63ccd30bc44c8b8252b54f5f04a44cc')
     version('6.3.1', sha256='3787c2755acd6aadbb4d9029138c293a7570a2ed228806676edcc7e1d3f5a1d3')
     version('6.3.0', sha256='daf3264706caccae2b8fd5a572e40275f1e128fa235cb7c21ee2f8051c11af95')
diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py
index e135f2d863..fdbf6ff6c4 100644
--- a/var/spack/repos/builtin/packages/trilinos/package.py
+++ b/var/spack/repos/builtin/packages/trilinos/package.py
@@ -40,7 +40,6 @@ class Trilinos(CMakePackage, CudaPackage):
     version('12.18.1', commit='55a75997332636a28afc9db1aee4ae46fe8d93e7')  # tag trilinos-release-12-8-1
     version('12.14.1', sha256='52a4406cca2241f5eea8e166c2950471dd9478ad6741cbb2a7fc8225814616f0')
     version('12.12.1', sha256='5474c5329c6309224a7e1726cf6f0d855025b2042959e4e2be2748bd6bb49e18')
-    version('12.11.xsdk-0-2-0', commit='e8210776222ef277a06451ef934dc1138ecdafe6') # tag xsdk-0.2.0
     version('12.10.1', sha256='ab81d917196ffbc21c4927d42df079dd94c83c1a08bda43fef2dd34d0c1a5512')
     version('12.8.1', sha256='d20fe60e31e3ba1ef36edecd88226240a518f50a4d6edcc195b88ee9dda5b4a1')
     version('12.6.4', sha256='1c7104ba60ee8cc4ec0458a1c4f6a26130616bae7580a7b15f2771a955818b73')
@@ -327,7 +326,6 @@ class Trilinos(CMakePackage, CudaPackage):
         msg='Cannot build Trilinos with STK as a shared library on Darwin.'
     )
     conflicts('+adios2', when='@:12.14.1')
-    conflicts('+adios2', when='@xsdk-0.2.0')
     conflicts('+pnetcdf', when='~netcdf')
     conflicts('+pnetcdf', when='~mpi')
     conflicts('+cuda_rdc', when='~cuda')
@@ -392,13 +390,11 @@ class Trilinos(CMakePackage, CudaPackage):
     depends_on('superlu-dist@5.4:6.2.0', when='@12.12.2:13.0.0+superlu-dist')
     depends_on('superlu-dist@6.3.0:', when='@13.0.1:+superlu-dist')
     depends_on('superlu-dist@develop', when='@master+superlu-dist')
-    depends_on('superlu-dist@xsdk-0.2.0', when='@12.10.xsdk-0-2-0+superlu-dist')
     depends_on('superlu+pic@4.3', when='+superlu')
     depends_on('strumpack+shared', when='+strumpack')
     depends_on('scalapack', when='+strumpack+mpi')
     # Trilinos can not be built against 64bit int hypre
     depends_on('hypre~internal-superlu~int64', when='+hypre')
-    depends_on('hypre@xsdk-0.2.0~internal-superlu', when='@xsdk-0.2.0+hypre')
     depends_on('hypre@develop~internal-superlu', when='@master+hypre')
     depends_on('python', when='+python')
     depends_on('py-mpi4py', when='+mpi +python', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/xsdk/package.py b/var/spack/repos/builtin/packages/xsdk/package.py
index f08676f9d8..078aaa296a 100644
--- a/var/spack/repos/builtin/packages/xsdk/package.py
+++ b/var/spack/repos/builtin/packages/xsdk/package.py
@@ -24,7 +24,6 @@ class Xsdk(BundlePackage):
     version('0.5.0')
     version('0.4.0')
     version('0.3.0')
-    version('xsdk-0.2.0')
 
     variant('debug', default=False, description='Compile in debug mode')
     variant('cuda', default=False, description='Enable CUDA dependent packages')
@@ -49,7 +48,6 @@ class Xsdk(BundlePackage):
     depends_on('hypre@2.18.2+superlu-dist+shared', when='@0.5.0')
     depends_on('hypre@2.15.1~internal-superlu', when='@0.4.0')
     depends_on('hypre@2.12.1~internal-superlu', when='@0.3.0')
-    depends_on('hypre@xsdk-0.2.0~internal-superlu', when='@xsdk-0.2.0')
 
     depends_on('mfem@develop+mpi+superlu-dist+petsc+sundials+examples+miniapps', when='@develop')
     depends_on('mfem@4.2.0+mpi+superlu-dist+petsc+sundials+examples+miniapps', when='@0.6.0')
@@ -62,7 +60,6 @@ class Xsdk(BundlePackage):
     depends_on('superlu-dist@6.1.1', when='@0.5.0')
     depends_on('superlu-dist@6.1.0', when='@0.4.0')
     depends_on('superlu-dist@5.2.2', when='@0.3.0')
-    depends_on('superlu-dist@xsdk-0.2.0', when='@xsdk-0.2.0')
 
     depends_on('trilinos@master+hypre+superlu-dist+hdf5~mumps+boost~suite-sparse+tpetra+nox+ifpack2+zoltan+zoltan2+amesos2~exodus~dtk+intrepid2+shards+stratimikos gotype=int cxxstd=14',
                when='@develop +trilinos')
@@ -74,8 +71,6 @@ class Xsdk(BundlePackage):
                when='@0.4.0 +trilinos')
     depends_on('trilinos@12.12.1+hypre+superlu-dist+hdf5~mumps+boost~suite-sparse~tpetra~ifpack2~zoltan~zoltan2~amesos2~exodus',
                when='@0.3.0 +trilinos')
-    depends_on('trilinos@12.10.xsdk-0-2-0+hypre+superlu-dist+hdf5~mumps+boost~suite-sparse~tpetra~ifpack2~zoltan~zoltan2~amesos2~exodus',
-               when='@xsdk-0.2.0 +trilinos')
 
     depends_on('datatransferkit@master', when='@develop +trilinos +datatransferkit')
     depends_on('datatransferkit@3.1-rc2', when='@0.6.0 +trilinos +datatransferkit')
@@ -93,8 +88,6 @@ class Xsdk(BundlePackage):
                when='@0.4.0')
     depends_on('petsc@3.8.2+mpi+hypre+superlu-dist+metis+hdf5~mumps+double~int64',
                when='@0.3.0')
-    depends_on('petsc@xsdk-0.2.0+mpi+hypre+superlu-dist+metis+hdf5~mumps+double~int64',
-               when='@xsdk-0.2.0')
 
     depends_on('dealii +trilinos~adol-c', when='+trilinos +dealii')
     depends_on('dealii ~trilinos', when='~trilinos +dealii')
@@ -108,14 +101,12 @@ class Xsdk(BundlePackage):
     depends_on('pflotran@xsdk-0.5.0', when='@0.5.0')
     depends_on('pflotran@xsdk-0.4.0', when='@0.4.0')
     depends_on('pflotran@xsdk-0.3.0', when='@0.3.0')
-    depends_on('pflotran@xsdk-0.2.0', when='@xsdk-0.2.0')
 
     depends_on('alquimia@develop', when='@develop +alquimia')
     depends_on('alquimia@xsdk-0.6.0', when='@0.6.0 +alquimia')
     depends_on('alquimia@xsdk-0.5.0', when='@0.5.0 +alquimia ')
     depends_on('alquimia@xsdk-0.4.0', when='@0.4.0 +alquimia')
     depends_on('alquimia@xsdk-0.3.0', when='@0.3.0 +alquimia')
-    depends_on('alquimia@xsdk-0.2.0', when='@xsdk-0.2.0 +alquimia')
 
     depends_on('sundials +cuda', when='+cuda @0.6.0:')
     depends_on('sundials +trilinos', when='+trilinos @0.6.0:')
@@ -226,10 +217,5 @@ class Xsdk(BundlePackage):
     depends_on('slate@2020.10.00 ~cuda', when='@0.6.0 ~cuda +slate %gcc@6.0:')
     depends_on('slate@2020.10.00 +cuda', when='@0.6.0 +cuda +slate %gcc@6.0:')
 
-    # xSDKTrilinos depends on the version of Trilinos built with
-    # +tpetra which is turned off for faster xSDK
-    # depends_on('xsdktrilinos@xsdk-0.2.0', when='@xsdk-0.2.0')
-    # depends_on('xsdktrilinos@develop', when='@develop')
-
     # How do we propagate debug flag to all depends on packages ?
     # If I just do spack install xsdk+debug will that propogate it down?
diff --git a/var/spack/repos/builtin/packages/xsdktrilinos/package.py b/var/spack/repos/builtin/packages/xsdktrilinos/package.py
deleted file mode 100644
index 8d7effccce..0000000000
--- a/var/spack/repos/builtin/packages/xsdktrilinos/package.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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)
-
-import os
-
-from spack import *
-
-
-class Xsdktrilinos(CMakePackage):
-    """xSDKTrilinos contains the portions of Trilinos that depend on PETSc
-    because they would cause a circular dependency if built as part of
-    Trilinos.
-    """
-    homepage = "https://trilinos.org/"
-    url      = "https://github.com/trilinos/xSDKTrilinos/archive/trilinos-release-12-8-1.tar.gz"
-    git      = "https://github.com/trilinos/xSDKTrilinos.git"
-
-    version('develop', tag='master')
-    version('xsdk-0.2.0', tag='xsdk-0.2.0')
-    version('12.8.1', sha256='f545c0821743f23af3b48f242c66bbc4593e3804436336db4eb3bb08622ad794')
-    version('12.6.4', sha256='a7664afeab37ccfcbb5aae0bb03cb73ca8e511e0fecc365b9ccd32ba208318e3')
-
-    variant('hypre',  default=True, description='Compile with Hypre preconditioner')
-    variant('petsc',  default=True, description='Compile with PETSc solvers')
-    variant('shared', default=True, description='Enables the build of shared libraries')
-
-    # MPI related dependencies
-    depends_on('mpi')
-    depends_on('hypre~internal-superlu', when='+hypre')
-    depends_on('hypre@xsdk-0.2.0~internal-superlu', when='@xsdk-0.2.0+hypre')
-    depends_on('hypre@develop~internal-superlu', when='@develop+hypre')
-    depends_on('petsc@xsdk-0.2.0+mpi~complex', when='@xsdk-0.2.0+petsc')
-    depends_on('petsc@main+mpi~complex', when='@develop+petsc')
-    depends_on('trilinos@12.6.4', when='@12.6.4')
-    depends_on('trilinos@12.8.1', when='@12.8.1')
-    depends_on('trilinos@12.11.xsdk-0-2-0', when='@xsdk-0.2.0')
-    depends_on('trilinos@master', when='@develop')
-
-    def url_for_version(self, version):
-        url = "https://github.com/trilinos/xSDKTrilinos/archive/trilinos-release-{0}.tar.gz"
-        return url.format(version.dashed)
-
-    def cmake_args(self):
-        spec = self.spec
-
-        options = []
-
-        mpi_bin = spec['mpi'].prefix.bin
-        options.extend([
-            '-DxSDKTrilinos_VERBOSE_CONFIGURE:BOOL=OFF',
-            '-DxSDKTrilinos_ENABLE_TESTS:BOOL=ON',
-            '-DxSDKTrilinos_ENABLE_EXAMPLES:BOOL=ON',
-            '-DTrilinos_INSTALL_DIR=%s' % spec['trilinos'].prefix,
-            self.define_from_variant('BUILD_SHARED_LIBS', 'shared'),
-            '-DTPL_ENABLE_MPI:BOOL=ON',
-            '-DMPI_BASE_DIR:PATH=%s' % spec['mpi'].prefix,
-            '-DxSDKTrilinos_ENABLE_CXX11:BOOL=ON',
-            self.define_from_variant('TPL_ENABLE_HYPRE', 'hypre'),
-            self.define_from_variant('TPL_ENABLE_PETSC', 'petsc'),
-            '-DCMAKE_INSTALL_NAME_DIR:PATH=%s/lib' % self.prefix
-        ])
-
-        # Fortran lib
-        if (spec.satisfies('%gcc') or
-                spec.satisfies('%clang') or
-                spec.satisfies('%apple-clang')):
-            libgfortran = os.path.dirname(os.popen(
-                '%s --print-file-name libgfortran.a' %
-                join_path(mpi_bin, 'mpif90')).read())
-            options.extend([
-                '-DxSDKTrilinos_EXTRA_LINK_FLAGS:STRING=-L%s/ -lgfortran' % (
-                    libgfortran),
-                '-DxSDKTrilinos_ENABLE_Fortran=ON'
-            ])
-
-        return options