Skip to content

Commit

Permalink
Merge branch 'master' into release-3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
eromero-vlc committed May 2, 2020
2 parents 5d95044 + c3b52d0 commit 50ea26f
Show file tree
Hide file tree
Showing 53 changed files with 5,911 additions and 4,875 deletions.
3 changes: 2 additions & 1 deletion Make_flags
Expand Up @@ -27,7 +27,8 @@ SOLIBRARY = libprimme.$(SLIB)
# POSIX systems (e.g., Linux, MinGW, Cygwin)
#---------------------------------------------------------------
CC ?= cc
F77 ?= gfortran
F77 := gfortran
FC := gfortran
DEFINES ?= -DF77UNDERSCORE
CFLAGS ?= -O -fPIC -DNDEBUG
FFLAGS ?= -fno-second-underscore -O
Expand Down
4 changes: 2 additions & 2 deletions Python/Makefile
@@ -1,10 +1,10 @@
include ../Make_flags

all:
./setup.py build_ext -i
$(PYTHON) ./setup.py build_ext -i

install:
./setup.py install
$(PYTHON) ./setup.py install

# Test target: run the tests
test: examples.py
Expand Down
2,798 changes: 1,466 additions & 1,332 deletions Python/primme.c

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion doc/html/.buildinfo
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: b2315f1432018a0578e926c16e356966
config: 9a0ed54895627e249ad4c9453744db7e
tags: 645f666f9bcd5a90fca523b33c5a78b7
8 changes: 8 additions & 0 deletions doc/html/_sources/intro.rst.txt
Expand Up @@ -56,6 +56,14 @@ From PRIMME 1.x to 2.0:
Changelog
^^^^^^^^^

Changes in PRIMME 3.1 (released on May 2, 2020):

* Fixed compilation issues in F90 interface and examples.

* Fixed bug in block orthogonalization.

* Updated Python interface to Python version 3.8.

Changes in PRIMME 3.0 (released on December 14, 2019):

* Added support for the generalized Hermitian eigenvalue problem (see |massMatrixMatvec|) and the standard normal eigenvalue problem (see :c:func:`zprimme_normal`).
Expand Down
Binary file added doc/html/_static/ajax-loader.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
90 changes: 1 addition & 89 deletions doc/html/_static/basic.css
Expand Up @@ -231,16 +231,6 @@ a.headerlink {
visibility: hidden;
}

a.brackets:before,
span.brackets > a:before{
content: "[";
}

a.brackets:after,
span.brackets > a:after {
content: "]";
}

h1:hover > a.headerlink,
h2:hover > a.headerlink,
h3:hover > a.headerlink,
Expand Down Expand Up @@ -289,12 +279,6 @@ img.align-center, .figure.align-center, object.align-center {
margin-right: auto;
}

img.align-default, .figure.align-default {
display: block;
margin-left: auto;
margin-right: auto;
}

.align-left {
text-align: left;
}
Expand All @@ -303,10 +287,6 @@ img.align-default, .figure.align-default {
text-align: center;
}

.align-default {
text-align: center;
}

.align-right {
text-align: right;
}
Expand Down Expand Up @@ -378,11 +358,6 @@ table.align-center {
margin-right: auto;
}

table.align-default {
margin-left: auto;
margin-right: auto;
}

table caption span.caption-number {
font-style: italic;
}
Expand Down Expand Up @@ -416,16 +391,6 @@ table.citation td {
border-bottom: none;
}

th > p:first-child,
td > p:first-child {
margin-top: 0px;
}

th > p:last-child,
td > p:last-child {
margin-bottom: 0px;
}

/* -- figures --------------------------------------------------------------- */

div.figure {
Expand Down Expand Up @@ -495,58 +460,11 @@ ol.upperroman {
list-style: upper-roman;
}

li > p:first-child {
margin-top: 0px;
}

li > p:last-child {
margin-bottom: 0px;
}

dl.footnote > dt,
dl.citation > dt {
float: left;
}

dl.footnote > dd,
dl.citation > dd {
margin-bottom: 0em;
}

dl.footnote > dd:after,
dl.citation > dd:after {
content: "";
clear: both;
}

dl.field-list {
display: grid;
grid-template-columns: fit-content(30%) auto;
}

dl.field-list > dt {
font-weight: bold;
word-break: break-word;
padding-left: 0.5em;
padding-right: 5px;
}

dl.field-list > dt:after {
content: ":";
}

dl.field-list > dd {
padding-left: 0.5em;
margin-top: 0em;
margin-left: 0em;
margin-bottom: 0em;
}

dl {
margin-bottom: 15px;
}

dd > p:first-child {
dd p {
margin-top: 0px;
}

Expand Down Expand Up @@ -619,12 +537,6 @@ dl.glossary dt {
font-style: oblique;
}

.classifier:before {
font-style: normal;
margin: 0.5em;
content: ":";
}

abbr, acronym {
border-bottom: dotted 1px;
cursor: help;
Expand Down
Binary file added doc/html/_static/comment-bright.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/html/_static/comment-close.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/html/_static/comment.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions doc/html/_static/doctools.js
Expand Up @@ -87,13 +87,14 @@ jQuery.fn.highlightText = function(text, className) {
node.nextSibling));
node.nodeValue = val.substr(0, pos);
if (isInSVG) {
var bbox = span.getBBox();
var rect = document.createElementNS("http://www.w3.org/2000/svg", "rect");
var bbox = node.parentElement.getBBox();
rect.x.baseVal.value = bbox.x;
rect.x.baseVal.value = bbox.x;
rect.y.baseVal.value = bbox.y;
rect.width.baseVal.value = bbox.width;
rect.height.baseVal.value = bbox.height;
rect.setAttribute('class', className);
var parentOfText = node.parentNode.parentNode;
addItems.push({
"parent": node.parentNode,
"target": rect});
Expand Down
4 changes: 2 additions & 2 deletions doc/html/_static/documentation_options.js
@@ -1,10 +1,10 @@
var DOCUMENTATION_OPTIONS = {
URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
VERSION: '3.0',
VERSION: '3.1',
LANGUAGE: 'None',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true,
SOURCELINK_SUFFIX: '.txt',
NAVIGATION_WITH_KEYS: false
NAVIGATION_WITH_KEYS: false,
};
Binary file added doc/html/_static/down-pressed.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/html/_static/down.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 50ea26f

Please sign in to comment.