Mercurial > octave
annotate libgui/link-deps.mk @ 17691:8a54a481ecb5
Massive speed improvement in sparse min/max functions for calls like
'max(s,[],2)' (bug #40268)
* dSparse.cc (SparseMatrix SparseMatrix::max (Array<octave_idx-type>&, int)) :
Remove triple loop by using a local buffer
(SparseMatrix SparseMatrix::min (Array<octave_idx-type>&, int)) : ditto
* CSparse.cc (SparseComplexMatrix SparseComplexMatrix::max (
Array<octave_idx-type>&, int)) : Remove triple loop by using a local buffer
(SparseComplexMatrix SparseComplexMatrix::min (Array<octave_idx-type>&,
int)) : ditto
author | David Bateman <dbateman@free.fr> |
---|---|
date | Fri, 18 Oct 2013 23:44:44 +0200 |
parents | 5f031158c693 |
children | 39844e6ccf13 |
rev | line source |
---|---|
15208
2a36a5b89f98
link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1 include $(top_srcdir)/libinterp/link-deps.mk |
2a36a5b89f98
link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2 |
2a36a5b89f98
link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
3 if AMCOND_ENABLE_DYNAMIC_LINKING |
2a36a5b89f98
link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
4 LIBOCTGUI_LINK_DEPS = |
2a36a5b89f98
link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
5 else |
2a36a5b89f98
link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
6 LIBOCTGUI_LINK_DEPS = $(DLDFCN_LIBS) |
2a36a5b89f98
link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
7 endif |
2a36a5b89f98
link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
8 |
2a36a5b89f98
link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
9 LIBOCTGUI_LINK_DEPS += \ |
15596
5f031158c693
Use pkg-config to discover Qt (pkg-config is already a requirement anyway).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15362
diff
changeset
|
10 @QT_LIBS@ |
15208
2a36a5b89f98
link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
11 |
2a36a5b89f98
link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
12 LIBOCTGUI_LINK_OPTS = \ |
15596
5f031158c693
Use pkg-config to discover Qt (pkg-config is already a requirement anyway).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15362
diff
changeset
|
13 @QT_LDFLAGS@ |
15208
2a36a5b89f98
link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
14 |
2a36a5b89f98
link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
15 if AMCOND_LINK_ALL_DEPS |
2a36a5b89f98
link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
16 LIBOCTGUI_LINK_DEPS += $(LIBOCTINTERP_LINK_DEPS) |
2a36a5b89f98
link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
17 LIBOCTGUI_LINK_OPTS += $(LIBOCTINTERP_LINK_OPTS) |
2a36a5b89f98
link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
18 |
2a36a5b89f98
link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
19 OCTAVE_GUI_LINK_DEPS = $(LIBOCTGUI_LINK_DEPS) |
2a36a5b89f98
link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
20 OCTAVE_GUI_LINK_OPTS = $(LIBOCTGUI_LINK_OPTS) |
2a36a5b89f98
link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
21 endif |