Commit 1c34e342 authored by Alexandre Duret-Lutz's avatar Alexandre Duret-Lutz
Browse files

Rename src/benchs/ as src/bench/

parent da598395
2008-11-21 Alexandre Duret-Lutz <adl@lrde.epita.fr>
Change all occurences of benchs and benches to either bench (in
filenames and targets) or benchmarks (in text).
* Makefile.am, bootstrap, configure.ac, doc/manual/developer.tex,
src/Makefile.am: Adjust to the following renamings.
* src/benchs/Makefile.am: Rename to src/bench/Makefile.am
* src/benchs/common/Makefile.am: Rename to src/bench/common/Makefile.am
* src/benchs/common/alpha.syms: Rename to src/bench/common/alpha.syms
* src/benchs/common/bench.mk: Rename to src/bench/common/bench.mk
* src/benchs/common/bench_automaton.hh: Rename to
src/bench/common/bench_automaton.hh
* src/benchs/common/bench_constructs.hh: Rename to
src/bench/common/bench_constructs.hh
* src/benchs/composition/Makefile.bench: Rename to
src/bench/composition/Makefile.bench
* src/benchs/composition/normalized_composition_bench.hh: Rename to
src/bench/composition/normalized_composition_bench.hh
* src/benchs/composition/rw_composition_bench.hh: Rename to
src/bench/composition/rw_composition_bench.hh
* src/benchs/derived_terms/Makefile.bench: Rename to
src/bench/derived_terms/Makefile.bench
* src/benchs/derived_terms/derived_terms_bench.hh: Rename to
src/bench/derived_terms/derived_terms_bench.hh
* src/benchs/determinization/Makefile.bench: Rename to
src/bench/determinization/Makefile.bench
* src/benchs/determinization/determinization_bench.hh: Rename to
src/bench/determinization/determinization_bench.hh
* src/benchs/determinization/determinization_bench_fsm.cc: Rename to
src/bench/determinization/determinization_bench_fsm.cc
* src/benchs/eps_removal/Makefile.bench: Rename to
src/bench/eps_removal/Makefile.bench
* src/benchs/eps_removal/eps_removal_bench.hh: Rename to
src/bench/eps_removal/eps_removal_bench.hh
* src/benchs/generate_benchs.sh: Rename to src/bench/generate_bench.sh
Also to not EXTRA_DIST Makefile.bench files, Automake will already
distribute them since they are included by a Makefile.am
* src/benchs/iterators/Makefile.bench: Rename to
src/bench/iterators/Makefile.bench
* src/benchs/iterators/accessible_bench.hh: Rename to
src/bench/iterators/accessible_bench.hh
* src/benchs/iterators/iterator_bench.hh: Rename to
src/bench/iterators/iterator_bench.hh
* src/benchs/minimization_2n/Makefile.bench: Rename to
src/bench/minimization_2n/Makefile.bench
* src/benchs/minimization_2n/minimization_2n_brzozowski_bench.hh:
Rename to src/bench/minimization_2n/minimization_2n_brzozowski_bench.hh
* src/benchs/minimization_2n/minimization_2n_hopcroft_bench.hh: Rename
to src/bench/minimization_2n/minimization_2n_hopcroft_bench.hh
* src/benchs/minimization_2n/minimization_2n_moore_bench.hh: Rename to
src/bench/minimization_2n/minimization_2n_moore_bench.hh
* src/benchs/minimization_debruijn/Makefile.bench: Rename to
src/bench/minimization_debruijn/Makefile.bench
* src/benchs/minimization_debruijn/minimization_debruijn_brzozowski_bench.hh:
Rename to
src/bench/minimization_debruijn/minimization_debruijn_brzozowski_bench.hh
* src/benchs/minimization_debruijn/minimization_debruijn_hopcroft_bench.hh:
Rename to
src/bench/minimization_debruijn/minimization_debruijn_hopcroft_bench.hh
* src/benchs/minimization_debruijn/minimization_debruijn_moore_bench.hh:
Rename to
src/bench/minimization_debruijn/minimization_debruijn_moore_bench.hh
* src/benchs/quotient/Makefile.bench: Rename to
src/bench/quotient/Makefile.bench
* src/benchs/quotient/quotient_bool_bench.hh: Rename to
src/bench/quotient/quotient_bool_bench.hh
* src/benchs/quotient/quotient_z_bench.hh: Rename to
src/bench/quotient/quotient_z_bench.hh
2008-11-21 Alexandre Duret-Lutz <adl@lrde.epita.fr>
 
Only build benchmarks during distcheck, in the same way we do for
......
......@@ -25,7 +25,7 @@ SUBDIRS = gnulib lib include src data $(MAYBE_TAF_KIT) $(MAYBE_VAUCANSWIG) \
EXTRA_DIST = vaucanson.spec ChangeLog.1 ChangeLog.2 README NEWS m4/gnulib-cache.m4
DISTCHECK_CONFIGURE_FLAGS = --enable-demos --enable-benchs --enable-vaucanswig \
DISTCHECK_CONFIGURE_FLAGS = --enable-demos --enable-bench --enable-vaucanswig \
$(MORE_DISTCHECK_CONFIGURE_FLAGS)
# Prevent accidental edition of generated files.
......@@ -56,10 +56,10 @@ demos:
cd src/demos && $(MAKE) $(AM_MAKEFLAGS) all
###
### For benchs. (. is builddir)
### For benchmarks. (. is builddir)
###
benchs:
cd src/benchs && $(MAKE) $(AM_MAKEFLAGS) benchs
bench:
cd src/bench && $(MAKE) $(AM_MAKEFLAGS) bench
###
### Sanity check.
......
......@@ -62,7 +62,7 @@ done
run src/tests/test-suites ./generate-all.sh
run vaucanswig ./expand.sh .
run src/benchs ./generate_benchs.sh --all
run src/bench ./generate_bench.sh --all
run . build-aux/find_tests.sh
run include ./generate_headers.sh
run lib ./generate_libvcsn.rb
......
......@@ -43,10 +43,10 @@ AC_PROG_AWK
AC_ARG_ENABLE([demos],
[AC_HELP_STRING([--enable-demos], [build demos during "make all"])])
AM_CONDITIONAL([ENABLE_DEMOS], [test "x$enable_demos" = "xyes"])
AC_ARG_ENABLE([benchs],
[AC_HELP_STRING([--enable-benchs],
AC_ARG_ENABLE([bench],
[AC_HELP_STRING([--enable-bench],
[build benchmarks during "make all"])])
AM_CONDITIONAL([ENABLE_BENCHS], [test "x$enable_benchs" = "xyes"])
AM_CONDITIONAL([ENABLE_BENCH], [test "x$enable_bench" = "xyes"])
## ------------ ##
......@@ -260,16 +260,16 @@ AC_CONFIG_FILES([
src/demos/algorithms/Makefile
src/demos/one_rule_rewriting/Makefile
src/demos/vgrep/Makefile
src/benchs/Makefile
src/benchs/common/Makefile
src/benchs/composition/Makefile
src/benchs/derived_terms/Makefile
src/benchs/determinization/Makefile
src/benchs/eps_removal/Makefile
src/benchs/iterators/Makefile
src/benchs/minimization_2n/Makefile
src/benchs/minimization_debruijn/Makefile
src/benchs/quotient/Makefile
src/bench/Makefile
src/bench/common/Makefile
src/bench/composition/Makefile
src/bench/derived_terms/Makefile
src/bench/determinization/Makefile
src/bench/eps_removal/Makefile
src/bench/iterators/Makefile
src/bench/minimization_2n/Makefile
src/bench/minimization_debruijn/Makefile
src/bench/quotient/Makefile
tools/Makefile
include/Makefile
debian/Makefile])
......
......@@ -149,7 +149,7 @@ The \Vauc package is organized as follows:
\dir{data/b}{Generated Boolean automata.}
\dir{data/z}{Generated Automata over Z.}
\dir{debian}{Debian packaging.}
\dir{src/benchs}{Benches.}
\dir{src/bench}{Benchmarks.}
\dir{src/demos}{Demos.}
\dir{src/tests}{Test suite.}
\dir{taf-kit}{Typed Automata Function Kit, binaries to use \Vauc.}
......
......@@ -16,14 +16,14 @@ SUBDIRS = tests
if ENABLE_DEMOS
SUBDIRS += demos
endif
if ENABLE_BENCHS
SUBDIRS += benchs
if ENABLE_BENCH
SUBDIRS += bench
endif
.PHONY: demos benchs
.PHONY: demos bench
demos:
cd demos && $(MAKE) $(AM_MAKEFLAGS) all
benchs:
cd benchs && $(MAKE) $(AM_MAKEFLAGS) benchs
bench:
cd bench && $(MAKE) $(AM_MAKEFLAGS) bench
# src/benchs/Makefile.am -*- Makefile -*-
# src/bench/Makefile.am -*- Makefile -*-
#
# Vaucanson, a generic library for finite state machines.
# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 The Vaucanson Group.
# Vaucanson, a generic library for finite state machines.
# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 The
# Vaucanson Group.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
......@@ -25,7 +26,7 @@ BENCHDIRS = determinization minimization_debruijn \
composition eps_removal \
iterators
benchs:
bench:
for f in $(BENCHDIRS); do \
(cd $$f && $(MAKE) $(AM_MAKEFLAGS) benchs || exit 1) \
(cd $$f && $(MAKE) $(AM_MAKEFLAGS) bench || exit 1) \
done
......@@ -2,8 +2,7 @@
# $Id$
AM_CXXFLAGS = $(CXXFLAGS_OPTIMIZE)
AM_CPPFLAGS = -I$(top_builddir) \
-I$(top_srcdir)/include -I$(top_srcdir)/src/benchs \
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src/bench \
-I$(top_builddir)/include -I$(top_builddir)/src/bench
AM_CPPFLAGS += -DEXCEPTION_TRAPS
AM_CPPFLAGS += -DVCSN_SRC_DIR=\"'\$(top_srcdir)'\"
......
# composition/Makefile.bench * -*- Makefile -*-
benchs: $(noinst_PROGRAMS)
bench: $(noinst_PROGRAMS)
@echo '==================='; \
echo '|Composition bench|'; \
echo '==================='; \
......
# derived_terms/Makefile.bench * -*- Makefile -*-
benchs: $(noinst_PROGRAMS)
bench: $(noinst_PROGRAMS)
@echo '====================='; \
echo '|Derived Terms bench|'; \
echo '====================='; \
......
......@@ -3,7 +3,7 @@
noinst_PROGRAMS += determinization_bench_fsm
determinization_bench_fsm_SOURCES = determinization_bench_fsm.cc
benchs: $(noinst_PROGRAMS)
bench: $(noinst_PROGRAMS)
@echo '======================='; \
echo '|Determinization bench|'; \
echo '======================='; \
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment