gnu: Remove trilinos-for-dealii-openmpi.

* gnu/packages/maths.scm (trilinos-for-dealii-openmpi): Delete variable.
* gnu/packages/patches/teuchos-remove-duplicate-using.patch,
gnu/packages/patches/tpetra-remove-duplicate-using.patch: Remove files.
* gnu/local.mk (dist_patch_DATA): Unregister files.

Fixes: guix/guix#5852
Change-Id: I991b0fd99a8a441b898c5d3e10785bc523042fef

4 files changed, 0 insertions, 210 deletions

diff --git a/gnu/local.mk b/gnu/local.mk
index f4237925705..567f1361299 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2479,7 +2479,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/telegram-purple-adjust-test.patch	\
   %D%/packages/patches/telepathy-glib-fix-test.patch	\
   %D%/packages/patches/tensile-copy-if-not-exist.patch		\
-  %D%/packages/patches/teuchos-remove-duplicate-using.patch	\
   %D%/packages/patches/texi2html-document-encoding.patch	\
   %D%/packages/patches/texi2html-i18n.patch			\
   %D%/packages/patches/texmacs-wayland-hidpi.patch	\
@@ -2498,7 +2497,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/torbrowser-compare-paths.patch           \
   %D%/packages/patches/torbrowser-use-system-wide-dir.patch     \
   %D%/packages/patches/torbrowsers-add-store-to-rdd-allowlist.patch     \
-  %D%/packages/patches/tpetra-remove-duplicate-using.patch	\
   %D%/packages/patches/transcode-ffmpeg.patch	\
   %D%/packages/patches/trytond-add-guix_trytond_path.patch	\
   %D%/packages/patches/ttf2eot-cstddef.patch			\
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index fc832116fe2..d277e1e95af 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -7596,162 +7596,6 @@ specifications.")
 revised simplex and the branch-and-bound methods.")
     (license license:lgpl2.1+)))
 
-;; Private Trilinos package for dealii-openmpi (similar to
-;; trilinos-serial-xyce and trilinos-parallel-xyce).
-;; This version is the latest known to be compatible with deal.II [1].
-;; Since the latest version of Trilinos is not necessarily supported by
-;; deal.II, it may be worth keeping this package even if and when Trilinos
-;; gets packaged separately for Guix (unless various versions of Trilinos are
-;; packaged).
-;;
-;; An insightful source of information for building Trilinos for deal.II lies
-;; in the Trilinos package for candi [2], which is a source-based installer
-;; for deal.II and its dependencies.
-;;
-;; [1]: https://www.dealii.org/current/external-libs/trilinos.html
-;; [2]: https://github.com/dealii/candi/blob/master/deal.II-toolchain/packages/trilinos.package
-(define trilinos-for-dealii-openmpi
-  (package
-    (name "trilinos-for-dealii-openmpi")
-    (version "12.18.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/trilinos/Trilinos/")
-             (commit
-              (string-append "trilinos-release-"
-                             (string-replace-substring version "." "-")))))
-       (file-name (git-file-name "trilinos" version))
-       (sha256
-        (base32 "0fnwlhzsh85qj38cq3igbs8nm1b2jdgr2z734sapmyyzsy21mkgp"))
-       (patches
-        (search-patches "teuchos-remove-duplicate-using.patch"
-                        "tpetra-remove-duplicate-using.patch"))))
-    (build-system cmake-build-system)
-    (native-inputs
-     (list
-      gfortran
-      ;; Trilinos's repository contains several C-shell scripts, but adding
-      ;; tcsh to the native inputs does not result in the check phase running
-      ;; any more tests than without it (nor is tcsh required to build
-      ;; Trilinos).
-      ;; It seems that Trilinos has replaced its use of C-shell test scripts
-      ;; with CMake's testing facilities.
-      ;; For example,
-      ;; packages/zoltan/doc/Zoltan_html/dev_html/dev_test_script.html [1]
-      ;; states that Zoltan's C-shell test script
-      ;; packages/zoltan/test/test_zoltan has been obsoleted by the tests now
-      ;; performed through CMake.
-      ;;
-      ;; Perl is required for some Zoltan tests and Python 2 for one ML test.
-      ;;
-      ;; [1]: https://cs.sandia.gov/zoltan/dev_html/dev_test_script.html
-      perl
-      python-2))
-    (inputs
-     (list openblas
-           lapack
-           mumps-openmpi
-           scalapack))
-    (propagated-inputs
-     (list openmpi))
-    (arguments
-     (list #:build-type "Release"
-           #:configure-flags
-           #~(list "-DBUILD_SHARED_LIBS=ON"
-                   ;; Obtain the equivalent of RelWithDebInfo but with -O3
-                   ;; (the Release default) rather than -O2 (the
-                   ;; RelWithDebInfo default), to conform to candi's
-                   ;; trilinos.package's compilation flags, which are -g -O3.
-                   "-DCMAKE_C_FLAGS=-g"
-                   "-DCMAKE_CXX_FLAGS=-g"
-                   "-DCMAKE_Fortran_FLAGS=-g"
-
-                   ;; Trilinos libraries that deal.II can interface with.
-                   "-DTrilinos_ENABLE_Amesos=ON"
-                   "-DTrilinos_ENABLE_AztecOO=ON"
-                   "-DTrilinos_ENABLE_Epetra=ON"
-                   "-DTrilinos_ENABLE_EpetraExt=ON"
-                   "-DTrilinos_ENABLE_Ifpack=ON"
-                   "-DTrilinos_ENABLE_ML=ON"
-                   "-DTrilinos_ENABLE_MueLu=ON"
-                   "-DTrilinos_ENABLE_ROL=ON"
-                   ;; Optional; required for deal.II's GridIn::read_exodusii,
-                   ;; but depends on netcdf.
-                   ;; Enable if and when someone needs it.
-                   ;;"-DTrilinos_ENABLE_SEACAS=ON"
-                   "-DTrilinos_ENABLE_Sacado=ON"
-                   "-DTrilinos_ENABLE_Teuchos=ON"
-                   "-DTrilinos_ENABLE_Tpetra=ON"
-                   "-DTrilinos_ENABLE_Zoltan=ON"
-
-                   ;; Third-party libraries (TPLs) that Trilinos can interface
-                   ;; with.
-                   "-DBLAS_LIBRARY_NAMES=openblas"
-                   "-DTPL_ENABLE_MPI=ON"
-                   "-DTPL_ENABLE_MUMPS=ON"
-                   "-DTPL_ENABLE_SCALAPACK=ON"
-
-                   ;; Enable the tests but not the examples (which are enabled
-                   ;; by default when enabling tests).
-                   ;; Although some examples are run as tests, they are
-                   ;; otherwise unnecessary since this is a private package
-                   ;; meant for dealii-openmpi.
-                   ;; Besides, some MueLu and ROL examples require a lot of
-                   ;; memory to compile.
-                   ;;
-                   ;; (For future reference, note that some ROL and SEACAS
-                   ;; examples require removing gfortran from
-                   ;; CPLUS_INCLUDE_PATH as in the dune-istl,
-                   ;; dune-localfunctions and dune-alugrid packages.)
-                   "-DTrilinos_ENABLE_TESTS=ON"
-                   "-DTrilinos_ENABLE_EXAMPLES=OFF"
-                   ;; MueLu tests require considerably more time and memory to
-                   ;; compile than the rest of the tests.
-                   "-DMueLu_ENABLE_TESTS=OFF"
-
-                   ;; The following options were gleaned from candi's
-                   ;; trilinos.package.
-                   ;; (We do not enable the complex instantiations, which are
-                   ;; anyway provided only as an option in trilinos.package,
-                   ;; because they are costly in compilation time and memory
-                   ;; usage, and disk space [1].)
-                   ;;
-                   ;; [1]: https://www.docs.trilinos.org/files/TrilinosBuildReference.html#enabling-float-and-complex-scalar-types
-                   "-DTrilinos_ENABLE_Ifpack2=OFF"
-                   "-DTeuchos_ENABLE_FLOAT=ON"
-                   "-DTpetra_INST_INT_LONG=ON"
-                   "-DTPL_ENABLE_Boost=OFF")
-           #:phases
-           #~(modify-phases %standard-phases
-               (add-after 'configure 'fix-kokkos-config
-                 (lambda _
-                   ;; GNU Make 4.3 accidentally leaves the backslash preceding
-                   ;; the number sign in strings containing a literal
-                   ;; backslash–number sign (\#) [1, 2].
-                   ;; This is still an issue in Trilinos 13.0.1, but should be
-                   ;; fixed in the following version.
-                   ;; (The latest versions of Kokkos incorporate the fix [2].)
-                   ;;
-                   ;; [1]: https://github.com/GEOSX/thirdPartyLibs/issues/136
-                   ;; [2]: https://github.com/kokkos/kokkos/blob/3.4.00/Makefile.kokkos#L441
-                   (substitute* "KokkosCore_config.h"
-                     (("\\\\#") "#"))))
-               (add-before 'check 'mpi-setup
-                 #$%openmpi-setup))))
-    (home-page "https://trilinos.github.io/")
-    (synopsis "Algorithms for engineering and scientific problems")
-    (description
-     "The Trilinos Project is an effort to develop algorithms and enabling
-technologies within an object-oriented software framework for the solution of
-large-scale, complex multi-physics engineering and scientific problems.
-A unique design feature of Trilinos is its focus on packages.")
-    ;; The packages are variously licensed under more than just BSD-3 and
-    ;; LGPL-2.1+, but all the licenses are either BSD- or LGPL-compatible.
-    ;; See https://trilinos.github.io/license.html.
-    (license (list license:bsd-3 license:lgpl2.1+))))
-
 (define-public dealii
   (package
     (name "dealii")
diff --git a/gnu/packages/patches/teuchos-remove-duplicate-using.patch b/gnu/packages/patches/teuchos-remove-duplicate-using.patch
deleted file mode 100644
index 55cd3f6fc37..00000000000
--- a/gnu/packages/patches/teuchos-remove-duplicate-using.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-commit e27d9ae98502626d8407045a4e082797682ba56b
-Author: Christian Glusa <caglusa@sandia.gov>
-Date:   Fri Jul 3 18:02:27 2020 -0600
-
-    Teuchos Comm test: remove duplicate 'using ...'
-
-diff --git a/packages/teuchos/comm/test/Comm/reduce.cpp b/packages/teuchos/comm/test/Comm/reduce.cpp
-index c05ebc0dc34..eac1975ef83 100644
---- a/packages/teuchos/comm/test/Comm/reduce.cpp
-+++ b/packages/teuchos/comm/test/Comm/reduce.cpp
-@@ -53,9 +53,6 @@ bool
- testReduceSum (bool& success, std::ostream& out,
-                const int root, const Teuchos::Comm<int>& comm)
- {
--#ifdef HAVE_TEUCHOS_MPI
--  using Teuchos::MpiComm;
--#endif // HAVE_TEUCHOS_MPI
-   using Teuchos::reduce;
-   using Teuchos::TypeNameTraits;
-   using std::endl;
-diff --git a/packages/teuchos/comm/test/Comm/scatter.cpp b/packages/teuchos/comm/test/Comm/scatter.cpp
-index 0ca961d2846..001009029c4 100644
---- a/packages/teuchos/comm/test/Comm/scatter.cpp
-+++ b/packages/teuchos/comm/test/Comm/scatter.cpp
-@@ -53,9 +53,6 @@ bool
- testScatter (bool& success, std::ostream& out,
-              const int root, const Teuchos::Comm<int>& comm)
- {
--#ifdef HAVE_TEUCHOS_MPI
--  using Teuchos::MpiComm;
--#endif // HAVE_TEUCHOS_MPI
-   using Teuchos::scatter;
-   using Teuchos::TypeNameTraits;
-   using std::endl;
diff --git a/gnu/packages/patches/tpetra-remove-duplicate-using.patch b/gnu/packages/patches/tpetra-remove-duplicate-using.patch
deleted file mode 100644
index e9cb2c64720..00000000000
--- a/gnu/packages/patches/tpetra-remove-duplicate-using.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit 919ceb0acbf4c6bc4f463433504a338c643612c2
-Author: Karen D. Devine <kddevin@sandia.gov>
-Date:   Tue Feb 2 13:49:13 2021 -0700
-
-    tpetra: removed duplicate using statement #8673
-
-diff --git a/packages/tpetra/core/src/Tpetra_Details_FixedHashTable_def.hpp b/packages/tpetra/core/src/Tpetra_Details_FixedHashTable_def.hpp
-index a76f78c41a8..69d4dc46d03 100644
---- a/packages/tpetra/core/src/Tpetra_Details_FixedHashTable_def.hpp
-+++ b/packages/tpetra/core/src/Tpetra_Details_FixedHashTable_def.hpp
-@@ -1094,7 +1094,6 @@ init (const keys_type& keys,
- 
-   // Allocate the array of (key,value) pairs.  Don't fill it with
-   // zeros, because we will fill it with actual data below.
--  using Kokkos::ViewAllocateWithoutInitializing;
-   typedef typename val_type::non_const_type nonconst_val_type;
-   nonconst_val_type val (ViewAllocateWithoutInitializing ("Tpetra::FixedHashTable::pairs"),
-                          theNumKeys);