[sdpb] 163/233: Fixed compile warnings in Rgemm. Updated Readme installation instructions.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository sdpb.

commit 569f9d49f42664a64fa715d4238206f9e2fd5f11
Author: David Simmons-Duffin <davidsd at gmail.com>
Date:   Tue Mar 10 12:51:09 2015 -0400

    Fixed compile warnings in Rgemm. Updated Readme installation instructions.
---
 Readme.md                   | 31 ++++++++++++++++++++++---------
 src/mpack/Rgemm.cpp         |  6 +++---
 src/mpack/RgemmParallel.cpp |  6 +++---
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/Readme.md b/Readme.md
index c527580..f386be7 100644
--- a/Readme.md
+++ b/Readme.md
@@ -25,14 +25,20 @@ SDPB requires
 
 - [The GNU Multiprecision Library](https://gmplib.org/).
 
-To install, you must first edit the `Makefile` to define the variables
-`GMPINCLUDEDIR`, `BOOSTINCLUDEDIR`, and `LIBDIR.` Then type `make` to
-build the `sdpb` executable.
+System-specific installation instructions are below.  Please use the
+issue tracker if you encounter installation problems. For those with
+experience packaging software, I'd appreciate help making SDPB easier
+to install.
 
-SDPB has been tested on Red Hat Linux. Mac OS X installation instructions are below. Tips for Windows installation can be found [on the issue tracker](https://github.com/davidsd/sdpb/issues/1).
-Please use the issue tracker if you encounter
-installation problems. For those with experience packaging software,
-I'd appreciate help making SDPB easier to install.
+### Linux Installation
+
+SDPB has been tested on Red Hat Linux. To install,
+
+1. Download Boost and GMP from the links above and build/install them.
+
+2. Edit the `Makefile` to define the variables `GMPINCLUDEDIR`,
+`BOOSTINCLUDEDIR`, and `LIBDIR.` Then type `make` to build the `sdpb`
+executable.
 
 ### Mac OS X Installation
 
@@ -67,8 +73,15 @@ The following instructions have been tested on Mac OS 10.10 Yosemite.  (Many tha
         ./b2
         sudo ./b2 install
         
-5. Modify the SDPB Makefile by replacing all instances of `/home/dsd`
-with `/usr/local`.  SDPB should now compile successfully.
+5. SDPB should now compile successfully. If you installed any of the
+above software in custom locations, you must modify variables in the
+`Makefile` as described in the Linux instructions.
+
+### Windows Installation
+
+Tips for Windows installation can be
+found [on the issue tracker](https://github.com/davidsd/sdpb/issues/1).
+I would appreciate if someone could send step-by-step instructions.
 
 ## Usage
 
diff --git a/src/mpack/Rgemm.cpp b/src/mpack/Rgemm.cpp
index 4742419..9b0223f 100644
--- a/src/mpack/Rgemm.cpp
+++ b/src/mpack/Rgemm.cpp
@@ -82,7 +82,7 @@ an m by k matrix, op(B) a k by n matrix and C an m by n matrix.
 void Rgemm(const char *transa, const char *transb, INTEGER m, INTEGER n, INTEGER k, REAL alpha, REAL * A, INTEGER lda, REAL * B,
 	   INTEGER ldb, REAL beta, REAL * C, INTEGER ldc)
 {
-    INTEGER i, j, l, nota, notb, nrowa, ncola, nrowb, info;
+    INTEGER i, j, l, nota, notb, nrowa, nrowb, info;
     REAL temp;
     REAL Zero = 0.0, One = 1.0;
 
@@ -90,10 +90,10 @@ void Rgemm(const char *transa, const char *transb, INTEGER m, INTEGER n, INTEGER
     notb = Mlsame(transb, "N");
     if (nota) {
 	nrowa = m;
-	ncola = k;
+	// ncola = k;
     } else {
 	nrowa = k;
-	ncola = m;
+	// ncola = m;
     }
     if (notb) {
 	nrowb = k;
diff --git a/src/mpack/RgemmParallel.cpp b/src/mpack/RgemmParallel.cpp
index e760170..e9b147b 100644
--- a/src/mpack/RgemmParallel.cpp
+++ b/src/mpack/RgemmParallel.cpp
@@ -85,17 +85,17 @@ an m by k matrix, op(B) a k by n matrix and C an m by n matrix.
 void RgemmParallel(const char *transa, const char *transb, INTEGER m, INTEGER n, INTEGER k, REAL alpha, REAL * A, INTEGER lda, REAL * B,
 	   INTEGER ldb, REAL beta, REAL * C, INTEGER ldc)
 {
-    INTEGER nota, notb, nrowa, ncola, nrowb, info;
+    INTEGER nota, notb, nrowa, nrowb, info;
     REAL Zero = 0.0, One = 1.0;
 
     nota = Mlsame(transa, "N");
     notb = Mlsame(transb, "N");
     if (nota) {
 	nrowa = m;
-	ncola = k;
+	// ncola = k;
     } else {
 	nrowa = k;
-	ncola = m;
+	// ncola = m;
     }
     if (notb) {
 	nrowb = k;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sdpb.git