[superlu] 04/06: Imported Upstream version 5.2.1+dfsg1
Drew Parsons
dparsons at moszumanska.debian.org
Mon May 23 11:15:54 UTC 2016
This is an automated email from the git hooks/post-receive script.
dparsons pushed a commit to branch master
in repository superlu.
commit 1755e01b148b03f2d487eba179bedd36acb8b031
Author: Drew Parsons <dparsons at debian.org>
Date: Mon May 23 19:05:13 2016 +0800
Imported Upstream version 5.2.1+dfsg1
---
.gitignore | 2 ++
CBLAS/.dropbox.attr | 1 +
CMakeLists.txt | 2 +-
DOC/.dropbox.attr | 1 +
DOC/html/.dropbox.attr | 1 +
EXAMPLE/.dropbox.attr | 1 +
FORTRAN/.dropbox.attr | 1 +
INSTALL/.dropbox.attr | 1 +
License.txt | 37 +++++++++++++++++++++++++++++++++++++
MAKE_INC/.dropbox.attr | 1 +
MAKE_INC/make.scg1 | 4 ++--
MATLAB/.dropbox.attr | 1 +
MATLAB/time.m | 9 +++++++++
README | 21 ++++++++++++---------
SRC/.dropbox.attr | 1 +
SRC/CMakeLists.txt | 9 +++++++--
SRC/Makefile | 7 -------
SRC/slu_util.h | 16 ++++++++++++++++
TESTING/.dropbox.attr | 1 +
TESTING/MATGEN/.dropbox.attr | 1 +
TESTING/Makefile | 8 ++++----
lib/.dropbox.attr | 1 +
make.inc.in | 2 +-
23 files changed, 103 insertions(+), 26 deletions(-)
diff --git a/.gitignore b/.gitignore
index 2eb65d5..2de1190 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@
# If the instructions are telling people to create this build dir under the
# source tree, you had better put in an ignore for this.
/build/
+
+.dropbox.attr
diff --git a/CBLAS/.dropbox.attr b/CBLAS/.dropbox.attr
new file mode 100755
index 0000000..9e26dfe
--- /dev/null
+++ b/CBLAS/.dropbox.attr
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3b6bc8..e79ad41 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ cmake_minimum_required(VERSION 2.8.12)
# Project Version
project(SuperLU NONE)
set(VERSION_MAJOR "5")
-set(VERSION_MINOR "1")
+set(VERSION_MINOR "2")
set(VERSION_BugFix "1")
set(PROJECT_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BugFix})
diff --git a/DOC/.dropbox.attr b/DOC/.dropbox.attr
new file mode 100755
index 0000000..9e26dfe
--- /dev/null
+++ b/DOC/.dropbox.attr
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/DOC/html/.dropbox.attr b/DOC/html/.dropbox.attr
new file mode 100755
index 0000000..9e26dfe
--- /dev/null
+++ b/DOC/html/.dropbox.attr
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/EXAMPLE/.dropbox.attr b/EXAMPLE/.dropbox.attr
new file mode 100755
index 0000000..9e26dfe
--- /dev/null
+++ b/EXAMPLE/.dropbox.attr
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/FORTRAN/.dropbox.attr b/FORTRAN/.dropbox.attr
new file mode 100755
index 0000000..9e26dfe
--- /dev/null
+++ b/FORTRAN/.dropbox.attr
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/INSTALL/.dropbox.attr b/INSTALL/.dropbox.attr
new file mode 100755
index 0000000..9e26dfe
--- /dev/null
+++ b/INSTALL/.dropbox.attr
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/License.txt b/License.txt
index e003503..d222c24 100644
--- a/License.txt
+++ b/License.txt
@@ -27,3 +27,40 @@ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+-----------------
+External software
+-----------------
+In the ILU preconditioner driver routine xGSISX, we use MC64 routine
+to pre-permute large entries to the main diagonal. This use path can
+be removed for commercial users. MC64 routine carries the following notice:
+
+ COPYRIGHT (c) 1999 Council for the Central Laboratory of the
+ Research Councils. All rights reserved.
+ PACKAGE MC64A/AD
+ AUTHORS Iain Duff (i.duff at rl.ac.uk) and Jacko Koster (jak at ii.uib.no)
+ LAST UPDATE 20/09/99
+
+ *** Conditions on external use ***
+
+ The user shall acknowledge the contribution of this
+ package in any publication of material dependent upon the use of
+ the package. The user shall use reasonable endeavours to notify
+ the authors of the package of this publication.
+
+ The user can modify this code but, at no time
+ shall the right or title to all or any part of this package pass
+ to the user. The user shall make available free of charge
+ to the authors for any purpose all information relating to any
+ alteration or addition made to this package for the purposes of
+ extending the capabilities or enhancing the performance of this
+ package.
+
+ The user shall not pass this code directly to a third party without the
+ express prior consent of the authors. Users wanting to licence their
+ own copy of these routines should send email to hsl at aeat.co.uk
+
+ None of the comments from the Copyright notice up to and including this
+ one shall be removed or altered in any way.
+
diff --git a/MAKE_INC/.dropbox.attr b/MAKE_INC/.dropbox.attr
new file mode 100755
index 0000000..9e26dfe
--- /dev/null
+++ b/MAKE_INC/.dropbox.attr
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/MAKE_INC/make.scg1 b/MAKE_INC/make.scg1
index 46d7b0f..8f15455 100644
--- a/MAKE_INC/make.scg1
+++ b/MAKE_INC/make.scg1
@@ -21,8 +21,8 @@ PLAT = _linux
#
# The name of the libraries to be created/linked to
#
-SuperLUroot = $(HOME)/Dropbox/Codes/SuperLU/SuperLU_5.2.0
-SUPERLULIB = $(SuperLUroot)/lib/libsuperlu_5.2.0.a
+SuperLUroot = $(HOME)/Dropbox/Codes/SuperLU/SuperLU
+SUPERLULIB = $(SuperLUroot)/lib/libsuperlu_5.1.a
#BLASLIB = $(SuperLUroot)/lib/libblas.a
diff --git a/MATLAB/.dropbox.attr b/MATLAB/.dropbox.attr
new file mode 100755
index 0000000..9e26dfe
--- /dev/null
+++ b/MATLAB/.dropbox.attr
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/MATLAB/time.m b/MATLAB/time.m
new file mode 100644
index 0000000..b48d1f0
--- /dev/null
+++ b/MATLAB/time.m
@@ -0,0 +1,9 @@
+function y = time()
+%TIME Timestamp.
+% S = TIME returns a string containing the date and time.
+t = clock;
+base = t(1) - rem(t(1),100);
+months = ['Jan';'Feb';'Mar';'Apr';'May';'Jun';
+ 'Jul';'Aug';'Sep';'Oct';'Nov';'Dec'];
+y = [int2str(t(3)),'-',months(t(2),:),'-',int2str(t(1)-base), ...
+ ' ',int2str(t(4)),':', int2str(t(5)),':', int2str(t(6))];
diff --git a/README b/README
index b729a69..56787cb 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
- SuperLU (Version 5.2.0)
+ SuperLU (Version 5.2.x)
=======================
SuperLU contains a set of subroutines to solve a sparse linear system
@@ -126,21 +126,24 @@ are described below.
mkdir build ; cd build
cmake ..
- or with more options:
+ or with more options, e.g.,
cmake .. \
-
+ -DCMAKE_INSTALL_INCLUDEDIR=/my/custom/path
To actually build, type:
make
To run the installation test, type:
- ctest
+ make test (or: ctest)
- The test results are in the files below:
- build/TESTING/s_test.out # single precision, real
- build/TESTING/d_test.out # double precision, real
- build/TESTING/c_test.out # single precision, complex
- build/TESTING/z_test.out # double precision, complex
+ The test results are in the files below:
+ build/TESTING/s_test.out # single precision, real
+ build/TESTING/d_test.out # double precision, real
+ build/TESTING/c_test.out # single precision, complex
+ build/TESTING/z_test.out # double precision, complex
+
+ To install the library, type:
+ make install
--------------------
diff --git a/SRC/.dropbox.attr b/SRC/.dropbox.attr
new file mode 100755
index 0000000..9e26dfe
--- /dev/null
+++ b/SRC/.dropbox.attr
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt
index 7576295..bd70af2 100644
--- a/SRC/CMakeLists.txt
+++ b/SRC/CMakeLists.txt
@@ -232,10 +232,15 @@ target_link_libraries(superlu ${BLAS_LIB} m)
set_target_properties(superlu PROPERTIES
VERSION ${PROJECT_VERSION} SOVERSION ${VERSION_MAJOR}
)
+
+include(GNUInstallDirs)
+
install(TARGETS superlu
- DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
+# DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
install(FILES ${headers}
- DESTINATION ${CMAKE_INSTALL_PREFIX}/include
+# DESTINATION ${CMAKE_INSTALL_PREFIX}/include
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
)
diff --git a/SRC/Makefile b/SRC/Makefile
index 713a4a8..b8550ce 100644
--- a/SRC/Makefile
+++ b/SRC/Makefile
@@ -116,13 +116,6 @@ complex16: $(ZLUSRC) $(ALLAUX) $(DZLAUX)
$(ARCH) $(ARCHFLAGS) $(SUPERLULIB) $(ZLUSRC) $(ALLAUX) $(DZLAUX)
$(RANLIB) $(SUPERLULIB)
-
-##################################
-# Do not optimize these routines #
-##################################
-smach.o: smach.c ; $(CC) -c $(NOOPTS) $(CDEFS) $<
-dmach.o: dmach.c ; $(CC) -c $(NOOPTS) $(CDEFS) $<
-superlu_timer.o: superlu_timer.c ; $(CC) -c $(NOOPTS) $<
##################################
.c.o:
diff --git a/SRC/slu_util.h b/SRC/slu_util.h
index 656ef44..3177629 100644
--- a/SRC/slu_util.h
+++ b/SRC/slu_util.h
@@ -32,9 +32,25 @@ at the top-level directory.
#include <assert.h>
#include "superlu_enum_consts.h"
+
/***********************************************************************
* Macros
***********************************************************************/
+/*
+ * You can support older version of SuperLU.
+ * At compile-time, you can catch the new release as:
+ * #ifdef SUPERLU_MAIN_VERSION == 5
+ * use the new interface
+ * #else
+ * use the old interface
+ * #endif
+ * Versions 4.x and earlier do not include a #define'd version numbers.
+ */
+#define SUPERLU_MAJOR_VERSION 5
+#define SUPERLU_MINOR_VERSION 2
+#define SUPERLU_PATCH_VERSION 1
+
+
#define FIRSTCOL_OF_SNODE(i) (xsup[i])
/* No of marker arrays used in the symbolic factorization,
each of size n */
diff --git a/TESTING/.dropbox.attr b/TESTING/.dropbox.attr
new file mode 100755
index 0000000..9e26dfe
--- /dev/null
+++ b/TESTING/.dropbox.attr
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/TESTING/MATGEN/.dropbox.attr b/TESTING/MATGEN/.dropbox.attr
new file mode 100755
index 0000000..9e26dfe
--- /dev/null
+++ b/TESTING/MATGEN/.dropbox.attr
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/TESTING/Makefile b/TESTING/Makefile
index f6c4d15..e966bf0 100644
--- a/TESTING/Makefile
+++ b/TESTING/Makefile
@@ -54,7 +54,7 @@ single: ./stest stest.out
./stest: $(SLINTST) $(ALINTST) $(SUPERLULIB) $(TMGLIB)
$(LOADER) $(LOADOPTS) $(SLINTST) $(ALINTST) \
- $(TMGLIB) $(SUPERLULIB) $(BLASLIB) -lm -o $@
+ $(TMGLIB) $(LIBS) -lm -o $@
stest.out: stest stest.csh
@echo Testing SINGLE PRECISION linear equation routines
@@ -64,7 +64,7 @@ double: ./dtest dtest.out
./dtest: $(DLINTST) $(ALINTST) $(SUPERLULIB) $(TMGLIB)
$(LOADER) $(LOADOPTS) $(DLINTST) $(ALINTST) \
- $(TMGLIB) $(SUPERLULIB) $(BLASLIB) -lm -o $@
+ $(TMGLIB) $(LIBS) -lm -o $@
dtest.out: dtest dtest.csh
@echo Testing DOUBLE PRECISION linear equation routines
@@ -74,7 +74,7 @@ complex: ./ctest ctest.out
./ctest: $(CLINTST) $(ALINTST) $(SUPERLULIB) $(TMGLIB)
$(LOADER) $(LOADOPTS) $(CLINTST) $(ALINTST) \
- $(TMGLIB) $(SUPERLULIB) $(BLASLIB) -lm -o $@
+ $(TMGLIB) $(LIBS) -lm -o $@
ctest.out: ctest ctest.csh
@echo Testing SINGLE COMPLEX linear equation routines
@@ -84,7 +84,7 @@ complex16: ./ztest ztest.out
./ztest: $(ZLINTST) $(ALINTST) $(SUPERLULIB) $(TMGLIB)
$(LOADER) $(LOADOPTS) $(ZLINTST) $(ALINTST) \
- $(TMGLIB) $(SUPERLULIB) $(BLASLIB) -lm -o $@
+ $(TMGLIB) $(LIBS) -lm -o $@
ztest.out: ztest ztest.csh
@echo Testing DOUBLE COMPLEX linear equation routines
diff --git a/lib/.dropbox.attr b/lib/.dropbox.attr
new file mode 100755
index 0000000..9e26dfe
--- /dev/null
+++ b/lib/.dropbox.attr
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/make.inc.in b/make.inc.in
index 65897ce..3f07544 100644
--- a/make.inc.in
+++ b/make.inc.in
@@ -24,7 +24,7 @@ SUPERLULIB = $(SuperLUroot)/SRC/${PROJECT_NAME_LIB_EXPORT}
TMGLIB = libtmglib.a
# BLASDEF = -DUSE_VENDOR_BLAS
-
+BLASLIB = ${BLAS_LIB_EXPORT}
LIBS = $(SUPERLULIB) ${BLAS_LIB_EXPORT}
#
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/superlu.git
More information about the debian-science-commits
mailing list