The package rpms/jblas.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/jblas.git/commit/?id=746e2ae40e63b87....
Change: -%ifarch ppc64
Thanks.
Full change: ============
commit 746e2ae40e63b877ad89df96c3ea7bedc30392bc Author: Miro Hrončok miro@hroncok.cz Date: Mon Jan 4 10:27:54 2021 +0100
Orphaned for 6+ weeks
diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 37c9bcd..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/jblas-1.2.3.tar.gz -/jblas-1.2.4.tar.gz diff --git a/0001-Try-to-load-libraries-directly-on-Linux.patch b/0001-Try-to-load-libraries-directly-on-Linux.patch deleted file mode 100644 index a93ecba..0000000 --- a/0001-Try-to-load-libraries-directly-on-Linux.patch +++ /dev/null @@ -1,70 +0,0 @@ -From b606be256ff7e555f24185c110ddbcbef7fcb344 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= zbyszek@in.waw.pl -Date: Tue, 30 Jul 2013 14:59:00 -0400 -Subject: [PATCH] Try to load libraries directly on Linux - -Fedora Packaging Guidelines for Java require the use of -System.load() instead of System.loadLibrary(). Also, the -name of the library is fixed. So the whole process of -guessing the architecture and path can be sidestepped. - -Actual atlas library that is loaded is determined at runtime, -based what is installed. Thus package dependencies determine -the outcome, and there's no need to check the architecture. - -Unfortunately there doesn't seem to be a way to depend -on any version of the atlas-*-devel headers, so during -build, atlas-devel is required. On installation however, -uninstalling atlas and installing e.g. atlas-sse3 will give -a nice speedup. ---- - .../java/org/jblas/NativeBlasLibraryLoader.java | 25 +++++++++++++++++++++- - 1 file changed, 24 insertions(+), 1 deletion(-) - -diff --git a/src/main/java/org/jblas/NativeBlasLibraryLoader.java b/src/main/java/org/jblas/NativeBlasLibraryLoader.java -index 297becbc89..cdd9378c51 100644 ---- a/src/main/java/org/jblas/NativeBlasLibraryLoader.java -+++ b/src/main/java/org/jblas/NativeBlasLibraryLoader.java -@@ -13,7 +13,31 @@ import org.jblas.util.Logger; - * Date: Oct 24, 2012 - */ - class NativeBlasLibraryLoader { -+ static public boolean tryLoad(String filename) { -+ try { -+ System.load(filename); -+ } catch (Exception e) { -+ return false; -+ } catch (UnsatisfiedLinkError e) { -+ return false; -+ } -+ -+ return true; -+ } -+ - static void loadLibraryAndCheckErrors() { -+ String name = System.getProperty("os.name"); -+ -+ if (name.equals("Linux")) { -+ /* -+ * Check for 64-bit library availability -+ * prior to 32-bit library availability. -+ */ -+ if (tryLoad("/usr/lib64/jblas/libjblas.so") || -+ tryLoad("/usr/lib/jblas/libjblas.so")) -+ return; -+ } -+ - try { - try { - // Try to load it first, probably it's in the path -@@ -38,7 +62,6 @@ class NativeBlasLibraryLoader { - NativeBlas.dgemm('N', 'N', 1, 1, 1, 1.0, a, 0, 1, a, 0, 1, 1.0, a, 0, 1); - } catch (UnsatisfiedLinkError e) { - String arch = System.getProperty("os.arch"); -- String name = System.getProperty("os.name"); - - if (name.startsWith("Windows") && e.getMessage().contains("Can't find dependent libraries")) { - System.err.println("On Windows, you need some additional support libraries.\n" + --- -2.9.0 - diff --git a/0002-Prevent-resource-leak-by-closing-resources-in-load-s.patch b/0002-Prevent-resource-leak-by-closing-resources-in-load-s.patch deleted file mode 100644 index 647cdb3..0000000 --- a/0002-Prevent-resource-leak-by-closing-resources-in-load-s.patch +++ /dev/null @@ -1,245 +0,0 @@ -From 91b12920cc787e38d14d857f1ea73abb4ad281d0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fran=C3=A7ois=20Garillot?= francois@garillot.net -Date: Sat, 20 Jun 2015 23:56:37 +0200 -Subject: [PATCH] Prevent resource leak by closing resources in load/save - -Inner resource (File(Input|Output)Stream) was not closed. This is one place where dropping -source compatibility with 1.5 would help, allowing for try-with-resource. ---- - src/main/java/org/jblas/ComplexDoubleMatrix.java | 18 +++++++-- - src/main/java/org/jblas/ComplexFloatMatrix.java | 18 +++++++-- - src/main/java/org/jblas/DoubleMatrix.java | 50 ++++++++++++++++-------- - src/main/java/org/jblas/FloatMatrix.java | 50 ++++++++++++++++-------- - 4 files changed, 96 insertions(+), 40 deletions(-) - -diff --git a/src/main/java/org/jblas/ComplexDoubleMatrix.java b/src/main/java/org/jblas/ComplexDoubleMatrix.java -index 08160255a6..feb3fb4e8a 100644 ---- a/src/main/java/org/jblas/ComplexDoubleMatrix.java -+++ b/src/main/java/org/jblas/ComplexDoubleMatrix.java -@@ -1470,8 +1470,14 @@ public class ComplexDoubleMatrix { - * @throws IOException thrown on errors while writing the matrix to the file - */ - public void save(String filename) throws IOException { -- DataOutputStream dos = new DataOutputStream(new FileOutputStream(filename, false)); -- this.out(dos); -+ FileOutputStream fos = new FileOutputStream(filename, false); -+ DataOutputStream dos = new DataOutputStream(fos); -+ try { -+ this.out(dos); -+ } finally { -+ dos.close(); -+ fos.close(); -+ } - } - - /** -@@ -1481,8 +1487,14 @@ public class ComplexDoubleMatrix { - * @throws IOException thrown on errors while reading the matrix - */ - public void load(String filename) throws IOException { -- DataInputStream dis = new DataInputStream(new FileInputStream(filename)); -+ FileInputStream fis = new FileInputStream(filename); -+ DataInputStream dis = new DataInputStream(fis); -+ try { - this.in(dis); -+ } finally { -+ dis.close(); -+ fis.close(); -+ } - } - - /**************************************************************** -diff --git a/src/main/java/org/jblas/ComplexFloatMatrix.java b/src/main/java/org/jblas/ComplexFloatMatrix.java -index 9c4edf5eab..72de09f030 100644 ---- a/src/main/java/org/jblas/ComplexFloatMatrix.java -+++ b/src/main/java/org/jblas/ComplexFloatMatrix.java -@@ -1470,8 +1470,14 @@ public class ComplexFloatMatrix { - * @throws IOException thrown on errors while writing the matrix to the file - */ - public void save(String filename) throws IOException { -- DataOutputStream dos = new DataOutputStream(new FileOutputStream(filename, false)); -- this.out(dos); -+ FileOutputStream fos = new FileOutputStream(filename, false); -+ DataOutputStream dos = new DataOutputStream(fos); -+ try { -+ this.out(dos); -+ } finally { -+ dos.close(); -+ fos.close(); -+ } - } - - /** -@@ -1481,8 +1487,14 @@ public class ComplexFloatMatrix { - * @throws IOException thrown on errors while reading the matrix - */ - public void load(String filename) throws IOException { -- DataInputStream dis = new DataInputStream(new FileInputStream(filename)); -+ FileInputStream fis = new FileInputStream(filename); -+ DataInputStream dis = new DataInputStream(fis); -+ try { - this.in(dis); -+ } finally { -+ dis.close(); -+ fis.close(); -+ } - } - - /**************************************************************** -diff --git a/src/main/java/org/jblas/DoubleMatrix.java b/src/main/java/org/jblas/DoubleMatrix.java -index 6e153031e4..0573dc9aa9 100644 ---- a/src/main/java/org/jblas/DoubleMatrix.java -+++ b/src/main/java/org/jblas/DoubleMatrix.java -@@ -2760,9 +2760,14 @@ public class DoubleMatrix implements Serializable { - * @throws IOException thrown on errors while writing the matrix to the file - */ - public void save(String filename) throws IOException { -- DataOutputStream dos = new DataOutputStream(new FileOutputStream(filename, false)); -- this.out(dos); -- dos.close(); -+ FileOutputStream fos = new FileOutputStream(filename, false); -+ DataOutputStream dos = new DataOutputStream(fos); -+ try { -+ this.out(dos); -+ } finally { -+ dos.close(); -+ fos.close(); -+ } - } - - /** -@@ -2772,9 +2777,15 @@ public class DoubleMatrix implements Serializable { - * @throws IOException thrown on errors while reading the matrix - */ - public void load(String filename) throws IOException { -- DataInputStream dis = new DataInputStream(new FileInputStream(filename)); -- this.in(dis); -- dis.close(); -+ FileInputStream fis = new FileInputStream(filename); -+ DataInputStream dis = new DataInputStream(fis); -+ try { -+ this.in(dis); -+ } -+ finally { -+ dis.close(); -+ fis.close(); -+ } - } - - public static DoubleMatrix loadAsciiFile(String filename) throws IOException { -@@ -2808,19 +2819,24 @@ public class DoubleMatrix implements Serializable { - } - is.close(); - -- // Go through file a second time process the actual data. -- is = new BufferedReader(new InputStreamReader(new FileInputStream(filename))); -- DoubleMatrix result = new DoubleMatrix(rows, columns); -- int r = 0; -- while ((line = is.readLine()) != null) { -- String[] elements = WHITESPACES.split(line); -- int firstElement = (elements[0].length() == 0) ? 1 : 0; -- for (int c = 0, cc = firstElement; c < columns; c++, cc++) { -- result.put(r, c, Double.valueOf(elements[cc])); -+ FileInputStream fis = new FileInputStream(filename); -+ try { -+ // Go through file a second time process the actual data. -+ is = new BufferedReader(new InputStreamReader(fis)); -+ DoubleMatrix result = new DoubleMatrix(rows, columns); -+ int r = 0; -+ while ((line = is.readLine()) != null) { -+ String[] elements = WHITESPACES.split(line); -+ int firstElement = (elements[0].length() == 0) ? 1 : 0; -+ for (int c = 0, cc = firstElement; c < columns; c++, cc++) { -+ result.put(r, c, Double.valueOf(elements[cc])); -+ } -+ r++; - } -- r++; -+ return result; -+ } finally { -+ fis.close(); - } -- return result; - } - - public static DoubleMatrix loadCSVFile(String filename) throws IOException { -diff --git a/src/main/java/org/jblas/FloatMatrix.java b/src/main/java/org/jblas/FloatMatrix.java -index 7c4370c677..a8cb56d24c 100644 ---- a/src/main/java/org/jblas/FloatMatrix.java -+++ b/src/main/java/org/jblas/FloatMatrix.java -@@ -2760,9 +2760,14 @@ public class FloatMatrix implements Serializable { - * @throws IOException thrown on errors while writing the matrix to the file - */ - public void save(String filename) throws IOException { -- DataOutputStream dos = new DataOutputStream(new FileOutputStream(filename, false)); -- this.out(dos); -- dos.close(); -+ FileOutputStream fos = new FileOutputStream(filename, false); -+ DataOutputStream dos = new DataOutputStream(fos); -+ try { -+ this.out(dos); -+ } finally { -+ dos.close(); -+ fos.close(); -+ } - } - - /** -@@ -2772,9 +2777,15 @@ public class FloatMatrix implements Serializable { - * @throws IOException thrown on errors while reading the matrix - */ - public void load(String filename) throws IOException { -- DataInputStream dis = new DataInputStream(new FileInputStream(filename)); -- this.in(dis); -- dis.close(); -+ FileInputStream fis = new FileInputStream(filename); -+ DataInputStream dis = new DataInputStream(fis); -+ try { -+ this.in(dis); -+ } -+ finally { -+ dis.close(); -+ fis.close(); -+ } - } - - public static FloatMatrix loadAsciiFile(String filename) throws IOException { -@@ -2808,19 +2819,24 @@ public class FloatMatrix implements Serializable { - } - is.close(); - -- // Go through file a second time process the actual data. -- is = new BufferedReader(new InputStreamReader(new FileInputStream(filename))); -- FloatMatrix result = new FloatMatrix(rows, columns); -- int r = 0; -- while ((line = is.readLine()) != null) { -- String[] elements = WHITESPACES.split(line); -- int firstElement = (elements[0].length() == 0) ? 1 : 0; -- for (int c = 0, cc = firstElement; c < columns; c++, cc++) { -- result.put(r, c, Float.valueOf(elements[cc])); -+ FileInputStream fis = new FileInputStream(filename); -+ try { -+ // Go through file a second time process the actual data. -+ is = new BufferedReader(new InputStreamReader(fis)); -+ FloatMatrix result = new FloatMatrix(rows, columns); -+ int r = 0; -+ while ((line = is.readLine()) != null) { -+ String[] elements = WHITESPACES.split(line); -+ int firstElement = (elements[0].length() == 0) ? 1 : 0; -+ for (int c = 0, cc = firstElement; c < columns; c++, cc++) { -+ result.put(r, c, Float.valueOf(elements[cc])); -+ } -+ r++; - } -- r++; -+ return result; -+ } finally { -+ fis.close(); - } -- return result; - } - - public static FloatMatrix loadCSVFile(String filename) throws IOException { --- -2.9.0 - diff --git a/0002-build.xml-fix-version.patch b/0002-build.xml-fix-version.patch deleted file mode 100644 index 17ace12..0000000 --- a/0002-build.xml-fix-version.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0a755860ece9cd56e368b0a8826ec53ef55e7005 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= zbyszek@in.waw.pl -Date: Wed, 25 Jan 2017 17:47:21 -0500 -Subject: [PATCH] build.xml: fix version - ---- - build.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/build.xml b/build.xml -index 5598460135..3092333f9d 100644 ---- a/build.xml -+++ b/build.xml -@@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - <!-- Define directories --> - -- <property name="version" value="1.2.3-SNAPSHOT" /> -+ <property name="version" value="1.2.4-SNAPSHOT" /> - <property name="src" value="${basedir}/src/main/java" /> - <property name="test" value="${basedir}/src/test/java" /> - <property name="bin" value="${basedir}/target/classes" /> --- -2.9.0 - diff --git a/0003-javadoc-use-html-entities-unicode-and-fix-formatting.patch b/0003-javadoc-use-html-entities-unicode-and-fix-formatting.patch deleted file mode 100644 index a5b1401..0000000 --- a/0003-javadoc-use-html-entities-unicode-and-fix-formatting.patch +++ /dev/null @@ -1,615 +0,0 @@ -From bf8b43a70f47a253692074d553e0b9f011f0f8e9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= zbyszek@in.waw.pl -Date: Thu, 26 Jan 2017 10:58:19 -0500 -Subject: [PATCH] javadoc: use html entities, unicode and fix formatting to - silence java 8 parser - ---- - src/main/java/org/jblas/ComplexDoubleMatrix.java | 8 ++-- - src/main/java/org/jblas/ComplexFloatMatrix.java | 10 ++-- - src/main/java/org/jblas/DoubleMatrix.java | 16 +++---- - src/main/java/org/jblas/Eigen.java | 6 +-- - src/main/java/org/jblas/FloatMatrix.java | 16 +++---- - src/main/java/org/jblas/JavaBlas.java | 8 ++-- - src/main/java/org/jblas/MatrixFunctions.java | 4 +- - src/main/java/org/jblas/SimpleBlas.java | 54 +++++++++++----------- - src/main/java/org/jblas/Solve.java | 12 ++--- - .../jblas/exceptions/LapackArgumentException.java | 2 +- - .../UnsupportedArchitectureException.java | 4 -- - src/main/java/org/jblas/ranges/IntervalRange.java | 2 +- - src/main/java/org/jblas/util/LibraryLoader.java | 4 +- - 13 files changed, 72 insertions(+), 74 deletions(-) - -diff --git a/src/main/java/org/jblas/ComplexDoubleMatrix.java b/src/main/java/org/jblas/ComplexDoubleMatrix.java -index feb3fb4e8a..e05b545dc4 100644 ---- a/src/main/java/org/jblas/ComplexDoubleMatrix.java -+++ b/src/main/java/org/jblas/ComplexDoubleMatrix.java -@@ -59,8 +59,8 @@ public class ComplexDoubleMatrix { - **************************************************************************/ - - /** -- * Create a new matrix with <i>newRows</i> rows, <i>newColumns</i> columns -- * using <i>newData></i> as the data. -+ * Create a new matrix with <i>newRows</i> rows, <i>newColumns</i> columns -+ * using <i>newData</i> as the data. - */ - public ComplexDoubleMatrix(int newRows, int newColumns, double... newData) { - rows = newRows; -@@ -142,8 +142,8 @@ public class ComplexDoubleMatrix { - * Creates a new <i>n</i> times <i>m</i> <tt>ComplexDoubleMatrix</tt> from - * the given <i>n</i> times <i>m</i> 2D data array. The first dimension of the array makes the - * rows (<i>n</i>) and the second dimension the columns (<i>m</i>). For example, the -- * given code <br/><br/> -- * <code>new ComplexDoubleMatrix(new double[][]{{1d, 2d, 3d}, {4d, 5d, 6d}, {7d, 8d, 9d}}).print();</code><br/><br/> -+ * given code <br><br> -+ * <code>new ComplexDoubleMatrix(new double[][]{{1d, 2d, 3d}, {4d, 5d, 6d}, {7d, 8d, 9d}}).print();</code><br><br> - * will constructs the following matrix: - * <pre> - * 1.0 2.0 3.0 -diff --git a/src/main/java/org/jblas/ComplexFloatMatrix.java b/src/main/java/org/jblas/ComplexFloatMatrix.java -index 72de09f030..845b6afc61 100644 ---- a/src/main/java/org/jblas/ComplexFloatMatrix.java -+++ b/src/main/java/org/jblas/ComplexFloatMatrix.java -@@ -59,8 +59,8 @@ public class ComplexFloatMatrix { - **************************************************************************/ - - /** -- * Create a new matrix with <i>newRows</i> rows, <i>newColumns</i> columns -- * using <i>newData></i> as the data. -+ * Create a new matrix with <i>newRows</i> rows, <i>newColumns</i> columns -+ * using <i>newData</i> as the data. - */ - public ComplexFloatMatrix(int newRows, int newColumns, float... newData) { - rows = newRows; -@@ -142,8 +142,8 @@ public class ComplexFloatMatrix { - * Creates a new <i>n</i> times <i>m</i> <tt>ComplexFloatMatrix</tt> from - * the given <i>n</i> times <i>m</i> 2D data array. The first dimension of the array makes the - * rows (<i>n</i>) and the second dimension the columns (<i>m</i>). For example, the -- * given code <br/><br/> -- * <code>new ComplexFloatMatrix(new float[][]{{1d, 2d, 3d}, {4d, 5d, 6d}, {7d, 8d, 9d}}).print();</code><br/><br/> -+ * given code <br><br> -+ * <code>new ComplexFloatMatrix(new float[][]{{1d, 2d, 3d}, {4d, 5d, 6d}, {7d, 8d, 9d}}).print();</code><br><br> - * will constructs the following matrix: - * <pre> - * 1.0f 2.0f 3.0f -@@ -1473,7 +1473,7 @@ public class ComplexFloatMatrix { - FileOutputStream fos = new FileOutputStream(filename, false); - DataOutputStream dos = new DataOutputStream(fos); - try { -- this.out(dos); -+ this.out(dos); - } finally { - dos.close(); - fos.close(); -diff --git a/src/main/java/org/jblas/DoubleMatrix.java b/src/main/java/org/jblas/DoubleMatrix.java -index 0573dc9aa9..b12677db68 100644 ---- a/src/main/java/org/jblas/DoubleMatrix.java -+++ b/src/main/java/org/jblas/DoubleMatrix.java -@@ -265,7 +265,7 @@ import java.util.regex.Pattern; - * - * <table class="my"> - * <tr><th>Operation <th>Method -- * <tr><td>x & y <td>x.and(y) -+ * <tr><td>x & y <td>x.and(y) - * <tr><td>x | y <td>x.or(y) - * <tr><td>x ^ y <td>x.xor(y) - * <tr><td>! x <td>x.not() -@@ -311,7 +311,7 @@ public class DoubleMatrix implements Serializable { - * - **************************************************************************/ - /** Create a new matrix with <i>newRows</i> rows, <i>newColumns</i> columns -- * using <i>newData></i> as the data. Note that any change to the DoubleMatrix -+ * using <i>newData</i> as the data. Note that any change to the DoubleMatrix - * will change the input array, too. - * - * @param newRows the number of rows of the new matrix -@@ -382,8 +382,8 @@ public class DoubleMatrix implements Serializable { - * is copied and any change to the DoubleMatrix will not change the input array. - * The first dimension of the array makes the - * rows (<i>n</i>) and the second dimension the columns (<i>m</i>). For example, the -- * given code <br/><br/> -- * <code>new DoubleMatrix(new double[][]{{1d, 2d, 3d}, {4d, 5d, 6d}, {7d, 8d, 9d}}).print();</code><br/><br/> -+ * given code <br><br> -+ * <code>new DoubleMatrix(new double[][]{{1d, 2d, 3d}, {4d, 5d, 6d}, {7d, 8d, 9d}}).print();</code><br><br> - * will constructs the following matrix: - * <pre> - * 1.0 2.0 3.0 -@@ -407,7 +407,7 @@ public class DoubleMatrix implements Serializable { - } - - /** -- * Creates a DoubleMatrix column vector from the given List<Double&rt;. -+ * Creates a DoubleMatrix column vector from the given List<Double>. - * - * @param data data from which the entries are taken. - */ -@@ -796,7 +796,7 @@ public class DoubleMatrix implements Serializable { - return result; - } - -- /** Get elements from a column and rows <tt>a/tt> to <tt>b</tt>. */ -+ /** Get elements from a column and rows <tt>a</tt> to <tt>b</tt>. */ - public DoubleMatrix getRowRange(int a, int b, int c) { - DoubleMatrix result = new DoubleMatrix(b - a); - -@@ -1898,7 +1898,7 @@ public class DoubleMatrix implements Serializable { - return dup().isInfinitei(); - } - -- /** Checks whether all entries (i, j) with i >= j are zero. */ -+ /** Checks whether all entries (i, j) with i ≥ j are zero. */ - public boolean isLowerTriangular() { - for (int i = 0; i < rows; i++) - for (int j = i+1; j < columns; j++) { -@@ -1910,7 +1910,7 @@ public class DoubleMatrix implements Serializable { - } - - /** -- * Checks whether all entries (i, j) with i <= j are zero. -+ * Checks whether all entries (i, j) with i ≤ j are zero. - */ - public boolean isUpperTriangular() { - for (int i = 0; i < rows; i++) -diff --git a/src/main/java/org/jblas/Eigen.java b/src/main/java/org/jblas/Eigen.java -index 7a03f83163..2e4156de2a 100644 ---- a/src/main/java/org/jblas/Eigen.java -+++ b/src/main/java/org/jblas/Eigen.java -@@ -45,7 +45,7 @@ import org.jblas.ranges.Range; - - /** - * <p>Eigenvalue and Eigenvector related functions.</p> -- * <p/> -+ * <p> - * <p>Methods exist for working with symmetric matrices or general eigenvalues. - * The symmetric versions are usually much faster on symmetric matrices.</p> - */ -@@ -164,7 +164,7 @@ public class Eigen { - * Computes selected eigenvalues of the real generalized symmetric-definite eigenproblem of the form A x = L B x - * or, equivalently, (A - L B)x = 0. Here A and B are assumed to be symmetric and B is also positive definite. - * The selection is based on the given range of values for the desired eigenvalues. -- * <p/> -+ * <p> - * The range is half open: (vl,vu]. - * - * @param A symmetric Matrix A. Only the upper triangle will be considered. -@@ -423,7 +423,7 @@ public class Eigen { - * Computes selected eigenvalues of the real generalized symmetric-definite eigenproblem of the form A x = L B x - * or, equivalently, (A - L B)x = 0. Here A and B are assumed to be symmetric and B is also positive definite. - * The selection is based on the given range of values for the desired eigenvalues. -- * <p/> -+ * <p> - * The range is half open: (vl,vu]. - * - * @param A symmetric Matrix A. Only the upper triangle will be considered. -diff --git a/src/main/java/org/jblas/FloatMatrix.java b/src/main/java/org/jblas/FloatMatrix.java -index a8cb56d24c..889d72795a 100644 ---- a/src/main/java/org/jblas/FloatMatrix.java -+++ b/src/main/java/org/jblas/FloatMatrix.java -@@ -265,7 +265,7 @@ import java.util.regex.Pattern; - * - * <table class="my"> - * <tr><th>Operation <th>Method -- * <tr><td>x & y <td>x.and(y) -+ * <tr><td>x & y <td>x.and(y) - * <tr><td>x | y <td>x.or(y) - * <tr><td>x ^ y <td>x.xor(y) - * <tr><td>! x <td>x.not() -@@ -311,7 +311,7 @@ public class FloatMatrix implements Serializable { - * - **************************************************************************/ - /** Create a new matrix with <i>newRows</i> rows, <i>newColumns</i> columns -- * using <i>newData></i> as the data. Note that any change to the FloatMatrix -+ * using <i>newData</i> as the data. Note that any change to the FloatMatrix - * will change the input array, too. - * - * @param newRows the number of rows of the new matrix -@@ -382,8 +382,8 @@ public class FloatMatrix implements Serializable { - * is copied and any change to the FloatMatrix will not change the input array. - * The first dimension of the array makes the - * rows (<i>n</i>) and the second dimension the columns (<i>m</i>). For example, the -- * given code <br/><br/> -- * <code>new FloatMatrix(new float[][]{{1d, 2d, 3d}, {4d, 5d, 6d}, {7d, 8d, 9d}}).print();</code><br/><br/> -+ * given code <br><br> -+ * <code>new FloatMatrix(new float[][]{{1d, 2d, 3d}, {4d, 5d, 6d}, {7d, 8d, 9d}}).print();</code><br><br> - * will constructs the following matrix: - * <pre> - * 1.0f 2.0f 3.0f -@@ -407,7 +407,7 @@ public class FloatMatrix implements Serializable { - } - - /** -- * Creates a FloatMatrix column vector from the given List<Double&rt;. -+ * Creates a FloatMatrix column vector from the given List<Double>. - * - * @param data data from which the entries are taken. - */ -@@ -796,7 +796,7 @@ public class FloatMatrix implements Serializable { - return result; - } - -- /** Get elements from a column and rows <tt>a/tt> to <tt>b</tt>. */ -+ /** Get elements from a column and rows <tt>a</tt> to <tt>b</tt>. */ - public FloatMatrix getRowRange(int a, int b, int c) { - FloatMatrix result = new FloatMatrix(b - a); - -@@ -1898,7 +1898,7 @@ public class FloatMatrix implements Serializable { - return dup().isInfinitei(); - } - -- /** Checks whether all entries (i, j) with i >= j are zero. */ -+ /** Checks whether all entries (i, j) with i ≥ j are zero. */ - public boolean isLowerTriangular() { - for (int i = 0; i < rows; i++) - for (int j = i+1; j < columns; j++) { -@@ -1910,7 +1910,7 @@ public class FloatMatrix implements Serializable { - } - - /** -- * Checks whether all entries (i, j) with i <= j are zero. -+ * Checks whether all entries (i, j) with i ≤ j are zero. - */ - public boolean isUpperTriangular() { - for (int i = 0; i < rows; i++) -diff --git a/src/main/java/org/jblas/JavaBlas.java b/src/main/java/org/jblas/JavaBlas.java -index e240799635..16c09c4c8c 100644 ---- a/src/main/java/org/jblas/JavaBlas.java -+++ b/src/main/java/org/jblas/JavaBlas.java -@@ -92,7 +92,7 @@ public class JavaBlas { - } - } - -- /** Compute dy <- da * dx + dy. */ -+ /** Compute dy ← da * dx + dy. */ - public static void raxpy(int n, double da, double[] dx, int dxIdx, int incx, double[] dy, int dyIdx, int incy) { - if (dxIdx < 0 || dxIdx + (n - 1) * incx >= dx.length) { - throw new LapackException("Java.raxpy", "Parameters for x aren't valid! (n = " + n + ", dx.length = " + dx.length + ", dxIdx = " + dxIdx + ", incx = " + incx + ")"); -@@ -125,7 +125,7 @@ public class JavaBlas { - } - } - -- /** Computes dz <- dx + dy */ -+ /** Computes dz ← dx + dy */ - public static void rzaxpy(int n, double[] dz, int dzIdx, int incz, double da, double[] dx, int dxIdx, int incx, double[] dy, int dyIdx, int incy) { - if (dxIdx == 0 && incx == 1 && dyIdx == 0 && incy == 1 && dzIdx == 0 && incz == 1) { - if (da == 1.0) { -@@ -207,7 +207,7 @@ public class JavaBlas { - } - } - -- /** Compute dy <- da * dx + dy. */ -+ /** Compute dy ← da * dx + dy. */ - public static void raxpy(int n, float da, float[] dx, int dxIdx, int incx, float[] dy, int dyIdx, int incy) { - if (dxIdx < 0 || dxIdx + (n - 1) * incx >= dx.length) { - throw new LapackException("Java.raxpy", "Parameters for x aren't valid! (n = " + n + ", dx.length = " + dx.length + ", dxIdx = " + dxIdx + ", incx = " + incx + ")"); -@@ -240,7 +240,7 @@ public class JavaBlas { - } - } - -- /** Computes dz <- dx + dy */ -+ /** Computes dz ← dx + dy */ - public static void rzaxpy(int n, float[] dz, int dzIdx, int incz, float da, float[] dx, int dxIdx, int incx, float[] dy, int dyIdx, int incy) { - if (dxIdx == 0 && incx == 1 && dyIdx == 0 && incy == 1 && dzIdx == 0 && incz == 1) { - if (da == 1.0f) { -diff --git a/src/main/java/org/jblas/MatrixFunctions.java b/src/main/java/org/jblas/MatrixFunctions.java -index 80277929b8..efd578b83d 100644 ---- a/src/main/java/org/jblas/MatrixFunctions.java -+++ b/src/main/java/org/jblas/MatrixFunctions.java -@@ -396,7 +396,7 @@ public class MatrixFunctions { - * Calculate matrix exponential of a square matrix. - * - * A scaled Pade approximation algorithm is used. -- * The algorithm has been directly translated from Golub & Van Loan "Matrix Computations", -+ * The algorithm has been directly translated from Golub & Van Loan "Matrix Computations", - * algorithm 11.3.1. Special Horner techniques from 11.2 are also used to minimize the number - * of matrix multiplications. - * -@@ -827,7 +827,7 @@ public class MatrixFunctions { - * Calculate matrix exponential of a square matrix. - * - * A scaled Pade approximation algorithm is used. -- * The algorithm has been directly translated from Golub & Van Loan "Matrix Computations", -+ * The algorithm has been directly translated from Golub & Van Loan "Matrix Computations", - * algorithm 11.3f.1. Special Horner techniques from 11.2f are also used to minimize the number - * of matrix multiplications. - * -diff --git a/src/main/java/org/jblas/SimpleBlas.java b/src/main/java/org/jblas/SimpleBlas.java -index 3240b4a6c6..6b8b0272ae 100644 ---- a/src/main/java/org/jblas/SimpleBlas.java -+++ b/src/main/java/org/jblas/SimpleBlas.java -@@ -46,10 +46,10 @@ import static org.jblas.util.Functions.*; - /** - * This class provides a cleaner direct interface to the BLAS routines by - * extracting the parameters of the matrices from the matrices itself. -- * <p/> -+ * <p> - * For example, you can just pass the vector and do not have to pass the length, - * corresponding DoubleBuffer, offset and step size explicitly. -- * <p/> -+ * <p> - * Currently, all the general matrix routines are implemented. - */ - public class SimpleBlas { -@@ -58,7 +58,7 @@ public class SimpleBlas { - */ - - /** -- * Compute x <-> y (swap two matrices) -+ * Compute x ↔ y (swap two matrices) - */ - public static DoubleMatrix swap(DoubleMatrix x, DoubleMatrix y) { - //NativeBlas.dswap(x.length, x.data, 0, 1, y.data, 0, 1); -@@ -67,7 +67,7 @@ public class SimpleBlas { - } - - /** -- * Compute x <- alpha * x (scale a matrix) -+ * Compute x ← alpha * x (scale a matrix) - */ - public static DoubleMatrix scal(double alpha, DoubleMatrix x) { - NativeBlas.dscal(x.length, alpha, x.data, 0, 1); -@@ -80,7 +80,7 @@ public class SimpleBlas { - } - - /** -- * Compute y <- x (copy a matrix) -+ * Compute y ← x (copy a matrix) - */ - public static DoubleMatrix copy(DoubleMatrix x, DoubleMatrix y) { - //NativeBlas.dcopy(x.length, x.data, 0, 1, y.data, 0, 1); -@@ -94,7 +94,7 @@ public class SimpleBlas { - } - - /** -- * Compute y <- alpha * x + y (elementwise addition) -+ * Compute y ← alpha * x + y (elementwise addition) - */ - public static DoubleMatrix axpy(double da, DoubleMatrix dx, DoubleMatrix dy) { - //NativeBlas.daxpy(dx.length, da, dx.data, 0, 1, dy.data, 0, 1); -@@ -175,7 +175,7 @@ public class SimpleBlas { - */ - - /** -- * Compute y <- alpha*op(a)*x + beta * y (general matrix vector -+ * Compute y ← alpha*op(a)*x + beta * y (general matrix vector - * multiplication) - */ - public static DoubleMatrix gemv(double alpha, DoubleMatrix a, -@@ -205,7 +205,7 @@ public class SimpleBlas { - } - - /** -- * Compute A <- alpha * x * y^T + A (general rank-1 update) -+ * Compute A ← alpha * x * y^T + A (general rank-1 update) - */ - public static DoubleMatrix ger(double alpha, DoubleMatrix x, - DoubleMatrix y, DoubleMatrix a) { -@@ -215,7 +215,7 @@ public class SimpleBlas { - } - - /** -- * Compute A <- alpha * x * y^T + A (general rank-1 update) -+ * Compute A ← alpha * x * y^T + A (general rank-1 update) - */ - public static ComplexDoubleMatrix geru(ComplexDouble alpha, ComplexDoubleMatrix x, - ComplexDoubleMatrix y, ComplexDoubleMatrix a) { -@@ -225,7 +225,7 @@ public class SimpleBlas { - } - - /** -- * Compute A <- alpha * x * y^H + A (general rank-1 update) -+ * Compute A ← alpha * x * y^H + A (general rank-1 update) - */ - public static ComplexDoubleMatrix gerc(ComplexDouble alpha, ComplexDoubleMatrix x, - ComplexDoubleMatrix y, ComplexDoubleMatrix a) { -@@ -239,7 +239,7 @@ public class SimpleBlas { - */ - - /** -- * Compute c <- a*b + beta * c (general matrix matrix -+ * Compute c ← a*b + beta * c (general matrix matrix - * multiplication) - */ - public static DoubleMatrix gemm(double alpha, DoubleMatrix a, -@@ -421,10 +421,11 @@ public class SimpleBlas { - * Note that B must be padded to contain the solution matrix. This occurs when A has fewer rows - * than columns. - * -- * For example: in A * X = B, A is (m,n), X is (n,k) and B is (m,k). Now if m < n, since B is overwritten to contain -- * the solution (in classical LAPACK style), B needs to be padded to be an (n,k) matrix. -+ * For example: in A * X = B, A is (m,n), X is (n,k) and B is (m,k). Now if m < n, -+ * since B is overwritten to contain the solution (in classical LAPACK style), B needs -+ * to be padded to be an (n,k) matrix. - * -- * Likewise, if m > n, the solution consists only of the first n rows of B. -+ * Likewise, if m > n, the solution consists only of the first n rows of B. - * - * @param A an (m,n) matrix - * @param B an (max(m,n), k) matrix (well, at least) -@@ -486,7 +487,7 @@ public class SimpleBlas { - */ - - /** -- * Compute x <-> y (swap two matrices) -+ * Compute x ↔ y (swap two matrices) - */ - public static FloatMatrix swap(FloatMatrix x, FloatMatrix y) { - //NativeBlas.sswap(x.length, x.data, 0, 1, y.data, 0, 1); -@@ -495,7 +496,7 @@ public class SimpleBlas { - } - - /** -- * Compute x <- alpha * x (scale a matrix) -+ * Compute x ← alpha * x (scale a matrix) - */ - public static FloatMatrix scal(float alpha, FloatMatrix x) { - NativeBlas.sscal(x.length, alpha, x.data, 0, 1); -@@ -508,7 +509,7 @@ public class SimpleBlas { - } - - /** -- * Compute y <- x (copy a matrix) -+ * Compute y ← x (copy a matrix) - */ - public static FloatMatrix copy(FloatMatrix x, FloatMatrix y) { - //NativeBlas.scopy(x.length, x.data, 0, 1, y.data, 0, 1); -@@ -522,7 +523,7 @@ public class SimpleBlas { - } - - /** -- * Compute y <- alpha * x + y (elementwise addition) -+ * Compute y ← alpha * x + y (elementwise addition) - */ - public static FloatMatrix axpy(float da, FloatMatrix dx, FloatMatrix dy) { - //NativeBlas.saxpy(dx.length, da, dx.data, 0, 1, dy.data, 0, 1); -@@ -603,7 +604,7 @@ public class SimpleBlas { - */ - - /** -- * Compute y <- alpha*op(a)*x + beta * y (general matrix vector -+ * Compute y ← alpha*op(a)*x + beta * y (general matrix vector - * multiplication) - */ - public static FloatMatrix gemv(float alpha, FloatMatrix a, -@@ -633,7 +634,7 @@ public class SimpleBlas { - } - - /** -- * Compute A <- alpha * x * y^T + A (general rank-1 update) -+ * Compute A ← alpha * x * y^T + A (general rank-1 update) - */ - public static FloatMatrix ger(float alpha, FloatMatrix x, - FloatMatrix y, FloatMatrix a) { -@@ -643,7 +644,7 @@ public class SimpleBlas { - } - - /** -- * Compute A <- alpha * x * y^T + A (general rank-1 update) -+ * Compute A ← alpha * x * y^T + A (general rank-1 update) - */ - public static ComplexFloatMatrix geru(ComplexFloat alpha, ComplexFloatMatrix x, - ComplexFloatMatrix y, ComplexFloatMatrix a) { -@@ -653,7 +654,7 @@ public class SimpleBlas { - } - - /** -- * Compute A <- alpha * x * y^H + A (general rank-1 update) -+ * Compute A ← alpha * x * y^H + A (general rank-1 update) - */ - public static ComplexFloatMatrix gerc(ComplexFloat alpha, ComplexFloatMatrix x, - ComplexFloatMatrix y, ComplexFloatMatrix a) { -@@ -667,7 +668,7 @@ public class SimpleBlas { - */ - - /** -- * Compute c <- a*b + beta * c (general matrix matrix -+ * Compute c ← a*b + beta * c (general matrix matrix - * multiplication) - */ - public static FloatMatrix gemm(float alpha, FloatMatrix a, -@@ -842,10 +843,11 @@ public class SimpleBlas { - * Note that B must be padded to contain the solution matrix. This occurs when A has fewer rows - * than columns. - * -- * For example: in A * X = B, A is (m,n), X is (n,k) and B is (m,k). Now if m < n, since B is overwritten to contain -- * the solution (in classical LAPACK style), B needs to be padded to be an (n,k) matrix. -+ * For example: in A * X = B, A is (m,n), X is (n,k) and B is (m,k). Now if m < n, -+ * since B is overwritten to contain the solution (in classical LAPACK style), B needs -+ * to be padded to be an (n,k) matrix. - * -- * Likewise, if m > n, the solution consists only of the first n rows of B. -+ * Likewise, if m > n, the solution consists only of the first n rows of B. - * - * @param A an (m,n) matrix - * @param B an (max(m,n), k) matrix (well, at least) -diff --git a/src/main/java/org/jblas/Solve.java b/src/main/java/org/jblas/Solve.java -index e40d9a824f..a80f995eab 100644 ---- a/src/main/java/org/jblas/Solve.java -+++ b/src/main/java/org/jblas/Solve.java -@@ -70,10 +70,10 @@ public class Solve { - /** Computes the Least Squares solution for over or underdetermined - * linear equations A*X = B - * -- * In the overdetermined case, when m > n, that is, there are more equations than -- * variables, it computes the least squares solution of X -> ||A*X - B ||_2. -+ * In the overdetermined case, when m > n, that is, there are more equations than -+ * variables, it computes the least squares solution of X → ||A*X - B ||_2. - * -- * In the underdetermined case, when m < n (less equations than variables), there are infinitely -+ * In the underdetermined case, when m < n (less equations than variables), there are infinitely - * many solutions and it computes the minimum norm solution. - * - * @param A an (m,n) matrix -@@ -138,10 +138,10 @@ public class Solve { - /** Computes the Least Squares solution for over or underdetermined - * linear equations A*X = B - * -- * In the overdetermined case, when m > n, that is, there are more equations than -- * variables, it computes the least squares solution of X -> ||A*X - B ||_2. -+ * In the overdetermined case, when m > n, that is, there are more equations than -+ * variables, it computes the least squares solution of X → ||A*X - B ||_2. - * -- * In the underdetermined case, when m < n (less equations than variables), there are infinitely -+ * In the underdetermined case, when m < n (less equations than variables), there are infinitely - * many solutions and it computes the minimum norm solution. - * - * @param A an (m,n) matrix -diff --git a/src/main/java/org/jblas/exceptions/LapackArgumentException.java b/src/main/java/org/jblas/exceptions/LapackArgumentException.java -index d408823bbc..be35a176ac 100644 ---- a/src/main/java/org/jblas/exceptions/LapackArgumentException.java -+++ b/src/main/java/org/jblas/exceptions/LapackArgumentException.java -@@ -44,7 +44,7 @@ package org.jblas.exceptions; - public class LapackArgumentException extends LapackException { - /** - * Construct exception for given function and info. Message -- * will read "Argument <info> had an illegal value."); -+ * will read "Argument <info> had an illegal value."); - */ - public LapackArgumentException(String function, int info) { - super(function, "Argument " + info + " had an illegal value."); -diff --git a/src/main/java/org/jblas/exceptions/UnsupportedArchitectureException.java b/src/main/java/org/jblas/exceptions/UnsupportedArchitectureException.java -index 6fa3520e1e..04fcde8b1a 100644 ---- a/src/main/java/org/jblas/exceptions/UnsupportedArchitectureException.java -+++ b/src/main/java/org/jblas/exceptions/UnsupportedArchitectureException.java -@@ -1,10 +1,6 @@ - package org.jblas.exceptions; - - /** -- * <one line description> -- * <p/> -- * <longer description> -- * <p/> - * User: mikio - * Date: 2/13/13 - * Time: 12:28 PM -diff --git a/src/main/java/org/jblas/ranges/IntervalRange.java b/src/main/java/org/jblas/ranges/IntervalRange.java -index 763b2a9ddc..80fda0eff4 100644 ---- a/src/main/java/org/jblas/ranges/IntervalRange.java -+++ b/src/main/java/org/jblas/ranges/IntervalRange.java -@@ -42,7 +42,7 @@ package org.jblas.ranges; - - /** - * Range which varies from a given interval. Endpoint is exclusive! -- * <p/> -+ * <p> - * "new IntervalRange(0, 3)" enumerates 0, 1, 2. - */ - public class IntervalRange implements Range { -diff --git a/src/main/java/org/jblas/util/LibraryLoader.java b/src/main/java/org/jblas/util/LibraryLoader.java -index b7b528137f..53aaeb916b 100755 ---- a/src/main/java/org/jblas/util/LibraryLoader.java -+++ b/src/main/java/org/jblas/util/LibraryLoader.java -@@ -134,9 +134,9 @@ public class LibraryLoader { - * System.mapLibraryName(). For example, the library "foo" is called "libfoo.so" - * under Linux and "foo.dll" under Windows, but you just have to pass "foo" - * the loadLibrary().</p> -- * <p/> -+ * <p> - * <p>I'm not quite sure if this doesn't open all kinds of security holes. Any ideas?</p> -- * <p/> -+ * <p> - * <p>This function reports some more information to the "org.jblas" logger at - * the FINE level.</p> - * --- -2.9.0 - diff --git a/0004-javadoc-add-summaries-to-tables.patch b/0004-javadoc-add-summaries-to-tables.patch deleted file mode 100644 index 326ac2a..0000000 --- a/0004-javadoc-add-summaries-to-tables.patch +++ /dev/null @@ -1,238 +0,0 @@ -From 8b9c6768d14273e0a143c81e021c1b428efc53cd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= zbyszek@in.waw.pl -Date: Thu, 26 Jan 2017 10:58:48 -0500 -Subject: [PATCH] javadoc: add summaries to tables - -Required by java 8 javadoc paraser. ---- - src/main/java/org/jblas/DoubleMatrix.java | 24 ++++++++++++------------ - src/main/java/org/jblas/FloatMatrix.java | 24 ++++++++++++------------ - 2 files changed, 24 insertions(+), 24 deletions(-) - -diff --git a/src/main/java/org/jblas/DoubleMatrix.java b/src/main/java/org/jblas/DoubleMatrix.java -index b12677db68..fc039e5607 100644 ---- a/src/main/java/org/jblas/DoubleMatrix.java -+++ b/src/main/java/org/jblas/DoubleMatrix.java -@@ -75,7 +75,7 @@ import java.util.regex.Pattern; - * <p>To construct a two-dimensional matrices, you can use the following constructors - * and static methods.</p> - * -- * <table class="my"> -+ * <table class="my" summary="list of constructors"> - * <tr><th>Method<th>Description - * <tr><td>DoubleMatrix(m,n, [value1, value2, value3...])<td>Values are filled in column by column. - * <tr><td>DoubleMatrix(new double[][] {{value1, value2, ...}, ...}<td>Inner arrays are rows. -@@ -90,7 +90,7 @@ import java.util.regex.Pattern; - * <p>Alternatively, you can construct (column) vectors, if you just supply the length - * using the following constructors and static methods.</p> - * -- * <table class="my"> -+ * <table class="my" summary="list of alternate constructors"> - * <tr><th>Method</th> <th>Description</th></tr> - * <tr><td>DoubleMatrix(m)</td> <td>Constructs a column vector.</td></tr> - * <tr><td>DoubleMatrix(new double[] {value1, value2, ...})</td><td>Constructs a column vector.</td></tr> -@@ -105,7 +105,7 @@ import java.util.regex.Pattern; - * <p>You can also construct new matrices by concatenating matrices either horziontally - * or vertically:</p> - * -- * <table class="my"> -+ * <table class="my" summary="construction by concatenation"> - * <tr><th>Method<th>Description - * <tr><td>x.concatHorizontally(y)<td>New matrix will be x next to y. - * <tr><td>x.concatVertically(y)<td>New matrix will be x atop y. -@@ -116,7 +116,7 @@ import java.util.regex.Pattern; - * <p>To access individual elements, or whole rows and columns, use the following - * methods:<p> - * -- * <table class="my"> -+ * <table class="my" summary="list of getters and setters"> - * <tr><th>x.Method<th>Description - * <tr><td>x.get(i,j)<td>Get element in row i and column j. - * <tr><td>x.put(i, j, v)<td>Set element in row i and column j to value v -@@ -145,7 +145,7 @@ import java.util.regex.Pattern; - * - * <p>There exist the following Range objects. The Class <tt>RangeUtils</tt> also - * contains the a number of handy helper methods for constructing these ranges.</p> -- * <table class="my"> -+ * <table class="my" summary="list of range objects"> - * <tr><th>Class <th>RangeUtils method <th>Indices - * <tr><td>AllRange <td>all() <td>All legal indices. - * <tr><td>PointRange <td>point(i) <td> A single point. -@@ -157,7 +157,7 @@ import java.util.regex.Pattern; - * - * <p>The following methods can be used for duplicating and copying matrices.</p> - * -- * <table class="my"> -+ * <table class="my" summary="methods for duplicating and copying matrices"> - * <tr><th>Method<th>Description - * <tr><td>x.dup()<td>Get a copy of x. - * <tr><td>x.copy(y)<td>Copy the contents of y to x (possible resizing x). -@@ -167,7 +167,7 @@ import java.util.regex.Pattern; - * - * <p>The following methods permit to access the size of a matrix and change its size or shape.</p> - * -- * <table class="my"> -+ * <table class="my" summary="methods to query and change the size and shape of a matrix"> - * <tr><th>x.Method<th>Description - * <tr><td>x.rows<td>Number of rows. - * <tr><td>x.columns<td>Number of columns. -@@ -217,7 +217,7 @@ import java.util.regex.Pattern; - * right-hand-side. The same effect can be achieved by passing a DoubleMatrix with - * exactly one element.</p> - * -- * <table class="my"> -+ * <table class="my" summary="element-wise matrix operators"> - * <tr><th>Operation <th>Method <th>Comment - * <tr><td>x + y <td>x.add(y) <td> - * <tr><td>x - y <td>x.sub(y), y.rsub(x) <td>rsub subtracts left from right hand side -@@ -230,7 +230,7 @@ import java.util.regex.Pattern; - * - * <p>There also exist operations which work on whole columns or rows.</p> - * -- * <table class="my"> -+ * <table class="my" summary="column-wise matrix operators"> - * <tr><th>Method</th> <th>Description</th></tr> - * <tr><td>x.addRowVector</td> <td>adds a vector to each row (addiRowVector works in-place)</td></tr> - * <tr><td>x.addColumnVector</td><td>adds a vector to each column</td></tr> -@@ -249,7 +249,7 @@ import java.util.regex.Pattern; - * - * <p>The following comparison operations are available</p> - * -- * <table class="my"> -+ * <table class="my" summary="matrix comparison operators"> - * <tr><th>Operation <th>Method - * <tr><td>x < y <td>x.lt(y) - * <tr><td>x <= y <td>x.le(y) -@@ -263,7 +263,7 @@ import java.util.regex.Pattern; - * zero is treated as "true" and zero is treated as "false". All operations are carried - * out elementwise.</p> - * -- * <table class="my"> -+ * <table class="my" summary="matrix elementwise logical operators"> - * <tr><th>Operation <th>Method - * <tr><td>x & y <td>x.and(y) - * <tr><td>x | y <td>x.or(y) -@@ -273,7 +273,7 @@ import java.util.regex.Pattern; - * - * <p>Finally, there are a few more methods to compute various things:</p> - * -- * <table class="my"> -+ * <table class="my" summary="matrix min/max methods"> - * <tr><th>Method <th>Description - * <tr><td>x.max() <td>Return maximal element - * <tr><td>x.argmax() <td>Return index of largest element -diff --git a/src/main/java/org/jblas/FloatMatrix.java b/src/main/java/org/jblas/FloatMatrix.java -index 889d72795a..26c6594081 100644 ---- a/src/main/java/org/jblas/FloatMatrix.java -+++ b/src/main/java/org/jblas/FloatMatrix.java -@@ -75,7 +75,7 @@ import java.util.regex.Pattern; - * <p>To construct a two-dimensional matrices, you can use the following constructors - * and static methods.</p> - * -- * <table class="my"> -+ * <table class="my" summary="list of constructors"> - * <tr><th>Method<th>Description - * <tr><td>FloatMatrix(m,n, [value1, value2, value3...])<td>Values are filled in column by column. - * <tr><td>FloatMatrix(new float[][] {{value1, value2, ...}, ...}<td>Inner arrays are rows. -@@ -90,7 +90,7 @@ import java.util.regex.Pattern; - * <p>Alternatively, you can construct (column) vectors, if you just supply the length - * using the following constructors and static methods.</p> - * -- * <table class="my"> -+ * <table class="my" summary="list of alternate constructors"> - * <tr><th>Method</th> <th>Description</th></tr> - * <tr><td>FloatMatrix(m)</td> <td>Constructs a column vector.</td></tr> - * <tr><td>FloatMatrix(new float[] {value1, value2, ...})</td><td>Constructs a column vector.</td></tr> -@@ -105,7 +105,7 @@ import java.util.regex.Pattern; - * <p>You can also construct new matrices by concatenating matrices either horziontally - * or vertically:</p> - * -- * <table class="my"> -+ * <table class="my" summary="construction by concatenation"> - * <tr><th>Method<th>Description - * <tr><td>x.concatHorizontally(y)<td>New matrix will be x next to y. - * <tr><td>x.concatVertically(y)<td>New matrix will be x atop y. -@@ -116,7 +116,7 @@ import java.util.regex.Pattern; - * <p>To access individual elements, or whole rows and columns, use the following - * methods:<p> - * -- * <table class="my"> -+ * <table class="my" summary="list of getters and setters"> - * <tr><th>x.Method<th>Description - * <tr><td>x.get(i,j)<td>Get element in row i and column j. - * <tr><td>x.put(i, j, v)<td>Set element in row i and column j to value v -@@ -145,7 +145,7 @@ import java.util.regex.Pattern; - * - * <p>There exist the following Range objects. The Class <tt>RangeUtils</tt> also - * contains the a number of handy helper methods for constructing these ranges.</p> -- * <table class="my"> -+ * <table class="my" summary="list of range objects"> - * <tr><th>Class <th>RangeUtils method <th>Indices - * <tr><td>AllRange <td>all() <td>All legal indices. - * <tr><td>PointRange <td>point(i) <td> A single point. -@@ -157,7 +157,7 @@ import java.util.regex.Pattern; - * - * <p>The following methods can be used for duplicating and copying matrices.</p> - * -- * <table class="my"> -+ * <table class="my" summary="methods for duplicating and copying matrices"> - * <tr><th>Method<th>Description - * <tr><td>x.dup()<td>Get a copy of x. - * <tr><td>x.copy(y)<td>Copy the contents of y to x (possible resizing x). -@@ -167,7 +167,7 @@ import java.util.regex.Pattern; - * - * <p>The following methods permit to access the size of a matrix and change its size or shape.</p> - * -- * <table class="my"> -+ * <table class="my" summary="methods to query and change the size and shape of a matrix"> - * <tr><th>x.Method<th>Description - * <tr><td>x.rows<td>Number of rows. - * <tr><td>x.columns<td>Number of columns. -@@ -217,7 +217,7 @@ import java.util.regex.Pattern; - * right-hand-side. The same effect can be achieved by passing a FloatMatrix with - * exactly one element.</p> - * -- * <table class="my"> -+ * <table class="my" summary="element-wise matrix operators"> - * <tr><th>Operation <th>Method <th>Comment - * <tr><td>x + y <td>x.add(y) <td> - * <tr><td>x - y <td>x.sub(y), y.rsub(x) <td>rsub subtracts left from right hand side -@@ -230,7 +230,7 @@ import java.util.regex.Pattern; - * - * <p>There also exist operations which work on whole columns or rows.</p> - * -- * <table class="my"> -+ * <table class="my" summary="column-wise matrix operators"> - * <tr><th>Method</th> <th>Description</th></tr> - * <tr><td>x.addRowVector</td> <td>adds a vector to each row (addiRowVector works in-place)</td></tr> - * <tr><td>x.addColumnVector</td><td>adds a vector to each column</td></tr> -@@ -249,7 +249,7 @@ import java.util.regex.Pattern; - * - * <p>The following comparison operations are available</p> - * -- * <table class="my"> -+ * <table class="my" summary="matrix comparison operators"> - * <tr><th>Operation <th>Method - * <tr><td>x < y <td>x.lt(y) - * <tr><td>x <= y <td>x.le(y) -@@ -263,7 +263,7 @@ import java.util.regex.Pattern; - * zero is treated as "true" and zero is treated as "false". All operations are carried - * out elementwise.</p> - * -- * <table class="my"> -+ * <table class="my" summary="matrix elementwise logical operators"> - * <tr><th>Operation <th>Method - * <tr><td>x & y <td>x.and(y) - * <tr><td>x | y <td>x.or(y) -@@ -273,7 +273,7 @@ import java.util.regex.Pattern; - * - * <p>Finally, there are a few more methods to compute various things:</p> - * -- * <table class="my"> -+ * <table class="my" summary="matrix min/max methods"> - * <tr><th>Method <th>Description - * <tr><td>x.max() <td>Return maximal element - * <tr><td>x.argmax() <td>Return index of largest element --- -2.9.0 - diff --git a/0005-Fix-path-to-stylesheet-and-overview.patch b/0005-Fix-path-to-stylesheet-and-overview.patch deleted file mode 100644 index 89a532b..0000000 --- a/0005-Fix-path-to-stylesheet-and-overview.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e80b08bfbde6b5e38a8f354c61123c5775294b86 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= zbyszek@in.waw.pl -Date: Thu, 26 Jan 2017 11:02:43 -0500 -Subject: [PATCH] Fix path to stylesheet and overview - ---- - build.xml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/build.xml b/build.xml -index 3092333f9d..61b40c60e7 100644 ---- a/build.xml -+++ b/build.xml -@@ -230,7 +230,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - sourcepath="${src}" defaultexcludes="yes" - destdir="${doc}" author="true" version="true" - use="true" windowtitle="jblas" linksource="yes" -- stylesheetfile="javadoc.css" overview="${src}/overview.html"> -+ stylesheetfile="src/main/javadoc/stylesheet.css" -+ overview="src/main/javadoc/overview.html"> - <doctitle> - <![CDATA[ <h1>jblas - Linear Algebra for Java (version ${version})</h1> ]]> - </doctitle> -@@ -285,7 +286,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - <include name="INSTALL" /> - <include name="COPYING" /> - <include name="AUTHORS" /> -- <include name="javadoc.css" /> - <include name="javadoc/**" /> - <include name="nbproject/**" /> - <include name="native/jblas_arch_flavor.c" /> --- -2.9.0 - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/jblas-1.2.3-ppc64.patch b/jblas-1.2.3-ppc64.patch deleted file mode 100644 index c5606c0..0000000 --- a/jblas-1.2.3-ppc64.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/config/config_libs.rb b/config/config_libs.rb -index bdb09d45c7..83ccbe27b6 100644 ---- a/config/config_libs.rb -+++ b/config/config_libs.rb -@@ -1,3 +1,4 @@ -+# coding: utf-8 - ## --- BEGIN LICENSE BLOCK --- - # Copyright (c) 2009, Mikio L. Braun - # All rights reserved. -@@ -65,7 +66,7 @@ ATLAS_REQUIRED_SYMBOLS = [ - 'ATL_caxpy' - ] - --LAPACK_REQUIRED_SYMBOLS = ['dsyev_', 'daxpy_', 'dgemm_'] -+LAPACK_REQUIRED_SYMBOLS = [] - - ATLAS_LIBS = %w(lapack lapack_fortran lapack_atlas f77blas cblas atlas) - PT_ATLAS_LIBS = %w(lapack lapack_fortran lapack_atlas ptf77blas ptcblas atlas) diff --git a/jblas.spec b/jblas.spec deleted file mode 100644 index 2e983dd..0000000 --- a/jblas.spec +++ /dev/null @@ -1,179 +0,0 @@ -Summary: Java bindings for BLAS -Name: jblas -Version: 1.2.4 -Release: 13%{?dist} -License: BSD -URL: http://jblas.org - -Source0: https://github.com/mikiobraun/jblas/archive/jblas-%%7Bversion%7D.tar.gz -Patch0: 0001-Try-to-load-libraries-directly-on-Linux.patch -Patch1: 0002-build.xml-fix-version.patch -# workaround for build failure on ppc64 -# than, still investigate why libsyms returns empty array on ppc64 -Patch2: jblas-1.2.3-ppc64.patch -Patch3: 0002-Prevent-resource-leak-by-closing-resources-in-load-s.patch -# https://github.com/mikiobraun/jblas/pull/85 -Patch4: 0003-javadoc-use-html-entities-unicode-and-fix-formatting.patch -Patch5: 0004-javadoc-add-summaries-to-tables.patch -Patch6: 0005-Fix-path-to-stylesheet-and-overview.patch - -BuildRequires: javapackages-local -BuildRequires: ant -BuildRequires: ruby-devel -BuildRequires: gcc-gfortran -BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) - -BuildRequires: junit -BuildRequires: atlas-devel - -BuildRequires: rubygem-RedCloth -BuildRequires: rubygem-hitimes -BuildRequires: rubygem-nokogiri -BuildRequires: rubygem-redcarpet -BuildRequires: rubygem-ffi -BuildRequires: rubygem-posix-spawn -BuildRequires: rubygem-fog-json -BuildRequires: make -# fast-stemmer - -%description -Wraps BLAS (e.g. ATLAS) using generated code through JNI. Allows Java -programs to use the full power of ATLAS/Lapack through a convenient -interface. - -Uninstalling generic atlas rpm and installing an architecture-specific -version of atlas (e.g. atlas-sse3) is recommended. - -%package javadoc -Summary: Javadocs for %{name} -Requires: jpackage-utils - -%description javadoc -This package contains the API documentation for %{name}. - -%prep -%setup -qn %{name}-%{name}-%{version} -rm -rf src/main/resources/lib/static -%patch0 -p1 -%patch1 -p1 -%ifarch ppc64 -%patch2 -p1 -%endif -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 - -# turn of javadoc warnings, we don't care -sed -i.bak -r 's/overview=/additionalparam="-Xdoclint:none" \0/' build.xml - -sed -i.bak -r 's/-SNAPSHOT//' build.xml - -ln -s pom.xml %{name}.pom -%mvn_file org.jblas:jblas %{name} - -%build -libdir="$(cd "/usr/lib/$(gcc -print-multi-os-directory)"; pwd)" -export LC_ALL=C.UTF-8 -./configure --ptatlas --libpath="$libdir/atlas" --arch-flavor=sse --libs=tatlas -%make_build CFLAGS="%{optflags} -fPIC" -ant minimal-jar javadoc -rm -rf javadoc/src-html - -ln -s jblas-minimal-%{version}*.jar %{name}.jar - -%mvn_artifact %{name}.pom %{name}.jar - -%install -%mvn_install -J javadoc - -install -d -m 755 %buildroot%{_libdir}/%{name} -install -pm 755 src/main/resources/lib/dynamic/Linux/*/sse/libjblas.so \ - %buildroot%{_libdir}/%{name}/ - -%files -f .mfiles -%{_libdir}/%{name} -%license COPYING AUTHORS -%doc RELEASE_NOTES - -%files javadoc -f .mfiles-javadoc - -%changelog -* Sat Aug 01 2020 Fedora Release Engineering releng@fedoraproject.org - 1.2.4-13 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering releng@fedoraproject.org - 1.2.4-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 10 2020 Jiri Vanek jvanek@redhat.com - 1.2.4-11 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Wed Jan 29 2020 Fedora Release Engineering releng@fedoraproject.org - 1.2.4-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering releng@fedoraproject.org - 1.2.4-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering releng@fedoraproject.org - 1.2.4-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Nov 19 2018 Zbigniew Jędrzejewski-Szmek zbyszek@in.waw.pl - 1.2.4-7 -- Use C.UTF-8 locale - See https://fedoraproject.org/wiki/Changes/Remove_glibc-langpacks-all_from_build... - -* Fri Jul 13 2018 Fedora Release Engineering releng@fedoraproject.org - 1.2.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering releng@fedoraproject.org - 1.2.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Aug 7 2017 Zbigniew Jędrzejewski-Szmek zbyszek@in.waw.pl - 1.2.4-4 -- Replace deprecated %%add_maven_depmap with %%mvn_file/%%mvn_install - -* Wed Aug 02 2017 Fedora Release Engineering releng@fedoraproject.org - 1.2.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering releng@fedoraproject.org - 1.2.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering releng@fedoraproject.org - 1.2.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Jan 25 2017 Zbigniew Jędrzejewski-Szmek zbyszek@in.waw.pl - 1.2.4-1 -- Update to latest version -- Clean up spec file - -* Tue Nov 15 2016 Than Ngo than@redhat.com - 1.2.3-11 -- add BR on ruby-devel → fix build failure -- add workaround to fix build failure on ppc64 - -* Sun Nov 13 2016 Peter Robinson pbrobinson@fedoraproject.org 1.2.3-10 -- Rebuild - -* Thu Feb 04 2016 Fedora Release Engineering releng@fedoraproject.org - 1.2.3-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 1.2.3-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Aug 16 2014 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 1.2.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Fri Jun 13 2014 Zbigniew Jędrzejewski-Szmek zbyszek@in.waw.pl - 1.2.3-6 -- Fix rawhide build (#1106829). - -* Sat Jun 07 2014 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 1.2.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat Feb 22 2014 Zbigniew Jędrzejewski-Szmek zbyszek@in.waw.pl - 1.2.3-4 -- Prune dependency on jpackage-utils and depend on java-headless (#1068201). - -* Sun Sep 22 2013 Zbigniew Jędrzejewski-Szmek zbyszek@in.waw.pl - 1.2.3-3 -- Bump release for rebuild after libatlas so name bump. - -* Mon Aug 05 2013 Zbigniew Jędrzejewski-Szmek zbyszek@in.waw.pl - 1.2.3-2 -- Make /usr/lib64/jblas owned. - -* Tue Jul 30 2013 Zbigniew Jędrzejewski-Szmek zbyszek@in.waw.pl - 1.2.3-1 -- Initial packaging (#990627). diff --git a/sources b/sources deleted file mode 100644 index 220a9b9..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (jblas-1.2.4.tar.gz) = 1dd24e5efa2ab419449df1406ac7913e6709772d8cdc6f69bda44c4ebc1d2631289410e9732cd95cabe16914588ff827edfb8e9d486e75955f5097cc270478b7