diff liboctave/numeric/gsvd.cc @ 31607:aac27ad79be6 stable

maint: Re-indent code after switch to using namespace macros. * build-env.h, build-env.in.cc, Cell.h, __betainc__.cc, __eigs__.cc, __ftp__.cc, __ichol__.cc, __ilu__.cc, __isprimelarge__.cc, __magick_read__.cc, __pchip_deriv__.cc, amd.cc, base-text-renderer.cc, base-text-renderer.h, besselj.cc, bitfcns.cc, bsxfun.cc, c-file-ptr-stream.h, call-stack.cc, call-stack.h, ccolamd.cc, cellfun.cc, chol.cc, colamd.cc, dasrt.cc, data.cc, debug.cc, defaults.cc, defaults.h, det.cc, display.cc, display.h, dlmread.cc, dynamic-ld.cc, dynamic-ld.h, ellipj.cc, environment.cc, environment.h, error.cc, error.h, errwarn.h, event-manager.cc, event-manager.h, event-queue.cc, event-queue.h, fcn-info.cc, fcn-info.h, fft.cc, fft2.cc, file-io.cc, filter.cc, find.cc, ft-text-renderer.cc, ft-text-renderer.h, gcd.cc, gl-render.cc, gl-render.h, gl2ps-print.cc, gl2ps-print.h, graphics-toolkit.cc, graphics-toolkit.h, graphics.cc, gsvd.cc, gtk-manager.cc, gtk-manager.h, help.cc, help.h, hook-fcn.cc, hook-fcn.h, input.cc, input.h, interpreter-private.cc, interpreter-private.h, interpreter.cc, interpreter.h, inv.cc, jsondecode.cc, jsonencode.cc, latex-text-renderer.cc, latex-text-renderer.h, load-path.cc, load-path.h, load-save.cc, load-save.h, lookup.cc, ls-hdf5.cc, ls-mat4.cc, ls-mat5.cc, lsode.cc, lu.cc, mappers.cc, matrix_type.cc, max.cc, mex.cc, mexproto.h, mxarray.h, mxtypes.in.h, oct-errno.in.cc, oct-hdf5-types.cc, oct-hist.cc, oct-hist.h, oct-map.cc, oct-map.h, oct-opengl.h, oct-prcstrm.h, oct-process.cc, oct-process.h, oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.h, octave-default-image.h, ordqz.cc, ordschur.cc, pager.cc, pager.h, pinv.cc, pow2.cc, pr-output.cc, psi.cc, qr.cc, quadcc.cc, rand.cc, regexp.cc, settings.cc, settings.h, sighandlers.cc, sighandlers.h, sparse-xpow.cc, sqrtm.cc, stack-frame.cc, stack-frame.h, stream-euler.cc, strfns.cc, svd.cc, syminfo.cc, syminfo.h, symrcm.cc, symrec.cc, symrec.h, symscope.cc, symscope.h, symtab.cc, symtab.h, sysdep.cc, sysdep.h, text-engine.cc, text-engine.h, text-renderer.cc, text-renderer.h, time.cc, toplev.cc, typecast.cc, url-handle-manager.cc, url-handle-manager.h, urlwrite.cc, utils.cc, utils.h, variables.cc, variables.h, xdiv.cc, __delaunayn__.cc, __init_fltk__.cc, __init_gnuplot__.cc, __ode15__.cc, __voronoi__.cc, audioread.cc, convhulln.cc, gzip.cc, cdef-class.cc, cdef-class.h, cdef-fwd.h, cdef-manager.cc, cdef-manager.h, cdef-method.cc, cdef-method.h, cdef-object.cc, cdef-object.h, cdef-package.cc, cdef-package.h, cdef-property.cc, cdef-property.h, cdef-utils.cc, cdef-utils.h, ov-base-diag.cc, ov-base-int.cc, ov-base-mat.cc, ov-base-mat.h, ov-base-scalar.cc, ov-base.cc, ov-base.h, ov-bool-mat.cc, ov-bool-mat.h, ov-bool-sparse.cc, ov-bool.cc, ov-builtin.h, ov-cell.cc, ov-ch-mat.cc, ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h, ov-complex.cc, ov-cx-diag.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-dld-fcn.cc, ov-dld-fcn.h, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn.h, ov-float.cc, ov-flt-complex.cc, ov-flt-cx-diag.cc, ov-flt-cx-mat.cc, ov-flt-re-diag.cc, ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-intx.h, ov-java.cc, ov-lazy-idx.cc, ov-legacy-range.cc, ov-magic-int.cc, ov-mex-fcn.cc, ov-mex-fcn.h, ov-null-mat.cc, ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-re-mat.cc, ov-re-mat.h, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc, ov-struct.cc, ov-typeinfo.cc, ov-typeinfo.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, ov.h, ovl.h, octave.cc, octave.h, op-b-sbm.cc, op-bm-sbm.cc, op-cs-scm.cc, op-fm-fcm.cc, op-fs-fcm.cc, op-s-scm.cc, op-scm-cs.cc, op-scm-s.cc, op-sm-cs.cc, ops.h, anon-fcn-validator.cc, anon-fcn-validator.h, bp-table.cc, bp-table.h, comment-list.cc, comment-list.h, filepos.h, lex.h, oct-lvalue.cc, oct-lvalue.h, parse.h, profiler.cc, profiler.h, pt-anon-scopes.cc, pt-anon-scopes.h, pt-arg-list.cc, pt-arg-list.h, pt-args-block.cc, pt-args-block.h, pt-array-list.cc, pt-array-list.h, pt-assign.cc, pt-assign.h, pt-binop.cc, pt-binop.h, pt-bp.cc, pt-bp.h, pt-cbinop.cc, pt-cbinop.h, pt-cell.cc, pt-cell.h, pt-check.cc, pt-check.h, pt-classdef.cc, pt-classdef.h, pt-cmd.h, pt-colon.cc, pt-colon.h, pt-const.cc, pt-const.h, pt-decl.cc, pt-decl.h, pt-eval.cc, pt-eval.h, pt-except.cc, pt-except.h, pt-exp.cc, pt-exp.h, pt-fcn-handle.cc, pt-fcn-handle.h, pt-id.cc, pt-id.h, pt-idx.cc, pt-idx.h, pt-jump.h, pt-loop.cc, pt-loop.h, pt-mat.cc, pt-mat.h, pt-misc.cc, pt-misc.h, pt-pr-code.cc, pt-pr-code.h, pt-select.cc, pt-select.h, pt-spmd.cc, pt-spmd.h, pt-stmt.cc, pt-stmt.h, pt-tm-const.cc, pt-tm-const.h, pt-unop.cc, pt-unop.h, pt-walk.cc, pt-walk.h, pt.cc, pt.h, token.cc, token.h, Range.cc, Range.h, idx-vector.cc, idx-vector.h, range-fwd.h, CollocWt.cc, CollocWt.h, aepbalance.cc, aepbalance.h, chol.cc, chol.h, gepbalance.cc, gepbalance.h, gsvd.cc, gsvd.h, hess.cc, hess.h, lo-mappers.cc, lo-mappers.h, lo-specfun.cc, lo-specfun.h, lu.cc, lu.h, oct-convn.cc, oct-convn.h, oct-fftw.cc, oct-fftw.h, oct-norm.cc, oct-norm.h, oct-rand.cc, oct-rand.h, oct-spparms.cc, oct-spparms.h, qr.cc, qr.h, qrp.cc, qrp.h, randgamma.cc, randgamma.h, randmtzig.cc, randmtzig.h, randpoisson.cc, randpoisson.h, schur.cc, schur.h, sparse-chol.cc, sparse-chol.h, sparse-lu.cc, sparse-lu.h, sparse-qr.cc, sparse-qr.h, svd.cc, svd.h, child-list.cc, child-list.h, dir-ops.cc, dir-ops.h, file-ops.cc, file-ops.h, file-stat.cc, file-stat.h, lo-sysdep.cc, lo-sysdep.h, lo-sysinfo.cc, lo-sysinfo.h, mach-info.cc, mach-info.h, oct-env.cc, oct-env.h, oct-group.cc, oct-group.h, oct-password.cc, oct-password.h, oct-syscalls.cc, oct-syscalls.h, oct-time.cc, oct-time.h, oct-uname.cc, oct-uname.h, action-container.cc, action-container.h, base-list.h, cmd-edit.cc, cmd-edit.h, cmd-hist.cc, cmd-hist.h, f77-fcn.h, file-info.cc, file-info.h, lo-array-errwarn.cc, lo-array-errwarn.h, lo-hash.cc, lo-hash.h, lo-ieee.h, lo-regexp.cc, lo-regexp.h, lo-utils.cc, lo-utils.h, oct-base64.cc, oct-base64.h, oct-glob.cc, oct-glob.h, oct-inttypes.h, oct-mutex.cc, oct-mutex.h, oct-refcount.h, oct-shlib.cc, oct-shlib.h, oct-sparse.cc, oct-sparse.h, oct-string.h, octave-preserve-stream-state.h, pathsearch.cc, pathsearch.h, quit.cc, quit.h, unwind-prot.cc, unwind-prot.h, url-transfer.cc, url-transfer.h: Re-indent code after switch to using namespace macros.
author Rik <rik@octave.org>
date Thu, 01 Dec 2022 18:02:15 -0800
parents e88a07dec498
children 597f3ee61a48
line wrap: on
line diff
--- a/liboctave/numeric/gsvd.cc	Thu Dec 01 14:23:45 2022 -0800
+++ b/liboctave/numeric/gsvd.cc	Thu Dec 01 18:02:15 2022 -0800
@@ -44,655 +44,655 @@
 
 OCTAVE_BEGIN_NAMESPACE(octave)
 
-  static std::unordered_map<std::string, void *> gsvd_fcn;
+static std::unordered_map<std::string, void *> gsvd_fcn;
 
-  static bool have_DGGSVD3 = false;
-  static bool gsvd_initialized = false;
+static bool have_DGGSVD3 = false;
+static bool gsvd_initialized = false;
 
-  /* Hack to stringize results of F77_FUNC macro. */
-  #define xSTRINGIZE(x) #x
-  #define STRINGIZE(x) xSTRINGIZE(x)
+/* Hack to stringize results of F77_FUNC macro. */
+#define xSTRINGIZE(x) #x
+#define STRINGIZE(x) xSTRINGIZE(x)
 
-  static void initialize_gsvd (void)
-  {
-    if (gsvd_initialized)
-      return;
+static void initialize_gsvd (void)
+{
+  if (gsvd_initialized)
+    return;
 
-    dynamic_library libs ("");
-    if (! libs)
-      (*current_liboctave_error_handler)
-        ("gsvd: unable to query LAPACK library");
+  dynamic_library libs ("");
+  if (! libs)
+    (*current_liboctave_error_handler)
+      ("gsvd: unable to query LAPACK library");
 
-    have_DGGSVD3 = (libs.search (STRINGIZE (F77_FUNC (dggsvd3, DGGSVD3)))
-                    != nullptr);
+  have_DGGSVD3 = (libs.search (STRINGIZE (F77_FUNC (dggsvd3, DGGSVD3)))
+                  != nullptr);
 
-    if (have_DGGSVD3)
-      {
-        gsvd_fcn["dg"] = libs.search (STRINGIZE (F77_FUNC (dggsvd3, DGGSVD3)));
-        gsvd_fcn["sg"] = libs.search (STRINGIZE (F77_FUNC (sggsvd3, SGGSVD3)));
-        gsvd_fcn["zg"] = libs.search (STRINGIZE (F77_FUNC (zggsvd3, ZGGSVD3)));
-        gsvd_fcn["cg"] = libs.search (STRINGIZE (F77_FUNC (cggsvd3, CGGSVD3)));
-      }
-    else
-      {
-        gsvd_fcn["dg"] = libs.search (STRINGIZE (F77_FUNC (dggsvd, DGGSVD)));
-        gsvd_fcn["sg"] = libs.search (STRINGIZE (F77_FUNC (sggsvd, SGGSVD)));
-        gsvd_fcn["zg"] = libs.search (STRINGIZE (F77_FUNC (zggsvd, ZGGSVD)));
-        gsvd_fcn["cg"] = libs.search (STRINGIZE (F77_FUNC (cggsvd, CGGSVD)));
-      }
+  if (have_DGGSVD3)
+    {
+      gsvd_fcn["dg"] = libs.search (STRINGIZE (F77_FUNC (dggsvd3, DGGSVD3)));
+      gsvd_fcn["sg"] = libs.search (STRINGIZE (F77_FUNC (sggsvd3, SGGSVD3)));
+      gsvd_fcn["zg"] = libs.search (STRINGIZE (F77_FUNC (zggsvd3, ZGGSVD3)));
+      gsvd_fcn["cg"] = libs.search (STRINGIZE (F77_FUNC (cggsvd3, CGGSVD3)));
+    }
+  else
+    {
+      gsvd_fcn["dg"] = libs.search (STRINGIZE (F77_FUNC (dggsvd, DGGSVD)));
+      gsvd_fcn["sg"] = libs.search (STRINGIZE (F77_FUNC (sggsvd, SGGSVD)));
+      gsvd_fcn["zg"] = libs.search (STRINGIZE (F77_FUNC (zggsvd, ZGGSVD)));
+      gsvd_fcn["cg"] = libs.search (STRINGIZE (F77_FUNC (cggsvd, CGGSVD)));
+    }
 
-    gsvd_initialized = true;
-  }
+  gsvd_initialized = true;
+}
 
-  /* Clean up macro namespace as soon as we are done using them */
-  #undef xSTRINGIZE
-  #undef STRINGIZE
+/* Clean up macro namespace as soon as we are done using them */
+#undef xSTRINGIZE
+#undef STRINGIZE
 
-  template<class T1>
-  struct real_ggsvd_ptr
-  {
-    typedef F77_RET_T (*type)
+template<class T1>
+struct real_ggsvd_ptr
+{
+  typedef F77_RET_T (*type)
     (F77_CONST_CHAR_ARG_DECL,   // JOBU
-     F77_CONST_CHAR_ARG_DECL,   // JOBV
-     F77_CONST_CHAR_ARG_DECL,   // JOBQ
-     const F77_INT&,            // M
-     const F77_INT&,            // N
-     const F77_INT&,            // P
-     F77_INT&,                  // K
-     F77_INT&,                  // L
-     T1 *,                      // A(LDA,N)
-     const F77_INT&,            // LDA
-     T1 *,                      // B(LDB,N)
-     const F77_INT&,            // LDB
-     T1 *,                      // ALPHA(N)
-     T1 *,                      // BETA(N)
-     T1 *,                      // U(LDU,M)
-     const F77_INT&,            // LDU
-     T1 *,                      // V(LDV,P)
-     const F77_INT&,            // LDV
-     T1 *,                      // Q(LDQ,N)
-     const F77_INT&,            // LDQ
-     T1 *,                      // WORK
-     F77_INT *,                 // IWORK(N)
-     F77_INT&                   // INFO
-     F77_CHAR_ARG_LEN_DECL
-     F77_CHAR_ARG_LEN_DECL
-     F77_CHAR_ARG_LEN_DECL);
-  };
+   F77_CONST_CHAR_ARG_DECL,   // JOBV
+   F77_CONST_CHAR_ARG_DECL,   // JOBQ
+   const F77_INT&,            // M
+   const F77_INT&,            // N
+   const F77_INT&,            // P
+   F77_INT&,                  // K
+   F77_INT&,                  // L
+   T1 *,                      // A(LDA,N)
+   const F77_INT&,            // LDA
+   T1 *,                      // B(LDB,N)
+   const F77_INT&,            // LDB
+   T1 *,                      // ALPHA(N)
+   T1 *,                      // BETA(N)
+   T1 *,                      // U(LDU,M)
+   const F77_INT&,            // LDU
+   T1 *,                      // V(LDV,P)
+   const F77_INT&,            // LDV
+   T1 *,                      // Q(LDQ,N)
+   const F77_INT&,            // LDQ
+   T1 *,                      // WORK
+   F77_INT *,                 // IWORK(N)
+   F77_INT&                   // INFO
+   F77_CHAR_ARG_LEN_DECL
+   F77_CHAR_ARG_LEN_DECL
+   F77_CHAR_ARG_LEN_DECL);
+};
 
-  template<class T1>
-  struct real_ggsvd3_ptr
-  {
-    typedef F77_RET_T (*type)
+template<class T1>
+struct real_ggsvd3_ptr
+{
+  typedef F77_RET_T (*type)
     (F77_CONST_CHAR_ARG_DECL,   // JOBU
-     F77_CONST_CHAR_ARG_DECL,   // JOBV
-     F77_CONST_CHAR_ARG_DECL,   // JOBQ
-     const F77_INT&,            // M
-     const F77_INT&,            // N
-     const F77_INT&,            // P
-     F77_INT&,                  // K
-     F77_INT&,                  // L
-     T1 *,                      // A(LDA,N)
-     const F77_INT&,            // LDA
-     T1 *,                      // B(LDB,N)
-     const F77_INT&,            // LDB
-     T1 *,                      // ALPHA(N)
-     T1 *,                      // BETA(N)
-     T1 *,                      // U(LDU,M)
-     const F77_INT&,            // LDU
-     T1 *,                      // V(LDV,P)
-     const F77_INT&,            // LDV
-     T1 *,                      // Q(LDQ,N)
-     const F77_INT&,            // LDQ
-     T1 *,                      // WORK
-     const F77_INT&,            // LWORK
-     F77_INT *,                 // IWORK(N)
-     F77_INT&                   // INFO
-     F77_CHAR_ARG_LEN_DECL
-     F77_CHAR_ARG_LEN_DECL
-     F77_CHAR_ARG_LEN_DECL);
-  };
+   F77_CONST_CHAR_ARG_DECL,   // JOBV
+   F77_CONST_CHAR_ARG_DECL,   // JOBQ
+   const F77_INT&,            // M
+   const F77_INT&,            // N
+   const F77_INT&,            // P
+   F77_INT&,                  // K
+   F77_INT&,                  // L
+   T1 *,                      // A(LDA,N)
+   const F77_INT&,            // LDA
+   T1 *,                      // B(LDB,N)
+   const F77_INT&,            // LDB
+   T1 *,                      // ALPHA(N)
+   T1 *,                      // BETA(N)
+   T1 *,                      // U(LDU,M)
+   const F77_INT&,            // LDU
+   T1 *,                      // V(LDV,P)
+   const F77_INT&,            // LDV
+   T1 *,                      // Q(LDQ,N)
+   const F77_INT&,            // LDQ
+   T1 *,                      // WORK
+   const F77_INT&,            // LWORK
+   F77_INT *,                 // IWORK(N)
+   F77_INT&                   // INFO
+   F77_CHAR_ARG_LEN_DECL
+   F77_CHAR_ARG_LEN_DECL
+   F77_CHAR_ARG_LEN_DECL);
+};
 
-  template<class T1, class T2>
-  struct comp_ggsvd_ptr
-  {
-    typedef F77_RET_T (*type)
+template<class T1, class T2>
+struct comp_ggsvd_ptr
+{
+  typedef F77_RET_T (*type)
     (F77_CONST_CHAR_ARG_DECL,   // JOBU
-     F77_CONST_CHAR_ARG_DECL,   // JOBV
-     F77_CONST_CHAR_ARG_DECL,   // JOBQ
-     const F77_INT&,            // M
-     const F77_INT&,            // N
-     const F77_INT&,            // P
-     F77_INT&,                  // K
-     F77_INT&,                  // L
-     T1 *,                      // A(LDA,N)
-     const F77_INT&,            // LDA
-     T1 *,                      // B(LDB,N)
-     const F77_INT&,            // LDB
-     T2 *,                      // ALPHA(N)
-     T2 *,                      // BETA(N)
-     T1 *,                      // U(LDU,M)
-     const F77_INT&,            // LDU
-     T1 *,                      // V(LDV,P)
-     const F77_INT&,            // LDV
-     T1 *,                      // Q(LDQ,N)
-     const F77_INT&,            // LDQ
-     T1 *,                      // WORK
-     T2 *,                      // RWORK
-     F77_INT *,                 // IWORK(N)
-     F77_INT&                   // INFO
-     F77_CHAR_ARG_LEN_DECL
-     F77_CHAR_ARG_LEN_DECL
-     F77_CHAR_ARG_LEN_DECL);
-  };
+   F77_CONST_CHAR_ARG_DECL,   // JOBV
+   F77_CONST_CHAR_ARG_DECL,   // JOBQ
+   const F77_INT&,            // M
+   const F77_INT&,            // N
+   const F77_INT&,            // P
+   F77_INT&,                  // K
+   F77_INT&,                  // L
+   T1 *,                      // A(LDA,N)
+   const F77_INT&,            // LDA
+   T1 *,                      // B(LDB,N)
+   const F77_INT&,            // LDB
+   T2 *,                      // ALPHA(N)
+   T2 *,                      // BETA(N)
+   T1 *,                      // U(LDU,M)
+   const F77_INT&,            // LDU
+   T1 *,                      // V(LDV,P)
+   const F77_INT&,            // LDV
+   T1 *,                      // Q(LDQ,N)
+   const F77_INT&,            // LDQ
+   T1 *,                      // WORK
+   T2 *,                      // RWORK
+   F77_INT *,                 // IWORK(N)
+   F77_INT&                   // INFO
+   F77_CHAR_ARG_LEN_DECL
+   F77_CHAR_ARG_LEN_DECL
+   F77_CHAR_ARG_LEN_DECL);
+};
 
-  template<class T1, class T2>
-  struct comp_ggsvd3_ptr
-  {
-    typedef F77_RET_T (*type)
+template<class T1, class T2>
+struct comp_ggsvd3_ptr
+{
+  typedef F77_RET_T (*type)
     (F77_CONST_CHAR_ARG_DECL,   // JOBU
-     F77_CONST_CHAR_ARG_DECL,   // JOBV
-     F77_CONST_CHAR_ARG_DECL,   // JOBQ
-     const F77_INT&,            // M
-     const F77_INT&,            // N
-     const F77_INT&,            // P
-     F77_INT&,                  // K
-     F77_INT&,                  // L
-     T1 *,                      // A(LDA,N)
-     const F77_INT&,            // LDA
-     T1 *,                      // B(LDB,N)
-     const F77_INT&,            // LDB
-     T2 *,                      // ALPHA(N)
-     T2 *,                      // BETA(N)
-     T1 *,                      // U(LDU,M)
-     const F77_INT&,            // LDU
-     T1 *,                      // V(LDV,P)
-     const F77_INT&,            // LDV
-     T1 *,                      // Q(LDQ,N)
-     const F77_INT&,            // LDQ
-     T1 *,                      // WORK
-     const F77_INT&,            // LWORK
-     T2 *,                      // RWORK
-     F77_INT *,                 // IWORK(N)
-     F77_INT&                   // INFO
-     F77_CHAR_ARG_LEN_DECL
-     F77_CHAR_ARG_LEN_DECL
-     F77_CHAR_ARG_LEN_DECL);
-  };
+   F77_CONST_CHAR_ARG_DECL,   // JOBV
+   F77_CONST_CHAR_ARG_DECL,   // JOBQ
+   const F77_INT&,            // M
+   const F77_INT&,            // N
+   const F77_INT&,            // P
+   F77_INT&,                  // K
+   F77_INT&,                  // L
+   T1 *,                      // A(LDA,N)
+   const F77_INT&,            // LDA
+   T1 *,                      // B(LDB,N)
+   const F77_INT&,            // LDB
+   T2 *,                      // ALPHA(N)
+   T2 *,                      // BETA(N)
+   T1 *,                      // U(LDU,M)
+   const F77_INT&,            // LDU
+   T1 *,                      // V(LDV,P)
+   const F77_INT&,            // LDV
+   T1 *,                      // Q(LDQ,N)
+   const F77_INT&,            // LDQ
+   T1 *,                      // WORK
+   const F77_INT&,            // LWORK
+   T2 *,                      // RWORK
+   F77_INT *,                 // IWORK(N)
+   F77_INT&                   // INFO
+   F77_CHAR_ARG_LEN_DECL
+   F77_CHAR_ARG_LEN_DECL
+   F77_CHAR_ARG_LEN_DECL);
+};
 
-  // template specializations
-  typedef real_ggsvd_ptr<F77_DBLE>::type dggsvd_type;
-  typedef real_ggsvd3_ptr<F77_DBLE>::type dggsvd3_type;
-  typedef real_ggsvd_ptr<F77_REAL>::type sggsvd_type;
-  typedef real_ggsvd3_ptr<F77_REAL>::type sggsvd3_type;
-  typedef comp_ggsvd_ptr<F77_DBLE_CMPLX, F77_DBLE>::type zggsvd_type;
-  typedef comp_ggsvd3_ptr<F77_DBLE_CMPLX, F77_DBLE>::type zggsvd3_type;
-  typedef comp_ggsvd_ptr<F77_CMPLX, F77_REAL>::type cggsvd_type;
-  typedef comp_ggsvd3_ptr<F77_CMPLX, F77_REAL>::type cggsvd3_type;
+// template specializations
+typedef real_ggsvd_ptr<F77_DBLE>::type dggsvd_type;
+typedef real_ggsvd3_ptr<F77_DBLE>::type dggsvd3_type;
+typedef real_ggsvd_ptr<F77_REAL>::type sggsvd_type;
+typedef real_ggsvd3_ptr<F77_REAL>::type sggsvd3_type;
+typedef comp_ggsvd_ptr<F77_DBLE_CMPLX, F77_DBLE>::type zggsvd_type;
+typedef comp_ggsvd3_ptr<F77_DBLE_CMPLX, F77_DBLE>::type zggsvd3_type;
+typedef comp_ggsvd_ptr<F77_CMPLX, F77_REAL>::type cggsvd_type;
+typedef comp_ggsvd3_ptr<F77_CMPLX, F77_REAL>::type cggsvd3_type;
 
 OCTAVE_BEGIN_NAMESPACE(math)
 
-    template <>
-    void
-    gsvd<Matrix>::ggsvd (char& jobu, char& jobv, char& jobq, F77_INT m,
-                         F77_INT n, F77_INT p, F77_INT& k, F77_INT& l,
-                         double *tmp_dataA, F77_INT m1, double *tmp_dataB,
-                         F77_INT p1, Matrix& alpha, Matrix& beta, double *u,
-                         F77_INT nrow_u, double *v, F77_INT nrow_v, double *q,
-                         F77_INT nrow_q, double *work, F77_INT lwork,
-                         F77_INT *iwork, F77_INT& info)
+template <>
+void
+gsvd<Matrix>::ggsvd (char& jobu, char& jobv, char& jobq, F77_INT m,
+                     F77_INT n, F77_INT p, F77_INT& k, F77_INT& l,
+                     double *tmp_dataA, F77_INT m1, double *tmp_dataB,
+                     F77_INT p1, Matrix& alpha, Matrix& beta, double *u,
+                     F77_INT nrow_u, double *v, F77_INT nrow_v, double *q,
+                     F77_INT nrow_q, double *work, F77_INT lwork,
+                     F77_INT *iwork, F77_INT& info)
+{
+  if (! gsvd_initialized)
+    initialize_gsvd ();
+
+  if (have_DGGSVD3)
     {
-      if (! gsvd_initialized)
-        initialize_gsvd ();
+      dggsvd3_type f_ptr = reinterpret_cast<dggsvd3_type> (gsvd_fcn["dg"]);
+      f_ptr (F77_CONST_CHAR_ARG2 (&jobu, 1),
+             F77_CONST_CHAR_ARG2 (&jobv, 1),
+             F77_CONST_CHAR_ARG2 (&jobq, 1),
+             m, n, p, k, l, tmp_dataA, m1, tmp_dataB, p1,
+             alpha.fortran_vec (), beta.fortran_vec (),
+             u, nrow_u, v, nrow_v, q, nrow_q,
+             work, lwork, iwork, info
+             F77_CHAR_ARG_LEN (1)
+             F77_CHAR_ARG_LEN (1)
+             F77_CHAR_ARG_LEN (1));
+    }
+  else
+    {
+      dggsvd_type f_ptr = reinterpret_cast<dggsvd_type> (gsvd_fcn["dg"]);
+      f_ptr (F77_CONST_CHAR_ARG2 (&jobu, 1),
+             F77_CONST_CHAR_ARG2 (&jobv, 1),
+             F77_CONST_CHAR_ARG2 (&jobq, 1),
+             m, n, p, k, l, tmp_dataA, m1, tmp_dataB, p1,
+             alpha.fortran_vec (), beta.fortran_vec (),
+             u, nrow_u, v, nrow_v, q, nrow_q,
+             work, iwork, info
+             F77_CHAR_ARG_LEN (1)
+             F77_CHAR_ARG_LEN (1)
+             F77_CHAR_ARG_LEN (1));
+    }
+}
 
-      if (have_DGGSVD3)
-        {
-          dggsvd3_type f_ptr = reinterpret_cast<dggsvd3_type> (gsvd_fcn["dg"]);
-          f_ptr (F77_CONST_CHAR_ARG2 (&jobu, 1),
-                 F77_CONST_CHAR_ARG2 (&jobv, 1),
-                 F77_CONST_CHAR_ARG2 (&jobq, 1),
-                 m, n, p, k, l, tmp_dataA, m1, tmp_dataB, p1,
-                 alpha.fortran_vec (), beta.fortran_vec (),
-                 u, nrow_u, v, nrow_v, q, nrow_q,
-                 work, lwork, iwork, info
-                 F77_CHAR_ARG_LEN (1)
-                 F77_CHAR_ARG_LEN (1)
-                 F77_CHAR_ARG_LEN (1));
-        }
-      else
-        {
-          dggsvd_type f_ptr = reinterpret_cast<dggsvd_type> (gsvd_fcn["dg"]);
-          f_ptr (F77_CONST_CHAR_ARG2 (&jobu, 1),
-                 F77_CONST_CHAR_ARG2 (&jobv, 1),
-                 F77_CONST_CHAR_ARG2 (&jobq, 1),
-                 m, n, p, k, l, tmp_dataA, m1, tmp_dataB, p1,
-                 alpha.fortran_vec (), beta.fortran_vec (),
-                 u, nrow_u, v, nrow_v, q, nrow_q,
-                 work, iwork, info
-                 F77_CHAR_ARG_LEN (1)
-                 F77_CHAR_ARG_LEN (1)
-                 F77_CHAR_ARG_LEN (1));
-        }
+template <>
+void
+gsvd<FloatMatrix>::ggsvd (char& jobu, char& jobv, char& jobq, F77_INT m,
+                          F77_INT n, F77_INT p, F77_INT& k, F77_INT& l,
+                          float *tmp_dataA, F77_INT m1, float *tmp_dataB,
+                          F77_INT p1, FloatMatrix& alpha,
+                          FloatMatrix& beta, float *u, F77_INT nrow_u,
+                          float *v, F77_INT nrow_v, float *q,
+                          F77_INT nrow_q, float *work,
+                          F77_INT lwork, F77_INT *iwork, F77_INT& info)
+{
+  if (! gsvd_initialized)
+    initialize_gsvd ();
+
+  if (have_DGGSVD3)
+    {
+      sggsvd3_type f_ptr = reinterpret_cast<sggsvd3_type> (gsvd_fcn["sg"]);
+      f_ptr (F77_CONST_CHAR_ARG2 (&jobu, 1),
+             F77_CONST_CHAR_ARG2 (&jobv, 1),
+             F77_CONST_CHAR_ARG2 (&jobq, 1),
+             m, n, p, k, l, tmp_dataA, m1, tmp_dataB, p1,
+             alpha.fortran_vec (), beta.fortran_vec (),
+             u, nrow_u, v, nrow_v, q, nrow_q,
+             work, lwork, iwork, info
+             F77_CHAR_ARG_LEN (1)
+             F77_CHAR_ARG_LEN (1)
+             F77_CHAR_ARG_LEN (1));
     }
+  else
+    {
+      sggsvd_type f_ptr = reinterpret_cast<sggsvd_type> (gsvd_fcn["sg"]);
+      f_ptr (F77_CONST_CHAR_ARG2 (&jobu, 1),
+             F77_CONST_CHAR_ARG2 (&jobv, 1),
+             F77_CONST_CHAR_ARG2 (&jobq, 1),
+             m, n, p, k, l, tmp_dataA, m1, tmp_dataB, p1,
+             alpha.fortran_vec (), beta.fortran_vec (),
+             u, nrow_u, v, nrow_v, q, nrow_q,
+             work, iwork, info
+             F77_CHAR_ARG_LEN (1)
+             F77_CHAR_ARG_LEN (1)
+             F77_CHAR_ARG_LEN (1));
+    }
+}
 
-    template <>
-    void
-    gsvd<FloatMatrix>::ggsvd (char& jobu, char& jobv, char& jobq, F77_INT m,
-                              F77_INT n, F77_INT p, F77_INT& k, F77_INT& l,
-                              float *tmp_dataA, F77_INT m1, float *tmp_dataB,
-                              F77_INT p1, FloatMatrix& alpha,
-                              FloatMatrix& beta, float *u, F77_INT nrow_u,
-                              float *v, F77_INT nrow_v, float *q,
-                              F77_INT nrow_q, float *work,
-                              F77_INT lwork, F77_INT *iwork, F77_INT& info)
-    {
-      if (! gsvd_initialized)
-        initialize_gsvd ();
+template <>
+void
+gsvd<ComplexMatrix>::ggsvd (char& jobu, char& jobv, char& jobq,
+                            F77_INT m, F77_INT n, F77_INT p, F77_INT& k,
+                            F77_INT& l, Complex *tmp_dataA, F77_INT m1,
+                            Complex *tmp_dataB, F77_INT p1, Matrix& alpha,
+                            Matrix& beta, Complex *u, F77_INT nrow_u,
+                            Complex *v, F77_INT nrow_v, Complex *q,
+                            F77_INT nrow_q, Complex *work,
+                            F77_INT lwork, F77_INT *iwork, F77_INT& info)
+{
+  if (! gsvd_initialized)
+    initialize_gsvd ();
+
+  OCTAVE_LOCAL_BUFFER(double, rwork, 2*n);
 
-      if (have_DGGSVD3)
-        {
-          sggsvd3_type f_ptr = reinterpret_cast<sggsvd3_type> (gsvd_fcn["sg"]);
-          f_ptr (F77_CONST_CHAR_ARG2 (&jobu, 1),
-                 F77_CONST_CHAR_ARG2 (&jobv, 1),
-                 F77_CONST_CHAR_ARG2 (&jobq, 1),
-                 m, n, p, k, l, tmp_dataA, m1, tmp_dataB, p1,
-                 alpha.fortran_vec (), beta.fortran_vec (),
-                 u, nrow_u, v, nrow_v, q, nrow_q,
-                 work, lwork, iwork, info
-                 F77_CHAR_ARG_LEN (1)
-                 F77_CHAR_ARG_LEN (1)
-                 F77_CHAR_ARG_LEN (1));
-        }
-      else
-        {
-          sggsvd_type f_ptr = reinterpret_cast<sggsvd_type> (gsvd_fcn["sg"]);
-          f_ptr (F77_CONST_CHAR_ARG2 (&jobu, 1),
-                 F77_CONST_CHAR_ARG2 (&jobv, 1),
-                 F77_CONST_CHAR_ARG2 (&jobq, 1),
-                 m, n, p, k, l, tmp_dataA, m1, tmp_dataB, p1,
-                 alpha.fortran_vec (), beta.fortran_vec (),
-                 u, nrow_u, v, nrow_v, q, nrow_q,
-                 work, iwork, info
-                 F77_CHAR_ARG_LEN (1)
-                 F77_CHAR_ARG_LEN (1)
-                 F77_CHAR_ARG_LEN (1));
-        }
+  if (have_DGGSVD3)
+    {
+      zggsvd3_type f_ptr = reinterpret_cast<zggsvd3_type> (gsvd_fcn["zg"]);
+      f_ptr (F77_CONST_CHAR_ARG2 (&jobu, 1),
+             F77_CONST_CHAR_ARG2 (&jobv, 1),
+             F77_CONST_CHAR_ARG2 (&jobq, 1),
+             m, n, p, k, l,
+             F77_DBLE_CMPLX_ARG (tmp_dataA), m1,
+             F77_DBLE_CMPLX_ARG (tmp_dataB), p1,
+             alpha.fortran_vec (), beta.fortran_vec (),
+             F77_DBLE_CMPLX_ARG (u), nrow_u,
+             F77_DBLE_CMPLX_ARG (v), nrow_v,
+             F77_DBLE_CMPLX_ARG (q), nrow_q,
+             F77_DBLE_CMPLX_ARG (work),
+             lwork, rwork, iwork, info
+             F77_CHAR_ARG_LEN (1)
+             F77_CHAR_ARG_LEN (1)
+             F77_CHAR_ARG_LEN (1));
+    }
+  else
+    {
+      zggsvd_type f_ptr = reinterpret_cast<zggsvd_type> (gsvd_fcn["zg"]);
+      f_ptr (F77_CONST_CHAR_ARG2 (&jobu, 1),
+             F77_CONST_CHAR_ARG2 (&jobv, 1),
+             F77_CONST_CHAR_ARG2 (&jobq, 1),
+             m, n, p, k, l,
+             F77_DBLE_CMPLX_ARG (tmp_dataA), m1,
+             F77_DBLE_CMPLX_ARG (tmp_dataB), p1,
+             alpha.fortran_vec (), beta.fortran_vec (),
+             F77_DBLE_CMPLX_ARG (u), nrow_u,
+             F77_DBLE_CMPLX_ARG (v), nrow_v,
+             F77_DBLE_CMPLX_ARG (q), nrow_q,
+             F77_DBLE_CMPLX_ARG (work),
+             rwork, iwork, info
+             F77_CHAR_ARG_LEN (1)
+             F77_CHAR_ARG_LEN (1)
+             F77_CHAR_ARG_LEN (1));
     }
+}
 
-    template <>
-    void
-    gsvd<ComplexMatrix>::ggsvd (char& jobu, char& jobv, char& jobq,
-                                F77_INT m, F77_INT n, F77_INT p, F77_INT& k,
-                                F77_INT& l, Complex *tmp_dataA, F77_INT m1,
-                                Complex *tmp_dataB, F77_INT p1, Matrix& alpha,
-                                Matrix& beta, Complex *u, F77_INT nrow_u,
-                                Complex *v, F77_INT nrow_v, Complex *q,
-                                F77_INT nrow_q, Complex *work,
-                                F77_INT lwork, F77_INT *iwork, F77_INT& info)
+template <>
+void
+gsvd<FloatComplexMatrix>::ggsvd (char& jobu, char& jobv, char& jobq,
+                                 F77_INT m, F77_INT n, F77_INT p,
+                                 F77_INT& k, F77_INT& l,
+                                 FloatComplex *tmp_dataA, F77_INT m1,
+                                 FloatComplex *tmp_dataB, F77_INT p1,
+                                 FloatMatrix& alpha, FloatMatrix& beta,
+                                 FloatComplex *u, F77_INT nrow_u,
+                                 FloatComplex *v, F77_INT nrow_v,
+                                 FloatComplex *q, F77_INT nrow_q,
+                                 FloatComplex *work, F77_INT lwork,
+                                 F77_INT *iwork, F77_INT& info)
+{
+  if (! gsvd_initialized)
+    initialize_gsvd ();
+
+  OCTAVE_LOCAL_BUFFER(float, rwork, 2*n);
+
+  if (have_DGGSVD3)
+    {
+      cggsvd3_type f_ptr = reinterpret_cast<cggsvd3_type> (gsvd_fcn["cg"]);
+      f_ptr (F77_CONST_CHAR_ARG2 (&jobu, 1),
+             F77_CONST_CHAR_ARG2 (&jobv, 1),
+             F77_CONST_CHAR_ARG2 (&jobq, 1),
+             m, n, p, k, l,
+             F77_CMPLX_ARG (tmp_dataA), m1,
+             F77_CMPLX_ARG (tmp_dataB), p1,
+             alpha.fortran_vec (), beta.fortran_vec (),
+             F77_CMPLX_ARG (u), nrow_u,
+             F77_CMPLX_ARG (v), nrow_v,
+             F77_CMPLX_ARG (q), nrow_q,
+             F77_CMPLX_ARG (work), lwork,
+             rwork, iwork, info
+             F77_CHAR_ARG_LEN (1)
+             F77_CHAR_ARG_LEN (1)
+             F77_CHAR_ARG_LEN (1));
+    }
+  else
     {
-      if (! gsvd_initialized)
-        initialize_gsvd ();
+      cggsvd_type f_ptr = reinterpret_cast<cggsvd_type> (gsvd_fcn["cg"]);
+      f_ptr (F77_CONST_CHAR_ARG2 (&jobu, 1),
+             F77_CONST_CHAR_ARG2 (&jobv, 1),
+             F77_CONST_CHAR_ARG2 (&jobq, 1),
+             m, n, p, k, l,
+             F77_CMPLX_ARG (tmp_dataA), m1,
+             F77_CMPLX_ARG (tmp_dataB), p1,
+             alpha.fortran_vec (), beta.fortran_vec (),
+             F77_CMPLX_ARG (u), nrow_u,
+             F77_CMPLX_ARG (v), nrow_v,
+             F77_CMPLX_ARG (q), nrow_q,
+             F77_CMPLX_ARG (work),
+             rwork, iwork, info
+             F77_CHAR_ARG_LEN (1)
+             F77_CHAR_ARG_LEN (1)
+             F77_CHAR_ARG_LEN (1));
+    }
+}
 
-      OCTAVE_LOCAL_BUFFER(double, rwork, 2*n);
+template <typename T>
+T
+gsvd<T>::left_singular_matrix_A (void) const
+{
+  if (m_type == gsvd::Type::sigma_only)
+    (*current_liboctave_error_handler)
+      ("gsvd: U not computed because type == gsvd::sigma_only");
+
+  return m_left_smA;
+}
+
+template <typename T>
+T
+gsvd<T>::left_singular_matrix_B (void) const
+{
+  if (m_type == gsvd::Type::sigma_only)
+    (*current_liboctave_error_handler)
+      ("gsvd: V not computed because type == gsvd::sigma_only");
+
+  return m_left_smB;
+}
+
+template <typename T>
+T
+gsvd<T>::right_singular_matrix (void) const
+{
+  if (m_type == gsvd::Type::sigma_only)
+    (*current_liboctave_error_handler)
+      ("gsvd: X not computed because type == gsvd::sigma_only");
 
-      if (have_DGGSVD3)
-        {
-          zggsvd3_type f_ptr = reinterpret_cast<zggsvd3_type> (gsvd_fcn["zg"]);
-          f_ptr (F77_CONST_CHAR_ARG2 (&jobu, 1),
-                 F77_CONST_CHAR_ARG2 (&jobv, 1),
-                 F77_CONST_CHAR_ARG2 (&jobq, 1),
-                 m, n, p, k, l,
-                 F77_DBLE_CMPLX_ARG (tmp_dataA), m1,
-                 F77_DBLE_CMPLX_ARG (tmp_dataB), p1,
-                 alpha.fortran_vec (), beta.fortran_vec (),
-                 F77_DBLE_CMPLX_ARG (u), nrow_u,
-                 F77_DBLE_CMPLX_ARG (v), nrow_v,
-                 F77_DBLE_CMPLX_ARG (q), nrow_q,
-                 F77_DBLE_CMPLX_ARG (work),
-                 lwork, rwork, iwork, info
-                 F77_CHAR_ARG_LEN (1)
-                 F77_CHAR_ARG_LEN (1)
-                 F77_CHAR_ARG_LEN (1));
-        }
-      else
-        {
-          zggsvd_type f_ptr = reinterpret_cast<zggsvd_type> (gsvd_fcn["zg"]);
-          f_ptr (F77_CONST_CHAR_ARG2 (&jobu, 1),
-                 F77_CONST_CHAR_ARG2 (&jobv, 1),
-                 F77_CONST_CHAR_ARG2 (&jobq, 1),
-                 m, n, p, k, l,
-                 F77_DBLE_CMPLX_ARG (tmp_dataA), m1,
-                 F77_DBLE_CMPLX_ARG (tmp_dataB), p1,
-                 alpha.fortran_vec (), beta.fortran_vec (),
-                 F77_DBLE_CMPLX_ARG (u), nrow_u,
-                 F77_DBLE_CMPLX_ARG (v), nrow_v,
-                 F77_DBLE_CMPLX_ARG (q), nrow_q,
-                 F77_DBLE_CMPLX_ARG (work),
-                 rwork, iwork, info
-                 F77_CHAR_ARG_LEN (1)
-                 F77_CHAR_ARG_LEN (1)
-                 F77_CHAR_ARG_LEN (1));
-        }
+  return m_right_sm;
+}
+
+template <typename T>
+gsvd<T>::gsvd (const T& a, const T& b, gsvd::Type gsvd_type)
+{
+  if (a.isempty () || b.isempty ())
+    (*current_liboctave_error_handler)
+      ("gsvd: A and B cannot be empty matrices");
+
+  F77_INT info;
+
+  F77_INT m = to_f77_int (a.rows ());
+  F77_INT n = to_f77_int (a.cols ());
+  F77_INT p = to_f77_int (b.rows ());
+
+  T atmp = a;
+  P *tmp_dataA = atmp.fortran_vec ();
+
+  T btmp = b;
+  P *tmp_dataB = btmp.fortran_vec ();
+
+  char jobu = 'U';
+  char jobv = 'V';
+  char jobq = 'Q';
+
+  F77_INT nrow_u = m;
+  F77_INT nrow_v = p;
+  F77_INT nrow_q = n;
+
+  F77_INT k, l;
+
+  switch (gsvd_type)
+    {
+    case gsvd<T>::Type::sigma_only:
+
+      // FIXME: In LAPACK 3.0, problem below seems to be fixed,
+      //        so we now set jobX = 'N'.
+      //
+      // For calculating sigma_only, both jobu and jobv should be 'N', but
+      // there seems to be a bug in dgesvd from LAPACK V2.0.  To
+      // demonstrate the bug, set both jobu and jobv to 'N' and find the
+      // singular values of [eye(3), eye(3)].  The result is
+      // [-sqrt(2), -sqrt(2), -sqrt(2)].
+
+      jobu = jobv = jobq = 'N';
+      nrow_u = nrow_v = nrow_q = 1;
+      break;
+
+    default:
+      break;
     }
 
-    template <>
-    void
-    gsvd<FloatComplexMatrix>::ggsvd (char& jobu, char& jobv, char& jobq,
-                                     F77_INT m, F77_INT n, F77_INT p,
-                                     F77_INT& k, F77_INT& l,
-                                     FloatComplex *tmp_dataA, F77_INT m1,
-                                     FloatComplex *tmp_dataB, F77_INT p1,
-                                     FloatMatrix& alpha, FloatMatrix& beta,
-                                     FloatComplex *u, F77_INT nrow_u,
-                                     FloatComplex *v, F77_INT nrow_v,
-                                     FloatComplex *q, F77_INT nrow_q,
-                                     FloatComplex *work, F77_INT lwork,
-                                     F77_INT *iwork, F77_INT& info)
-    {
-      if (! gsvd_initialized)
-        initialize_gsvd ();
+  m_type = gsvd_type;
 
-      OCTAVE_LOCAL_BUFFER(float, rwork, 2*n);
+  if (jobu != 'N')
+    m_left_smA.resize (nrow_u, m);
+
+  P *u = m_left_smA.fortran_vec ();
 
-      if (have_DGGSVD3)
-        {
-          cggsvd3_type f_ptr = reinterpret_cast<cggsvd3_type> (gsvd_fcn["cg"]);
-          f_ptr (F77_CONST_CHAR_ARG2 (&jobu, 1),
-                 F77_CONST_CHAR_ARG2 (&jobv, 1),
-                 F77_CONST_CHAR_ARG2 (&jobq, 1),
-                 m, n, p, k, l,
-                 F77_CMPLX_ARG (tmp_dataA), m1,
-                 F77_CMPLX_ARG (tmp_dataB), p1,
-                 alpha.fortran_vec (), beta.fortran_vec (),
-                 F77_CMPLX_ARG (u), nrow_u,
-                 F77_CMPLX_ARG (v), nrow_v,
-                 F77_CMPLX_ARG (q), nrow_q,
-                 F77_CMPLX_ARG (work), lwork,
-                 rwork, iwork, info
-                 F77_CHAR_ARG_LEN (1)
-                 F77_CHAR_ARG_LEN (1)
-                 F77_CHAR_ARG_LEN (1));
-        }
-      else
-        {
-          cggsvd_type f_ptr = reinterpret_cast<cggsvd_type> (gsvd_fcn["cg"]);
-          f_ptr (F77_CONST_CHAR_ARG2 (&jobu, 1),
-                 F77_CONST_CHAR_ARG2 (&jobv, 1),
-                 F77_CONST_CHAR_ARG2 (&jobq, 1),
-                 m, n, p, k, l,
-                 F77_CMPLX_ARG (tmp_dataA), m1,
-                 F77_CMPLX_ARG (tmp_dataB), p1,
-                 alpha.fortran_vec (), beta.fortran_vec (),
-                 F77_CMPLX_ARG (u), nrow_u,
-                 F77_CMPLX_ARG (v), nrow_v,
-                 F77_CMPLX_ARG (q), nrow_q,
-                 F77_CMPLX_ARG (work),
-                 rwork, iwork, info
-                 F77_CHAR_ARG_LEN (1)
-                 F77_CHAR_ARG_LEN (1)
-                 F77_CHAR_ARG_LEN (1));
-        }
-    }
+  if (jobv != 'N')
+    m_left_smB.resize (nrow_v, p);
 
-    template <typename T>
-    T
-    gsvd<T>::left_singular_matrix_A (void) const
-    {
-      if (m_type == gsvd::Type::sigma_only)
-        (*current_liboctave_error_handler)
-          ("gsvd: U not computed because type == gsvd::sigma_only");
-
-      return m_left_smA;
-    }
+  P *v = m_left_smB.fortran_vec ();
 
-    template <typename T>
-    T
-    gsvd<T>::left_singular_matrix_B (void) const
-    {
-      if (m_type == gsvd::Type::sigma_only)
-        (*current_liboctave_error_handler)
-          ("gsvd: V not computed because type == gsvd::sigma_only");
-
-      return m_left_smB;
-    }
-
-    template <typename T>
-    T
-    gsvd<T>::right_singular_matrix (void) const
-    {
-      if (m_type == gsvd::Type::sigma_only)
-        (*current_liboctave_error_handler)
-          ("gsvd: X not computed because type == gsvd::sigma_only");
-
-      return m_right_sm;
-    }
+  if (jobq != 'N')
+    m_right_sm.resize (nrow_q, n);
 
-    template <typename T>
-    gsvd<T>::gsvd (const T& a, const T& b, gsvd::Type gsvd_type)
-    {
-      if (a.isempty () || b.isempty ())
-        (*current_liboctave_error_handler)
-          ("gsvd: A and B cannot be empty matrices");
-
-      F77_INT info;
-
-      F77_INT m = to_f77_int (a.rows ());
-      F77_INT n = to_f77_int (a.cols ());
-      F77_INT p = to_f77_int (b.rows ());
-
-      T atmp = a;
-      P *tmp_dataA = atmp.fortran_vec ();
-
-      T btmp = b;
-      P *tmp_dataB = btmp.fortran_vec ();
-
-      char jobu = 'U';
-      char jobv = 'V';
-      char jobq = 'Q';
+  P *q = m_right_sm.fortran_vec ();
 
-      F77_INT nrow_u = m;
-      F77_INT nrow_v = p;
-      F77_INT nrow_q = n;
-
-      F77_INT k, l;
-
-      switch (gsvd_type)
-        {
-        case gsvd<T>::Type::sigma_only:
+  real_matrix alpha (n, 1);
+  real_matrix beta (n, 1);
 
-          // FIXME: In LAPACK 3.0, problem below seems to be fixed,
-          //        so we now set jobX = 'N'.
-          //
-          // For calculating sigma_only, both jobu and jobv should be 'N', but
-          // there seems to be a bug in dgesvd from LAPACK V2.0.  To
-          // demonstrate the bug, set both jobu and jobv to 'N' and find the
-          // singular values of [eye(3), eye(3)].  The result is
-          // [-sqrt(2), -sqrt(2), -sqrt(2)].
-
-          jobu = jobv = jobq = 'N';
-          nrow_u = nrow_v = nrow_q = 1;
-          break;
+  OCTAVE_LOCAL_BUFFER(F77_INT, iwork, n);
 
-        default:
-          break;
-        }
-
-      m_type = gsvd_type;
-
-      if (jobu != 'N')
-        m_left_smA.resize (nrow_u, m);
-
-      P *u = m_left_smA.fortran_vec ();
-
-      if (jobv != 'N')
-        m_left_smB.resize (nrow_v, p);
-
-      P *v = m_left_smB.fortran_vec ();
-
-      if (jobq != 'N')
-        m_right_sm.resize (nrow_q, n);
-
-      P *q = m_right_sm.fortran_vec ();
-
-      real_matrix alpha (n, 1);
-      real_matrix beta (n, 1);
+  if (! gsvd_initialized)
+    initialize_gsvd ();
 
-      OCTAVE_LOCAL_BUFFER(F77_INT, iwork, n);
-
-      if (! gsvd_initialized)
-        initialize_gsvd ();
-
-      F77_INT lwork;
-      if (have_DGGSVD3)
-        {
-          lwork = -1;
-          P work_tmp;
-
-          gsvd<T>::ggsvd (jobu, jobv, jobq, m, n, p, k, l,
-                          tmp_dataA, m, tmp_dataB, p,
-                          alpha, beta, u, nrow_u, v, nrow_v, q, nrow_q,
-                          &work_tmp, lwork, iwork, info);
-
-          lwork = static_cast<F77_INT> (std::abs (work_tmp));
-        }
-      else
-        {
-          lwork = std::max ({3*n, m, p}) + n;
-        }
-      info = 0;
-
-      OCTAVE_LOCAL_BUFFER(P, work, lwork);
+  F77_INT lwork;
+  if (have_DGGSVD3)
+    {
+      lwork = -1;
+      P work_tmp;
 
       gsvd<T>::ggsvd (jobu, jobv, jobq, m, n, p, k, l,
                       tmp_dataA, m, tmp_dataB, p,
                       alpha, beta, u, nrow_u, v, nrow_v, q, nrow_q,
-                      work, lwork, iwork, info);
+                      &work_tmp, lwork, iwork, info);
 
-      if (info < 0)
-        (*current_liboctave_error_handler)
-          ("*ggsvd.f: argument %" OCTAVE_F77_INT_TYPE_FORMAT " illegal",
-           -info);
+      lwork = static_cast<F77_INT> (std::abs (work_tmp));
+    }
+  else
+    {
+      lwork = std::max ({3*n, m, p}) + n;
+    }
+  info = 0;
+
+  OCTAVE_LOCAL_BUFFER(P, work, lwork);
+
+  gsvd<T>::ggsvd (jobu, jobv, jobq, m, n, p, k, l,
+                  tmp_dataA, m, tmp_dataB, p,
+                  alpha, beta, u, nrow_u, v, nrow_v, q, nrow_q,
+                  work, lwork, iwork, info);
 
-      if (info > 0)
-        (*current_liboctave_error_handler)
-          ("*ggsvd.f: Jacobi-type procedure failed to converge");
+  if (info < 0)
+    (*current_liboctave_error_handler)
+      ("*ggsvd.f: argument %" OCTAVE_F77_INT_TYPE_FORMAT " illegal",
+       -info);
+
+  if (info > 0)
+    (*current_liboctave_error_handler)
+      ("*ggsvd.f: Jacobi-type procedure failed to converge");
 
-      F77_INT i, j;
+  F77_INT i, j;
 
-      if (gsvd_type != gsvd<T>::Type::sigma_only)
+  if (gsvd_type != gsvd<T>::Type::sigma_only)
+    {
+      // Size according to LAPACK is k+l,k+l, but this needs
+      // to be nxn for Matlab compatibility.
+      T R (n, n, 0.0);
+      int astart = n-k-l;
+      if (m - k - l >= 0)
         {
-          // Size according to LAPACK is k+l,k+l, but this needs
-          // to be nxn for Matlab compatibility.
-          T R (n, n, 0.0);
-          int astart = n-k-l;
-          if (m - k - l >= 0)
-            {
-              // R is stored in A(1:K+L,N-K-L+1:N)
-              for (i = 0; i < k+l; i++)
-                for (j = 0; j < k+l; j++)
-                  R.xelem (i, j) = atmp.xelem (i, astart + j);
-            }
-          else
-            {
-              // (R11 R12 R13 ) is stored in A(1:M, N-K-L+1:N)
-              // ( 0  R22 R23 )
-              for (i = 0; i < m; i++)
-                for (j = 0; j < k+l; j++)
-                  R.xelem (i, j) = atmp.xelem (i, astart + j);
-              // and R33 is stored in B(M-K+1:L,N+M-K-L+1:N)
-              for (i = m; i < k + l; i++)
-                for (j = n - l - k + m; j < n; j++)
-                  R.xelem (i, j) = btmp.xelem (i - k, j);
-            }
-
-          // Output X = Q*R'
-          // FIXME: Is there a way to call BLAS multiply directly
-          //        with flags so that R is transposed?
-          m_right_sm = m_right_sm * R.hermitian ();
-        }
-
-      // Fill in C and S
-      F77_INT rank;
-      bool fill_ptn;
-      if (m-k-l >= 0)
-        {
-          rank = l;
-          fill_ptn = true;
+          // R is stored in A(1:K+L,N-K-L+1:N)
+          for (i = 0; i < k+l; i++)
+            for (j = 0; j < k+l; j++)
+              R.xelem (i, j) = atmp.xelem (i, astart + j);
         }
       else
         {
-          rank = m-k;
-          fill_ptn = false;
+          // (R11 R12 R13 ) is stored in A(1:M, N-K-L+1:N)
+          // ( 0  R22 R23 )
+          for (i = 0; i < m; i++)
+            for (j = 0; j < k+l; j++)
+              R.xelem (i, j) = atmp.xelem (i, astart + j);
+          // and R33 is stored in B(M-K+1:L,N+M-K-L+1:N)
+          for (i = m; i < k + l; i++)
+            for (j = n - l - k + m; j < n; j++)
+              R.xelem (i, j) = btmp.xelem (i - k, j);
         }
 
-      if (gsvd_type == gsvd<T>::Type::sigma_only)
+      // Output X = Q*R'
+      // FIXME: Is there a way to call BLAS multiply directly
+      //        with flags so that R is transposed?
+      m_right_sm = m_right_sm * R.hermitian ();
+    }
+
+  // Fill in C and S
+  F77_INT rank;
+  bool fill_ptn;
+  if (m-k-l >= 0)
+    {
+      rank = l;
+      fill_ptn = true;
+    }
+  else
+    {
+      rank = m-k;
+      fill_ptn = false;
+    }
+
+  if (gsvd_type == gsvd<T>::Type::sigma_only)
+    {
+      // Return column vector with results
+      m_sigmaA.resize (k+l, 1);
+      m_sigmaB.resize (k+l, 1);
+
+      if (fill_ptn)
         {
-          // Return column vector with results
-          m_sigmaA.resize (k+l, 1);
-          m_sigmaB.resize (k+l, 1);
-
-          if (fill_ptn)
+          for (i = 0; i < k; i++)
             {
-              for (i = 0; i < k; i++)
-                {
-                  m_sigmaA.xelem (i) = 1.0;
-                  m_sigmaB.xelem (i) = 0.0;
-                }
-              for (i = k, j = k+l-1; i < k+l; i++, j--)
-                {
-                  m_sigmaA.xelem (i) = alpha.xelem (i);
-                  m_sigmaB.xelem (i) = beta.xelem (i);
-                }
+              m_sigmaA.xelem (i) = 1.0;
+              m_sigmaB.xelem (i) = 0.0;
             }
-          else
+          for (i = k, j = k+l-1; i < k+l; i++, j--)
             {
-              for (i = 0; i < k; i++)
-                {
-                  m_sigmaA.xelem (i) = 1.0;
-                  m_sigmaB.xelem (i) = 0.0;
-                }
-              for (i = k; i < m; i++)
-                {
-                  m_sigmaA.xelem (i) = alpha.xelem (i);
-                  m_sigmaB.xelem (i) = beta.xelem (i);
-                }
-              for (i = m; i < k+l; i++)
-                {
-                  m_sigmaA.xelem (i) = 0.0;
-                  m_sigmaB.xelem (i) = 1.0;
-                }
+              m_sigmaA.xelem (i) = alpha.xelem (i);
+              m_sigmaB.xelem (i) = beta.xelem (i);
             }
         }
-      else  // returning all matrices
+      else
         {
-          // Number of columns according to LAPACK is k+l, but this needs
-          // to be n for Matlab compatibility.
-          m_sigmaA.resize (m, n);
-          m_sigmaB.resize (p, n);
-
           for (i = 0; i < k; i++)
-            m_sigmaA.xelem (i, i) = 1.0;
-
-          for (i = 0; i < rank; i++)
             {
-              m_sigmaA.xelem (k+i, k+i) = alpha.xelem (k+i);
-              m_sigmaB.xelem (i, k+i) = beta.xelem (k+i);
+              m_sigmaA.xelem (i) = 1.0;
+              m_sigmaB.xelem (i) = 0.0;
             }
-
-          if (! fill_ptn)
+          for (i = k; i < m; i++)
             {
-              for (i = m; i < n; i++)
-                m_sigmaB.xelem (i-k, i) = 1.0;
+              m_sigmaA.xelem (i) = alpha.xelem (i);
+              m_sigmaB.xelem (i) = beta.xelem (i);
             }
-
+          for (i = m; i < k+l; i++)
+            {
+              m_sigmaA.xelem (i) = 0.0;
+              m_sigmaB.xelem (i) = 1.0;
+            }
         }
     }
+  else  // returning all matrices
+    {
+      // Number of columns according to LAPACK is k+l, but this needs
+      // to be n for Matlab compatibility.
+      m_sigmaA.resize (m, n);
+      m_sigmaB.resize (p, n);
 
-    // Instantiations needed in octave::math namespace.
-    template class gsvd<Matrix>;
-    template class gsvd<FloatMatrix>;
-    template class gsvd<ComplexMatrix>;
-    template class gsvd<FloatComplexMatrix>;
+      for (i = 0; i < k; i++)
+        m_sigmaA.xelem (i, i) = 1.0;
+
+      for (i = 0; i < rank; i++)
+        {
+          m_sigmaA.xelem (k+i, k+i) = alpha.xelem (k+i);
+          m_sigmaB.xelem (i, k+i) = beta.xelem (k+i);
+        }
+
+      if (! fill_ptn)
+        {
+          for (i = m; i < n; i++)
+            m_sigmaB.xelem (i-k, i) = 1.0;
+        }
+
+    }
+}
+
+// Instantiations needed in octave::math namespace.
+template class gsvd<Matrix>;
+template class gsvd<FloatMatrix>;
+template class gsvd<ComplexMatrix>;
+template class gsvd<FloatComplexMatrix>;
 
 OCTAVE_END_NAMESPACE(math)
 OCTAVE_END_NAMESPACE(octave)