commit: 1496acd9218105c712fedfadb0820f184e2d1e34
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sun Jul 18 21:44:09 2021 +0000
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Sun Jul 18 21:46:20 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1496acd9
sys-cluster/clusteringsuite: enforce muster
also prepare for treedbscan if upstream will fix it
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
sys-cluster/clusteringsuite/Manifest | 2 +-
...9-r2.ebuild => clusteringsuite-2.6.9-r3.ebuild} | 36 +++++--
.../clusteringsuite/clusteringsuite-2.6.9.ebuild | 103 ------------------
...uite-2.6.9-do-not-add-boost-thread-ldpath.patch | 15 +++
...steringsuite-2.6.9-force-muster-discovery.patch | 37 +++++++
.../clusteringsuite-2.6.9-unbundle-libANN.patch | 116 +--------------------
6 files changed, 84 insertions(+), 225 deletions(-)
diff --git a/sys-cluster/clusteringsuite/Manifest
b/sys-cluster/clusteringsuite/Manifest
index fa6804d47..4430bcae4 100644
--- a/sys-cluster/clusteringsuite/Manifest
+++ b/sys-cluster/clusteringsuite/Manifest
@@ -1 +1 @@
-DIST clusteringsuite-2.6.9-src.tar.bz2 8081023 BLAKE2B
d53e08a51e0a5a2d487bc4413c19d802804b7ae79b5f1e7c466ba2c37e36d90864a4629f51a98ca5caa83f4cc0a3ca8c74f5652c044c08591c65f3b50acf13d2
SHA512
80903e3d2c018e8ed23874715f7ffc1706ac5d9dcd0826c75bb07c973c28fa9755d4c130021abd6e969e983fbe23463be7361bb29b6d1ab04596ba4f987b1b6a
+DIST clusteringsuite-2.6.9.tar.gz 6964570 BLAKE2B
bb4823d9918bc12707ae09d0c1220552b2621bfe39ab67dd67e03fba91036f2c8ed294f54a2bdd659b8bd58925aca02db85eb93986fe69e999e5b2bef915b564
SHA512
9df9ca57fc68b9cd7d17f13c1b915e3422a07c71f060ff2e7a38a31cf6e1aa234b869402bda6b7502c4844e25593156a1bb50714c2d272bafd10cd7690fc17eb
diff --git a/sys-cluster/clusteringsuite/clusteringsuite-2.6.9-r2.ebuild
b/sys-cluster/clusteringsuite/clusteringsuite-2.6.9-r3.ebuild
similarity index 62%
rename from sys-cluster/clusteringsuite/clusteringsuite-2.6.9-r2.ebuild
rename to sys-cluster/clusteringsuite/clusteringsuite-2.6.9-r3.ebuild
index 7da3d3563..efb4a4090 100644
--- a/sys-cluster/clusteringsuite/clusteringsuite-2.6.9-r2.ebuild
+++ b/sys-cluster/clusteringsuite/clusteringsuite-2.6.9-r3.ebuild
@@ -1,41 +1,47 @@
# Copyright 2019-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=8
+EAPI=7
PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit python-any-r1
+inherit autotools python-any-r1
DESCRIPTION="Expose the main performance trends in applications computation
structure"
HOMEPAGE="
https://tools.bsc.es/cluster-analysis
https://github.com/bsc-performance-tools/clustering-suite
"
-SRC_URI="https://ftp.tools.bsc.es/clusteringsuite/clusteringsuite-${PV}-src.tar.bz2";
+SRC_URI="https://codeload.github.com/bsc-performance-tools/clustering-suite/tar.gz/refs/tags/${PV}
-> ${P}.tar.gz"
+S="${WORKDIR}/clustering-suite-${PV}"
LICENSE="LGPL-2.1+"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="doc mpi muster"
-#TODO: treedbscan
+IUSE="doc mpi muster" # treedbscan
-PATCHES=( "${FILESDIR}/${P}-unbundle-libANN.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-unbundle-libANN.patch"
+ "${FILESDIR}/${P}-do-not-add-boost-thread-ldpath.patch"
+)
RDEPEND="
+ app-arch/bzip2
dev-libs/boost:=
sci-libs/ann
sys-cluster/libbsctools
mpi? ( virtual/mpi )
muster? ( sys-cluster/muster )
"
+# https://github.com/bsc-performance-tools/clustering-suite/issues/8
# treedbscan? (
-# dev-libs/boost[threads]:=
+# dev-libs/boost:=[threads]
# dev-libs/gmp
# dev-libs/mpfr
-# sci-mathematics/cgal
+# sci-mathematics/cgal[shared]
# sys-cluster/synapse
-#)
+# )
+#"
DEPEND="
${RDEPEND}
@@ -44,9 +50,21 @@ DEPEND="
BDEPEND="doc? ( app-doc/doxygen )"
src_prepare() {
+ use muster && PATCHES+=(
"${FILESDIR}/${P}-force-muster-discovery.patch" )
rm -r src/libANN || die
# rm -r pcfparser_svn3942 || die
default
+ sed -e "s|iterate/lib|iterate/$(get_libdir)|g" -i config/gmp_mpfr.m4 ||
die
+ sed -e "s|dir/lib|dir/$(get_libdir)|g" -i config/ax_muster.m4 || die
+
+ #from bootstrap
+ echo
"#*********************************************************************" >>
configure.ac || die
+ echo "#'configure.ac.' automatically generated by 'autogen.sh' do not
modify" >> configure.ac || die
+ echo
"#*********************************************************************" >>
configure.ac || die
+ echo "" >> configure.ac || die
+ sed s/@@VERSION_NUMBER@@/${PV}/ < configure.ac.template >> configure.ac
|| die
+
+ AT_M4DIR="config" eautoreconf
}
src_configure() {
diff --git a/sys-cluster/clusteringsuite/clusteringsuite-2.6.9.ebuild
b/sys-cluster/clusteringsuite/clusteringsuite-2.6.9.ebuild
deleted file mode 100644
index 51a9d25b0..000000000
--- a/sys-cluster/clusteringsuite/clusteringsuite-2.6.9.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
-inherit python-any-r1
-
-DESCRIPTION="Expose the main performance trends in applications computation
structure"
-HOMEPAGE="
- https://tools.bsc.es/cluster-analysis
- https://github.com/bsc-performance-tools/clustering-suite
-"
-SRC_URI="https://ftp.tools.bsc.es/clusteringsuite/clusteringsuite-${PV}-src.tar.bz2";
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc mpi old-pcfparser"
-#TODO: muster treedbscan
-#TODO: unbundle ANN
-
-#PATCHES=( "${FILESDIR}/respect-flags.patch" )
-
-RDEPEND="
- dev-libs/boost:=
- sci-libs/ann
- mpi? ( virtual/mpi )
-"
-# treedbscan? (
-# dev-libs/boost[threads]:=
-# dev-libs/gmp
-# dev-libs/mpfr
-# sci-mathematics/cgal
-# sys-cluster/synapse
-#)
-
-DEPEND="
- ${RDEPEND}
- ${PYTHON_DEPS}
-"
-BDEPEND="doc? ( app-doc/doxygen )"
-
-src_configure() {
-
- local myconf=(
- --disable-static
- --disable-static-boost
- --enable-shared
- --with-boost="${EPREFIX}/usr"
- --with-pic
-
- $(use_enable old-pcfparser)
- )
-
- if use mpi; then
- myconf+=( "--with-mpi=${EPREFIX}/usr" )
- else
- myconf+=( "--without-mpi" )
- fi
-# if use muster; then
-# myconf+=( "--with-muster=${EPREFIX}/usr" )
-# else
- myconf+=( "--without-muster" )
-# fi
-# if use treedbscan; then
-# myconf+=( "--enable-treedbscan" )
-# myconf+=( "--with-cgal=${EPREFIX}/usr" )
-# myconf+=( "--with-gmp=${EPREFIX}/usr" )
-# myconf+=( "--with-mpfr=${EPREFIX}/usr" )
-# myconf+=( "--with-synapse=${EPREFIX}/usr" )
-# else
- myconf+=( "--without-cgal" )
- myconf+=( "--without-gmp" )
- myconf+=( "--without-mpfr" )
- myconf+=( "--without-synapse" )
-# fi
-
- econf "${myconf[@]}" || die
-}
-
-src_compile() {
- export VARTEXFONTS="${T}/fonts"
- if use doc ; then
- pushd doc || die
- emake build-documentation
- popd
- fi
- default
-}
-
-src_install() {
- MAKEOPTS="-j1" DESTDIR="${D}" emake install
-
- cd doc || die
- dodoc -r *.pdf
-
- rm "${ED}/usr/share/doc/clusteringsuite_manual.pdf" || die
- mv "${ED}/usr/share/example" "${ED}/usr/share/doc/${PF}/examples" || die
- docompress -x "/usr/share/doc/${PF}/examples"
-
- find "${ED}" -name '*.la' -delete || die
-}
diff --git
a/sys-cluster/clusteringsuite/files/clusteringsuite-2.6.9-do-not-add-boost-thread-ldpath.patch
b/sys-cluster/clusteringsuite/files/clusteringsuite-2.6.9-do-not-add-boost-thread-ldpath.patch
new file mode 100644
index 000000000..655cdcfbc
--- /dev/null
+++
b/sys-cluster/clusteringsuite/files/clusteringsuite-2.6.9-do-not-add-boost-thread-ldpath.patch
@@ -0,0 +1,15 @@
+--- a/configure.ac.template
++++ b/configure.ac.template
+@@ -417,12 +417,10 @@
+
+ if test "x$BOOST_THREAD_LIBS" != "x"; then
+
+- CLUSTERING_CLEAN_LDFLAGS="${CLUSTERING_CLEAN_LDFLAGS}
-L${BOOST_THREAD_LDPATH}"
+ CLUSTERING_LIBS="${CLUSTERING_LIBS} ${BOOST_THREAD_LIBS}"
+
+ AX_CHECK_IS_SYSTEM_LIBRARY_PATH([${BOOST_THREAD_LDPATH}],[],
+ [
+- CLUSTERING_LDFLAGS="${CLUSTERING_LDFLAGS} -L${BOOST_THREAD_LDPATH}
-R${BOOST_THREAD_LDPATH}"
+
CLUSTERING_LD_LIBRARY_PATH="${CLUSTERING_LD_LIBRARY_PATH}:${BOOST_THREAD_LDPATH}"
+ ])
+ else
diff --git
a/sys-cluster/clusteringsuite/files/clusteringsuite-2.6.9-force-muster-discovery.patch
b/sys-cluster/clusteringsuite/files/clusteringsuite-2.6.9-force-muster-discovery.patch
new file mode 100644
index 000000000..f9c533b2b
--- /dev/null
+++
b/sys-cluster/clusteringsuite/files/clusteringsuite-2.6.9-force-muster-discovery.patch
@@ -0,0 +1,37 @@
+--- a/config/ax_muster.m4
++++ b/config/ax_muster.m4
+@@ -6,21 +6,11 @@
+ [--with-muster=MUSTER_DIR],
+ [sets the given directory as location of muster includes and libs
(needs Boost libraries)]
+ ),
+- [muster_dir="$withval"]
+- [muster_dir="/usr)"]
++ [muster_dir="$withval"],
++ [muster_dir="/usr"]
+ )
+
+- ac_muster_installed="yes"
+-
+- if test ! -f $muster_dir/include/partition.h; then
+- ac_muster_installed="no"
+- fi
+-
+- if test ! -f $muster_dir/lib/libmuster.so; then
+- ac_muster_installed="no"
+- fi
+-
+- if test "x${ac_muster_enabled}" = "xyes"; then
++ ac_muster_installed="yes"
+
+ MUSTER_CPPFLAGS="-I$muster_dir/include"
+ MUSTER_LDFLAGS="-L$muster_dir/lib -R$muster_dir/lib"
+@@ -36,9 +26,5 @@
+
+ # execute ACTION-IF-FOUND
+ ifelse([$1], , :, [$1])
+- else
+- # execute ACTION-IF-NOT-FOUND
+- ifelse([$2], , :, [$2])
+- fi
+
+ ])
diff --git
a/sys-cluster/clusteringsuite/files/clusteringsuite-2.6.9-unbundle-libANN.patch
b/sys-cluster/clusteringsuite/files/clusteringsuite-2.6.9-unbundle-libANN.patch
index fd6e15517..8df36e156 100644
---
a/sys-cluster/clusteringsuite/files/clusteringsuite-2.6.9-unbundle-libANN.patch
+++
b/sys-cluster/clusteringsuite/files/clusteringsuite-2.6.9-unbundle-libANN.patch
@@ -1,25 +1,6 @@
---- a/configure
-+++ b/configure
-@@ -19970,7 +19970,7 @@
-
-
-
--ac_config_files="$ac_config_files Makefile include/Makefile
common_utilities/Makefile pcfparser_svn3942/Makefile src/Makefile
src/BasicClasses/Makefile src/libParaverTraceParser/Makefile
src/libSharedComponents/Makefile src/libSharedComponents/kalign2/Makefile
src/libANN/Makefile src/libClustering/gmeans/Makefile
src/libClustering/Makefile src/libTraceClustering/Makefile
src/DBSCANParametersApproximation/Makefile src/BurstClustering/Makefile
src/ClusteringDataExtractor/Makefile src/ClustersDiff/Makefile
src/ClustersSequenceScore/Makefile scripts/Makefile
src/MusterDistributedClustering/Makefile src/libDistributedClustering/Makefile
src/TreeDBSCAN/Makefile src/TreeDBSCAN/scripts/Makefile doc/Makefile"
-+ac_config_files="$ac_config_files Makefile include/Makefile
common_utilities/Makefile pcfparser_svn3942/Makefile src/Makefile
src/BasicClasses/Makefile src/libParaverTraceParser/Makefile
src/libSharedComponents/Makefile src/libSharedComponents/kalign2/Makefile
src/libClustering/gmeans/Makefile src/libClustering/Makefile
src/libTraceClustering/Makefile src/DBSCANParametersApproximation/Makefile
src/BurstClustering/Makefile src/ClusteringDataExtractor/Makefile
src/ClustersDiff/Makefile src/ClustersSequenceScore/Makefile scripts/Makefile
src/MusterDistributedClustering/Makefile src/libDistributedClustering/Makefile
src/TreeDBSCAN/Makefile src/TreeDBSCAN/scripts/Makefile doc/Makefile"
-
-
- ac_config_links="$ac_config_links include/types.h:include/types.h
common_utilities/Error.hpp:common_utilities/Error.hpp
src/BasicClasses/Error.hpp:src/BasicClasses/Error.hpp
common_utilities/EventEncoding.h:common_utilities/EventEncoding.h
common_utilities/Dimemas_Generation.h:common_utilities/Dimemas_Generation.h
common_utilities/ParaverColors.h:common_utilities/ParaverColors.h
src/BasicClasses/Utilities.hpp:src/BasicClasses/Utilities.hpp
src/BasicClasses/SystemMessages.hpp:src/BasicClasses/SystemMessages.hpp
src/BasicClasses/Timer.hpp:src/BasicClasses/Timer.hpp
src/BasicClasses/FileNameManipulator.hpp:src/BasicClasses/FileNameManipulator.hpp
doc/clusteringsuite_manual.tex:doc/clusteringsuite_manual.tex
doc/clusteringsuite_manual.pdf:doc/clusteringsuite_manual.pdf
doc/clustering_manual_structure.txt:doc/clustering_manual_structure.txt
doc/clusteringsuite_design.tex:doc/clusteringsuite_design.tex
doc/clusteringsuite_bsctools.pdf:doc/clusteringsuite_bsctools.pdf
doc/clusteringsuite_
design.pdf:doc/clusteringsuite_design.pdf
doc/figure_sources/uml_design/libclustering_uml.pdf:doc/figure_sources/uml_design/libclustering_uml.pdf
doc/figure_sources/uml_design/libtraceclustering_uml.pdf:doc/figure_sources/uml_design/libtraceclustering_uml.pdf
doc/figure_sources/uml_design/libClustering_uml.graffle:doc/figure_sources/uml_design/libClustering_uml.graffle
doc/figure_sources/uml_design/libTraceClustering_uml.graffle:doc/figure_sources/uml_design/libTraceClustering_uml.graffle
doc/figure_sources/plots_example/int_vs_fop_plot.pdf:doc/figure_sources/plots_example/int_vs_fop_plot.pdf
doc/figure_sources/plots_example/inst_vs_ipc_plot.pdf:doc/figure_sources/plots_example/inst_vs_ipc_plot.pdf
doc/figure_sources/plots_example/mainmem_vs_l2_plot.pdf:doc/figure_sources/plots_example/mainmem_vs_l2_plot.pdf
doc/figure_sources/plots_example/int_vs_fop_plot.png:doc/figure_sources/plots_example/int_vs_fop_plot.png
doc/figure_sources/plots_example/inst_vs_ipc_plot.png:doc/figure_source
s/plots_example/inst_vs_ipc_plot.png
doc/figure_sources/plots_example/stores_vs_loads_plot.pdf:doc/figure_sources/plots_example/stores_vs_loads_plot.pdf
doc/figure_sources/plots_example/stores_vs_loads_plot.png:doc/figure_sources/plots_example/stores_vs_loads_plot.png
doc/figure_sources/plots_example/mainmem_vs_l2_plot.png:doc/figure_sources/plots_example/mainmem_vs_l2_plot.png
doc/figure_sources/stats_plot/GADGET-DEISA.MEDIUM.256.1HWCG.chop1.bursts.dat:doc/figure_sources/stats_plot/GADGET-DEISA.MEDIUM.256.1HWCG.chop1.bursts.dat
doc/figure_sources/stats_plot/GADGET-DEISA.MEDIUM.256.1HWCG.chop1.bursts.gnuplot:doc/figure_sources/stats_plot/GADGET-DEISA.MEDIUM.256.1HWCG.chop1.bursts.gnuplot
doc/figure_sources/stats_plot/stats_plot.pdf:doc/figure_sources/stats_plot/stats_plot.pdf
doc/figure_sources/clustering_xml/xml_plot_definition.pdf:doc/figure_sources/clustering_xml/xml_plot_definition.pdf
doc/figure_sources/clustering_xml/xml_structure.pdf:doc/figure_sources/clustering_xml/xml_stru
cture.pdf
doc/figure_sources/clustering_xml/xml_single_event_definition.pdf:doc/figure_sources/clustering_xml/xml_single_event_definition.pdf
doc/figure_sources/clustering_xml/xml_mixed_events_definition.pdf:doc/figure_sources/clustering_xml/xml_mixed_events_definition.pdf
doc/figure_sources/clustering_xml/xml_algorithm_definition.pdf:doc/figure_sources/clustering_xml/xml_algorithm_definition.pdf
doc/figure_sources/clustering_xml/clustering_xml_definition.graffle:doc/figure_sources/clustering_xml/clustering_xml_definition.graffle
doc/cluster_analysis_thesis_bibliography.bib:doc/cluster_analysis_thesis_bibliography.bib
doc/extra_commands.tex:doc/extra_commands.tex
doc/figures/uml_design/libclustering_uml.pdf:doc/figures/uml_design/libclustering_uml.pdf
doc/figures/uml_design/libtraceclustering_uml.pdf:doc/figures/uml_design/libtraceclustering_uml.pdf
doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.LD_vs_ST.gnuplot:doc/figure_sources/plots_example/
GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.LD_vs_ST.gnuplot
doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.L2DATA_vs_MainMEMData.gnuplot:doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.L2DATA_vs_MainMEMData.gnuplot
doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.CLUSTERED.FULL_POINTS.Cluster3.csv:doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.CLUSTERED.FULL_POINTS.Cluster3.csv
doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.L2DATA_vs_MainMEMData.PNG.gnuplot:doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.L2DATA_vs_MainMEMData.PNG.gnuplot
doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.CLUSTERED.FULL_POINTS.Cluster1.csv:doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.CLUSTERED.FULL_
POINTS.Cluster1.csv
doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.FPU_vs_FXU.PNG.gnuplot:doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.FPU_vs_FXU.PNG.gnuplot
doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.CLUSTERED.FULL_POINTS.Cluster4.csv:doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.CLUSTERED.FULL_POINTS.Cluster4.csv
doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.FPU_vs_FXU.gnuplot:doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.FPU_vs_FXU.gnuplot
doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.LD_vs_ST.PNG.gnuplot:doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.LD_vs_ST.PNG.gnuplot
doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.INST_vs_IPC.gnup
lot:doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.INST_vs_IPC.gnuplot
doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.INST_vs_IPC.PNG.gnuplot:doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.INST_vs_IPC.PNG.gnuplot
doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.CLUSTERED.FULL_POINTS.Cluster2.csv:doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.CLUSTERED.FULL_POINTS.Cluster2.csv
doc/figures/plots_example/int_vs_fop_plot.pdf:doc/figures/plots_example/int_vs_fop_plot.pdf
doc/figures/plots_example/inst_vs_ipc_plot.pdf:doc/figures/plots_example/inst_vs_ipc_plot.pdf
doc/figures/plots_example/mainmem_vs_l2_plot.pdf:doc/figures/plots_example/mainmem_vs_l2_plot.pdf
doc/figures/plots_example/int_vs_fop_plot.png:doc/figures/plots_example/int_vs_fop_plot.png
doc/figures/plots_example/inst_vs_ipc_plot.png:doc/fig
ures/plots_example/inst_vs_ipc_plot.png
doc/figures/plots_example/stores_vs_loads_plot.pdf:doc/figures/plots_example/stores_vs_loads_plot.pdf
doc/figures/plots_example/stores_vs_loads_plot.png:doc/figures/plots_example/stores_vs_loads_plot.png
doc/figures/plots_example/mainmem_vs_l2_plot.png:doc/figures/plots_example/mainmem_vs_l2_plot.png
doc/figures/stats_plot/stats_plot.pdf:doc/figures/stats_plot/stats_plot.pdf
doc/figures/refinement_tree/refinement_tree.pdf:doc/figures/refinement_tree/refinement_tree.pdf
doc/figures/clustering_xml/xml_plot_definition.pdf:doc/figures/clustering_xml/xml_plot_definition.pdf
doc/figures/clustering_xml/xml_structure.pdf:doc/figures/clustering_xml/xml_structure.pdf
doc/figures/clustering_xml/xml_single_event_definition.pdf:doc/figures/clustering_xml/xml_single_event_definition.pdf
doc/figures/clustering_xml/xml_mixed_events_definition.pdf:doc/figures/clustering_xml/xml_mixed_events_definition.pdf
doc/figures/clustering_xml/xml_algorithm_definition.pdf
:doc/figures/clustering_xml/xml_algorithm_definition.pdf
doc/figures/paraver_example/paraver_clusters_timeline.png:doc/figures/paraver_example/paraver_clusters_timeline.png
doc/figures/paraver_example/paraver_clusters_profile.png:doc/figures/paraver_example/paraver_clusters_profile.png
doc/figures/sequences_example/gromacs_step10_sequences.png:doc/figures/sequences_example/gromacs_step10_sequences.png
doc/figures/sequences_example/sequences_clustalx.png:doc/figures/sequences_example/sequences_clustalx.png
example/README:example/README
example/su3.lat256_2it.16tasks.pcf:example/su3.lat256_2it.16tasks.pcf
example/su3.lat256_2it.16tasks.row:example/su3.lat256_2it.16tasks.row
example/cluster_explained.xml:example/cluster_explained.xml
example/cluster.xml:example/cluster.xml
example/su3.lat256_2it.16tasks.prv:example/su3.lat256_2it.16tasks.prv"
-@@ -21184,7 +21184,6 @@
- "src/libParaverTraceParser/Makefile") CONFIG_FILES="$CONFIG_FILES
src/libParaverTraceParser/Makefile" ;;
- "src/libSharedComponents/Makefile") CONFIG_FILES="$CONFIG_FILES
src/libSharedComponents/Makefile" ;;
- "src/libSharedComponents/kalign2/Makefile") CONFIG_FILES="$CONFIG_FILES
src/libSharedComponents/kalign2/Makefile" ;;
-- "src/libANN/Makefile") CONFIG_FILES="$CONFIG_FILES src/libANN/Makefile" ;;
- "src/libClustering/gmeans/Makefile") CONFIG_FILES="$CONFIG_FILES
src/libClustering/gmeans/Makefile" ;;
- "src/libClustering/Makefile") CONFIG_FILES="$CONFIG_FILES
src/libClustering/Makefile" ;;
- "src/libTraceClustering/Makefile") CONFIG_FILES="$CONFIG_FILES
src/libTraceClustering/Makefile" ;;
---- a/configure.ac
-+++ b/configure.ac
-@@ -552,7 +552,6 @@
+--- a/configure.ac.template
++++ b/configure.ac.template
+@@ -548,7 +548,6 @@
src/libParaverTraceParser/Makefile
src/libSharedComponents/Makefile
src/libSharedComponents/kalign2/Makefile
@@ -50,30 +31,6 @@
./gmeans/libInternalGMeans.la \
@CLUSTERING_LIBS@
---- a/src/libClustering/Makefile.in
-+++ b/src/libClustering/Makefile.in
-@@ -155,7 +155,6 @@
- LTLIBRARIES = $(lib_LTLIBRARIES)
- libClustering_la_DEPENDENCIES = \
- $(top_builddir)/src/BasicClasses/libBasicClasses.la \
-- $(top_builddir)/src/libANN/libANN.la \
- ./gmeans/libInternalGMeans.la
- am__libClustering_la_SOURCES_DIST = Classifier.hpp \
- ClusteringAlgorithm.hpp ClusteringAlgorithmsFactory.cpp \
-@@ -530,11 +529,10 @@
- NearestNeighbourClassifier.hpp Point.cpp Point.hpp \
- clustering_types.h Partition.hpp Partition.cpp $(am__append_2) \
- $(am__append_3) $(am__append_4)
--libClustering_la_CPPFLAGS = @CLUSTERING_CPPFLAGS@ -I$(top_srcdir)/src/libANN
--libClustering_la_LDFLAGS = @CLUSTERING_LDFLAGS@ @CLUSTERING_CPPFLAGS@
-+libClustering_la_CPPFLAGS = @CLUSTERING_CPPFLAGS@ -I/usr/include/ANN
-+libClustering_la_LDFLAGS = @CLUSTERING_LDFLAGS@ @CLUSTERING_CPPFLAGS@ -lann
- libClustering_la_LIBADD = \
- $(top_builddir)/src/BasicClasses/libBasicClasses.la \
-- $(top_builddir)/src/libANN/libANN.la \
- ./gmeans/libInternalGMeans.la \
- @CLUSTERING_LIBS@
-
--- a/src/libDistributedClustering/Makefile.am
+++ b/src/libDistributedClustering/Makefile.am
@@ -32,7 +32,7 @@
@@ -85,17 +42,6 @@
libDistributedClustering_la_LDFLAGS = @CLUSTERING_LDFLAGS@
@CLUSTERING_CPPFLAGS@
libDistributedClustering_la_LIBADD= \
---- a/src/libDistributedClustering/Makefile.in
-+++ b/src/libDistributedClustering/Makefile.in
-@@ -446,7 +446,7 @@
- -I$(top_srcdir)/src/libSharedComponents\
- -I$(top_srcdir)/pcfparser_svn3942\
- -I$(top_srcdir)/src/libParaverTraceParser\
-- -I$(top_srcdir)/src/libANN
-+ -I/usr/include/ANN
-
- libDistributedClustering_la_LDFLAGS = @CLUSTERING_LDFLAGS@
@CLUSTERING_CPPFLAGS@
- libDistributedClustering_la_LIBADD = \
--- a/src/libSharedComponents/Makefile.am
+++ b/src/libSharedComponents/Makefile.am
@@ -76,7 +76,7 @@
@@ -107,17 +53,6 @@
if MAKE_OLD_PCFPARSER
libSharedComponents_la_CPPFLAGS += -I${top_srcdir}/pcfparser_svn3942/old
else
---- a/src/libSharedComponents/Makefile.in
-+++ b/src/libSharedComponents/Makefile.in
-@@ -551,7 +551,7 @@
- libSharedComponents_la_CPPFLAGS = @CLUSTERING_CPPFLAGS@ \
- -I${top_srcdir}/src/libClustering \
- -I${top_srcdir}/src/libParaverTraceParser \
-- -I${top_srcdir}/src/libANN $(am__append_2) $(am__append_3)
-+ -I/usr/include/ANN $(am__append_2) $(am__append_3)
- libSharedComponents_la_LDFLAGS = @CLUSTERING_LDFLAGS@ @CLUSTERING_CPPFLAGS@
- libSharedComponents_la_LIBADD = \
- $(top_builddir)/pcfparser_svn3942/libparavertraceconfig.la \
--- a/src/libTraceClustering/Makefile.am
+++ b/src/libTraceClustering/Makefile.am
@@ -7,7 +7,7 @@
@@ -134,30 +69,10 @@
-I$(top_srcdir)/src/libSharedComponents\
-I$(top_srcdir)/pcfparser_svn3942\
- -I$(top_srcdir)/src/libANN\
-+ -I/usr/include/ANN \
++ -I/usr/include/ANN\
-I$(top_srcdir)/src/libParaverTraceParser
libTraceClustering_la_LDFLAGS = @CLUSTERING_CPPFLAGS@ @CLUSTERING_LDFLAGS@
---- a/src/libTraceClustering/Makefile.in
-+++ b/src/libTraceClustering/Makefile.in
-@@ -418,7 +418,7 @@
- AM_CPPFLAGS = \
- -I$(top_srcdir)/include \
- -I$(top_srcdir)/src/BasicClasses \
-- -I$(top_srcdir)/src/libANN \
-+ -I/usr/include/ANN \
- -I$(top_srcdir)/src/libSharedComponents \
- -I$(top_srcdir)/src/libParaverTraceParser \
- -I$(top_srcdir)/common_utilities \
-@@ -438,7 +438,7 @@
- -I$(top_srcdir)/src/libClustering\
- -I$(top_srcdir)/src/libSharedComponents\
- -I$(top_srcdir)/pcfparser_svn3942\
-- -I$(top_srcdir)/src/libANN\
-+ -I/usr/include/ANN \
- -I$(top_srcdir)/src/libParaverTraceParser
-
- libTraceClustering_la_LDFLAGS = @CLUSTERING_CPPFLAGS@ @CLUSTERING_LDFLAGS@
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,6 @@
@@ -168,26 +83,3 @@
libClustering \
libSharedComponents \
libTraceClustering \
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -151,7 +151,7 @@
- done | $(am__uniquify_input)`
- ETAGS = etags
- CTAGS = ctags
--DIST_SUBDIRS = BasicClasses libParaverTraceParser libANN libClustering \
-+DIST_SUBDIRS = BasicClasses libParaverTraceParser libClustering \
- libSharedComponents libTraceClustering ClusteringDataExtractor \
- DBSCANParametersApproximation BurstClustering ClustersDiff \
- ClustersSequenceScore MusterDistributedClustering \
-@@ -380,10 +380,9 @@
- CLUSTERING_DIR = $(SRC_DIR)/libClustering
- CLUSTERING_ALG_DIR = $(SRC_DIR)/libClusteringAlgorithms
- PARAVER_PARSER_DIR = $(SRC_DIR)/libParaverTraceParser
--ANN_DIR = $(SRC_DIR)/libANN
-
- # common_filesdir = @common_filesdir@
--SUBDIRS = BasicClasses libParaverTraceParser libANN libClustering \
-+SUBDIRS = BasicClasses libParaverTraceParser libClustering \
- libSharedComponents libTraceClustering ClusteringDataExtractor \
- DBSCANParametersApproximation BurstClustering ClustersDiff \
- ClustersSequenceScore $(am__append_1) $(am__append_2)
