April 2009 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): More NEWS items added. Tentative release date set to April 14, 2009.
by Roberto Bagnara 04 Apr '09

04 Apr '09

Module: ppl/ppl Branch: master Commit: 59aa0521574a5c2238966d8238283770b13a7cd1 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=59aa0521574a… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Apr 4 08:05:10 2009 +0200 More NEWS items added. Tentative release date set to April 14, 2009. --- NEWS | 51 ++++++++++++++++++++++++++++++--------------------- 1 files changed, 30 insertions(+), 21 deletions(-) diff --git a/NEWS b/NEWS index f1e18f6..d185ac2 100644 --- a/NEWS +++ b/NEWS @@ -4,44 +4,53 @@ Parma Polyhedra Library NEWS -- history of user-visible changes -------------------------------------------------------------------------- -NEWS for version 0.10.1 (released date to be decided) +NEWS for version 0.10.1 (released on April 14, 2009) -------------------------------------------------------------------------- New and Changed Features ======================== -o Some packaging issues have been fixed. - -o Robustness improved. - o Added support for cross compilation. -o New macro PPL_DIRTY_TEMP_COEFFICIENT allows users of the C++ interface - to decrease memory allocation overhead and to improve locality whenever - they need a temporary variable of type `Coefficient'. - -o The OCaml interface can now be compiled to native code using ocamlopt. - -o New configuration option `--with-mlgmp=DIR' allows to specify the - installation directory of the ML GMP package. - o The configuration script now explicitly checks that a recent enough version of GNU M4 is available if at least one non-C++ interface is enabled (in previous versions this check was not performed and building the library could fail in a mysterious way). +o Robustness improved. + +o Some packaging issues have been fixed. + +o New macro PPL_DIRTY_TEMP_COEFFICIENT allows users of the C++ + interface to decrease memory allocation overhead and to improve + locality whenever they need a temporary variable of type + `Coefficient'. + +o The C++, C, Java and OCaml interfaces now provide utility functions + to format the textual representations of constraints, congruences + and so on. This makes it easy to code debugging prints with line + indentation and wrapping. + o The C interface now provides functions of the form int ppl_io_asprint_Polyhedron(char** strp, P x) - where `P' is any opaque pointer to a const PPL object. These functions - print `x' to a malloc-allocated string, a pointer to which is returned - via `strp'. + where `P' is any opaque pointer to a const PPL object. These + functions print `x' to a malloc-allocated string, a pointer to + which is returned via `strp'. + +o The OCaml interface can now be compiled to native code using ocamlopt. + +o New configuration option `--with-mlgmp=DIR' allows to specify the + installation directory of the ML GMP package. + +o The OCaml interface now supports timeout computation facilities + through functions ppl_set_timeout and ppl_reset_timeout. Moreover, + new functions ppl_Coefficient_is_bounded, ppl_Coefficient_min, + ppl_Coefficient_max and ppl_max_space_dimension have been added. -o The OCaml interface now supports timeout computation facilities through - functions ppl_set_timeout and ppl_reset_timeout. Moreover, new functions - ppl_Coefficient_is_bounded, ppl_Coefficient_min, ppl_Coefficient_max - and ppl_max_space_dimension have been added. +o The Prolog interfaces are no longer enabled by default in the + release tarballs (they are enabled by default in the Git versions). Bugfixes

1 0

[GIT] ppl/ppl(master): Do not use the same object to play different roles in the same method call .
by Enea Zaffanella 03 Apr '09

03 Apr '09

Module: ppl/ppl Branch: master Commit: e00dfb7f0c56a757e19168e83f5535050e42271e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e00dfb7f0c56… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Apr 3 16:28:37 2009 +0200 Do not use the same object to play different roles in the same method call. In calls to methods Box::difference_assign and Box::concatenate_assign we were binding the very same Box object both to the (modifiable) implicit argument *this and to the (const) explicit argument y. --- tests/Box/ascii_dump_load1.cc | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/Box/ascii_dump_load1.cc b/tests/Box/ascii_dump_load1.cc index a210688..301010a 100644 --- a/tests/Box/ascii_dump_load1.cc +++ b/tests/Box/ascii_dump_load1.cc @@ -204,13 +204,15 @@ test06() { print_constraints(box1, "*** box1(cs) ***"); - box1.difference_assign(box1); + TBox box1_copy(box1); - print_constraints(box1, "*** box1.difference_assign(box1) ***"); + box1.difference_assign(box1_copy); - box1.concatenate_assign(box1); + print_constraints(box1, "*** box1.difference_assign(box1_copy) ***"); - print_constraints(box1, "*** box1.concatenate_assign(box1) ***"); + box1.concatenate_assign(box1_copy); + + print_constraints(box1, "*** box1.concatenate_assign(box1_copy) ***"); nout << "box1.space_dimension() = " << box1.space_dimension() << endl;

1 0

[GIT] ppl/ppl(master): Fixed a missing initialization bug in Box:: concatenate_assign.
by Enea Zaffanella 03 Apr '09

03 Apr '09

Module: ppl/ppl Branch: master Commit: ec81d249f91bcdeb6fafacf682dedd0219e0c19f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ec81d249f91b… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Apr 3 16:09:25 2009 +0200 Fixed a missing initialization bug in Box::concatenate_assign. Also improved methods add_space_dimensions*: instead of adding new uninitialized intervals and later initialize them, we now directly add properly initialized intervals. --- src/Box.templates.hh | 15 ++++----------- 1 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/Box.templates.hh b/src/Box.templates.hh index 51578f4..fa27d0d 100644 --- a/src/Box.templates.hh +++ b/src/Box.templates.hh @@ -505,12 +505,9 @@ Box<ITV>::add_space_dimensions_and_embed(const dimension_type m) { // Adding no dimensions is a no-op. if (m == 0) return; - // To embed an n-dimension space box in a (n+m)-dimension space, // we just add `m' new universe elements to the sequence. - seq.insert(seq.end(), m, ITV()); - for (dimension_type sz = seq.size(), i = sz - m; i < sz; ++i) - seq[i].assign(UNIVERSE); + seq.insert(seq.end(), m, ITV(UNIVERSE)); assert(OK()); } @@ -520,12 +517,8 @@ Box<ITV>::add_space_dimensions_and_project(const dimension_type m) { // Adding no dimensions is a no-op. if (m == 0) return; - - // A add `m' new zero elements to the sequence. - seq.insert(seq.end(), m, ITV()); - for (dimension_type sz = seq.size(), i = sz - m; i < sz; ++i) - seq[i].assign(0); - + // Add `m' new zero elements to the sequence. + seq.insert(seq.end(), m, ITV(0)); assert(OK()); } @@ -1491,7 +1484,7 @@ Box<ITV>::concatenate_assign(const Box& y) { // If `x' is marked empty, then it is sufficient to adjust // the dimension of the vector space. if (x.marked_empty()) { - x.seq.insert(x.seq.end(), y_space_dim, ITV()); + x.seq.insert(x.seq.end(), y_space_dim, ITV(EMPTY)); assert(x.OK()); return; }

1 0

Bugs in OCaml interface
by Kenneth MacKenzie 03 Apr '09

03 Apr '09

Hello there, I've been using the PPL OCaml interface to carry out some program analysis within a compiler. It's been working pretty well, but I've come across a number of bugs. -------------------------------------------------------------------------------- 1. The OCaml 'unit' type has only a single value, denoted (); this is represented internally by a pointer to a single preallocated value. However, many of the functions in the PPL interface return the wrong value. Here's an example from an OCaml top level built with PPL $ ocamlppl Objective Caml version 3.11.0 # let p = Ppl_ocaml.ppl_new_C_Polyhedron_from_constraints [];; val p : Ppl_ocaml.polyhedron = <abstr> # let u = Ppl_ocaml.ppl_Polyhedron_add_constraints p [];; val u : unit = <unknown constructor> # u = ();; - : bool = false # The <unknown constructor> thing is something you should never see. Here's the defintion of the ppl_Polyhedron_add_constraints function from interfaces/OCaml/ppl_ocaml_Polyhedron.cc: extern "C" void ppl_Polyhedron_add_constraints(value ph, value cs) try { CAMLparam2(ph, cs); Polyhedron& pph = *p_Polyhedron_val(ph); Constraint_System pcs = build_ppl_Constraint_System(cs); pph.add_constraints(pcs); CAMLreturn0; } CATCH_ALL This has void return type, but should actually return a pointer to the preallocated unit value. I think the correct code should look like extern "C" CAMLprim value ppl_Polyhedron_add_constraints(value ph, value cs) try { CAMLparam2(ph, cs); Polyhedron& pph = *p_Polyhedron_val(ph); Constraint_System pcs = build_ppl_Constraint_System(cs); pph.add_constraints(pcs); CAMLreturn(Val_unit); } CATCH_ALL Every function returning a unit value (it looks like there are 509 of them) should look like this. I don't think this bug is very harmful unless one uses unit values in unusual ways. ---------------------------------------------------------------------- 2. Certain functions can lead to segmentation errors. Here's a program which creates a polyhedron and then loops round adding constraints one by one. The call to ppl_Polyhedron_get_constraints sometimes causes a segmentation fault; if you remove it then the program runs OK. (Presumably it eventually runs out of memory, but I've run it for a very long time (millions of iterations) without this happening.) $ cat tst.ml open Ppl_ocaml let itoz = Gmp.Z.of_int let f n = (* Generate a constraint nx + (n+1)y <= n+2 *) Less_Or_Equal (Plus (Times (itoz n, Variable 0), Times (itoz (n+1), Variable 1)), Coefficient (itoz (n+2))) let p = ppl_new_C_Polyhedron_from_space_dimension 2 Universe let rec g n = let () = ppl_Polyhedron_add_constraint p (f n) in let l = ppl_Polyhedron_get_constraints p in let () = Printf.printf "%d\n" n in let () = flush stdout in g (n+1) let _ = g 0 Here's what happens when you run it: $ ocamlppl # #use "tst.ml";; val itoz : int -> Gmp.Z.t = <fun> val f : int -> Ppl_ocaml.linear_constraint = <fun> val p : Ppl_ocaml.polyhedron = <abstr> File "tst.ml", line 12, characters 9-10: Warning Y: unused variable l. val g : int -> 'a = <fun> 0 1 2 3 . . <output deleted> . 1654 1655 1656 Segmentation fault I think that the problem here is in the function build_ocaml_constraint_system in interfaces/OCaml/ppl_ocaml_common.cc: value build_ocaml_constraint_system(const Constraint_System& ppl_cs) { // This code builds a list of constraints starting from bottom to // top. A list on OCaml must be built like a sequence of Cons and Tail. // The first element is the Nil list (the Val_int(0)). value result = Val_int(0); for (Constraint_System::const_iterator v_begin = ppl_cs.begin(), v_end = ppl_cs.end(); v_begin != v_end; ++v_begin) { value new_tail = caml_alloc_tuple(2); Field(new_tail, 0) = build_ocaml_constraint(*v_begin); Field(new_tail, 1) = result; result = new_tail; } return result; } The problem is in the way that allocation in the ocaml heap is handled. The function loops round allocating list cells in the heap, but the ocaml garbage collector doesn't know what's going on. Eventually caml_alloc_tuple is called when there isn't enough free space: this triggers garbage collection, and the memory occupied by the partially built list is reclaimed; the loop then continues, allocating a new list cell whose tail points to some garbage-collected memory which will later be occupied by something else allocated in the heap. The function finally returns a malformed list to the ocaml system, eventually leading to a crash. To overcome this the CAMLlocal macro should be used to tell the ocaml garbage collector to leave the partially-allocated list alone: CAMLprim value build_ocaml_constraint_system(const Constraint_System& ppl_cs) { // This code builds a list of constraints starting from bottom to // top. A list on OCaml must be built like a sequence of Cons and Tail. // The first element is the Nil list (the Val_int(0)). CAMLlocal2 (result, new_tail); result = Val_emptylist; // Synonymous with Val_int(0); for (Constraint_System::const_iterator v_begin = ppl_cs.begin(), v_end = ppl_cs.end(); v_begin != v_end; ++v_begin) { new_tail = caml_alloc_tuple(2); Field(new_tail, 0) = build_ocaml_constraint(*v_begin); Field(new_tail, 1) = result; result = new_tail; } CAMLreturn (result); } I haven't actually tested this since it would require too much rebuilding, but I've written similar code which worked OK. I'm not sure whether "CAMLprim" is in fact necessary, but I don't think it does any harm. Again, there are a number of functions which should be amended in a similar way: I think that in any C function which uses a caml_alloc* function, every local variable which may point to a value allocated in the ocaml heap should be protected by a CAMLlocal* macro. -------------------------------------------------------------------------------- 3. I've also had problems with ppl_Polyhedron_BHRZ03_widening_assign. Occasionally my compiler locks up with a lot of CPU usage when ppl_Polyhedron_BHRZ03_widening_assign is called. I didn't have any probelms using the H79 widening instead. I'm not sure what's causing this: ppl_Polyhedron_BHRZ03_widening_assign does have the problem with units mentioned in (1) above, but I don't think that should do any damage. It's possible that I have some malformed data structures from (2) which are causing problems. -------------------------------------------------------------------------------- 4. While looking at the code for ppl_Polyhedron_BHRZ03_widening_assign I noticed a bug in ppl_Polyhedron_BHRZ03_widening_assign_with_tokens, which is repeated in all the widening-with-tokens functions: CAMLprim value ppl_Polyhedron_BHRZ03_widening_assign_with_tokens (value ph1, value ph2, value integer) try { CAMLparam3(ph1, ph2, integer); Polyhedron& pph1 = *p_Polyhedron_val(ph1); Polyhedron& pph2 = *p_Polyhedron_val(ph2); int cpp_int = Val_int(integer); check_int_is_unsigned(cpp_int); unsigned int unsigned_value = cpp_int; pph1.BHRZ03_widening_assign(pph2, &unsigned_value); CAMLreturn(Int_val(unsigned_value)); } Val_int and Int_val should be interchanged here. The current version will calculate the number of remaining tokens incorrectly. -------------------------------------------------------------------------------- 5. It's not really a bug, but I'm a little confused by the way the code is divided into modules. Ppl_ocaml_globals contains the type definitions for various datatypes, but why does it also contain all the MIP functions? I see that the OCamldoc-generated documentation only contains information about Ppl_ocaml_globals, but Ppl_ocaml is missing, so there's no information available about the types of the polyhedron functions and other things in Ppl_ocaml. Also, the documentation for the OCaml interface (for example, at http://www.cs.unipr.it/ppl/Documentation/user/ppl-user-ocaml-interface-0.10… ) refers to a number of functions such as ppl_reset_timeout which don't actually occur in the interface. -------------------------------------------------------------------------------- Best wishes, Kenneth MacKenzie -- The University of Edinburgh is a charitable body, registered in Scotland, with registration number SC005336.

3 7

Re: [PPL-devel] make check fails on Freebsd in tests/Box/propagateconstraints2
by Tobias Grosser 03 Apr '09

03 Apr '09

On Thu, 2009-04-02 at 15:23 +0200, Abramo Bagnara wrote: > Tobias Grosser ha scritto: > > Hey Abramo, > > > > thanks for working on this. > > I see something very strange about long double that I find suspect, the > binary format is said to be non iec559 conformant and this is definitely > unexpected on i386. > > Can you check if the attached file exits with 1 and why it fails? > > It is a convert() that give a different result or > std::numeric_limits<long double>::is_iec559 is false? Yes it exits with one. It fails in these two cases. if (!convert(0x00000000UL, 0x0000000000000001ULL) == ... convert returns: 3.6451995318824746025284059336194198e-4951 if (!convert(0x80000000UL, 0x0000000000000001ULL) == ... convert returns: 3.6451995318824746025284059336194198e-4951 I attached a detailed typescript with the gdb sessions. Tobi

2 1

[GIT] ppl/ppl(master): Avoid warning of unused variable space_dim.
by Patricia Hill 03 Apr '09

03 Apr '09

Module: ppl/ppl Branch: master Commit: 4127a9caaaa69f0f3de086404f2a967f20052f02 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4127a9caaaa6… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Fri Apr 3 10:34:38 2009 +0100 Avoid warning of unused variable space_dim. --- src/Box.templates.hh | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/Box.templates.hh b/src/Box.templates.hh index 596057d..51578f4 100644 --- a/src/Box.templates.hh +++ b/src/Box.templates.hh @@ -3352,10 +3352,9 @@ template <typename ITV> void Box<ITV>::get_limiting_box(const Constraint_System& cs, Box& limiting_box) const { - const dimension_type space_dim = space_dimension(); const dimension_type cs_space_dim = cs.space_dimension(); // Private method: the caller has to ensure the following. - assert(cs_space_dim <= space_dim); + assert(cs_space_dim <= space_dimension()); for (Constraint_System::const_iterator cs_i = cs.begin(), cs_end = cs.end(); cs_i != cs_end; ++cs_i) {

1 0

[GIT] ppl/ppl(master): Work around a bug affecting some versions of <stdio. h>.
by Roberto Bagnara 03 Apr '09

03 Apr '09

Module: ppl/ppl Branch: master Commit: db1ced1c1d7a1fb34b2b82a095e962100dd74680 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=db1ced1c1d7a… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Apr 3 05:20:30 2009 +0000 Work around a bug affecting some versions of <stdio.h>. --- interfaces/C/tests/ppl_c_test.cc | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/interfaces/C/tests/ppl_c_test.cc b/interfaces/C/tests/ppl_c_test.cc index d2c9c10..2333191 100644 --- a/interfaces/C/tests/ppl_c_test.cc +++ b/interfaces/C/tests/ppl_c_test.cc @@ -22,6 +22,18 @@ For the most up-to-date information see the Parma Polyhedra Library site: http://www.cs.unipr.it/ppl/ . */ #include "ppl-config.h" + +// The following inclusion of <cstdio> prior to "ppl_c_test.h" is to +// work around a bug whereby some versions of <stdio.h> do not obey +// clause D.5.2 of the C++ standard: "Each C header, whose name has +// the form name.h, behaves as if each name placed in the Standard +// library namespace by the corresponding cname header is also placed +// within the namespace scope of the namespace std and is followed by +// an explicit using-declaration (7.3.3)." By including <cstdio> +// prior to "ppl_c_test.h" we ensure std::FILE is defined at the time +// when "ppl_c.h" will include <gmp.h>. +#include <cstdio> + #include "ppl_c_test.h" #include <cstdlib>

1 0

[GIT] ppl/ppl(master): Added missing uses of AC_REQUIRE; removed a spurious one.
by Roberto Bagnara 02 Apr '09

02 Apr '09

Module: ppl/ppl Branch: master Commit: 6faf694d166b72703e204699a38cebb440ac1c48 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6faf694d166b… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Apr 2 22:11:02 2009 +0200 Added missing uses of AC_REQUIRE; removed a spurious one. Version number bumped. --- configure.ac | 2 +- m4/ac_cxx_double_binary_format.m4 | 1 - m4/ac_cxx_double_exact_output.m4 | 1 + m4/ac_cxx_long_double_binary_format.m4 | 1 + 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 9a31ab6..20fe621 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Process this file with Autoconf to produce a configure script. # Every other copy of the package version number gets its value from here. -AC_INIT([the Parma Polyhedra Library],[0.10.1pre10],[ppl-devel(a)cs.unipr.it],[ppl]) +AC_INIT([the Parma Polyhedra Library],[0.10.1pre11],[ppl-devel(a)cs.unipr.it],[ppl]) # Minimum Autoconf version required. AC_PREREQ(2.61) diff --git a/m4/ac_cxx_double_binary_format.m4 b/m4/ac_cxx_double_binary_format.m4 index dd8c0e2..c627326 100644 --- a/m4/ac_cxx_double_binary_format.m4 +++ b/m4/ac_cxx_double_binary_format.m4 @@ -23,7 +23,6 @@ dnl site: http://www.cs.unipr.it/ppl/ . AC_DEFUN([AC_CXX_DOUBLE_BINARY_FORMAT], [ AC_REQUIRE([AC_C_BIGENDIAN]) -AC_REQUIRE([AC_CHECK_FPU_CONTROL]) ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LIBS="$LIBS" AC_LANG_PUSH(C++) diff --git a/m4/ac_cxx_double_exact_output.m4 b/m4/ac_cxx_double_exact_output.m4 index b409732..f3827ed 100644 --- a/m4/ac_cxx_double_exact_output.m4 +++ b/m4/ac_cxx_double_exact_output.m4 @@ -22,6 +22,7 @@ dnl site: http://www.cs.unipr.it/ppl/ . AC_DEFUN([AC_CXX_DOUBLE_EXACT_OUTPUT], [ +AC_REQUIRE([AC_C_BIGENDIAN]) dnl AC_REQUIRE([AC_CXX_DOUBLE_BINARY_FORMAT]) ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LIBS="$LIBS" diff --git a/m4/ac_cxx_long_double_binary_format.m4 b/m4/ac_cxx_long_double_binary_format.m4 index 96f1ccf..5d3afc8 100644 --- a/m4/ac_cxx_long_double_binary_format.m4 +++ b/m4/ac_cxx_long_double_binary_format.m4 @@ -22,6 +22,7 @@ dnl site: http://www.cs.unipr.it/ppl/ . AC_DEFUN([AC_CXX_LONG_DOUBLE_BINARY_FORMAT], [ +AC_REQUIRE([AC_C_BIGENDIAN]) ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LIBS="$LIBS" AC_LANG_PUSH(C++)

1 0

[GIT] ppl/ppl(master): Use @mlgmp_dir@ instead of +gmp for the -I option of ocamldoc.
by Enea Zaffanella 02 Apr '09

02 Apr '09

Module: ppl/ppl Branch: master Commit: 3b959163da9e982568db53698e377a72c1f95da7 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3b959163da9e… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Apr 2 18:37:45 2009 +0200 Use @mlgmp_dir@ instead of +gmp for the -I option of ocamldoc. --- doc/Makefile.am | 4 ++-- interfaces/OCaml/tests/Makefile.am | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 17ae32d..ac2ab5e 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1041,10 +1041,10 @@ $(srcdir)/../interfaces/OCaml/ppl_ocaml_common.inlines.hh \ $(srcdir)/gpl.dox $(srcdir)/fdl.dox OCAMLDOC_HTML_OPTIONS = \ --I +gmp -I $(top_builddir)/interfaces/OCaml -html +-I @mlgmp_dir@ -I $(top_builddir)/interfaces/OCaml -html OCAMLDOC_LATEX_OPTIONS = \ --I +gmp -I $(top_builddir)/interfaces/OCaml \ +-I @mlgmp_dir@ -I $(top_builddir)/interfaces/OCaml \ -latex -noheader -notrailer -notoc user-ocaml-interface.latex-dir: \ diff --git a/interfaces/OCaml/tests/Makefile.am b/interfaces/OCaml/tests/Makefile.am index ca98b4a..78ef7e1 100644 --- a/interfaces/OCaml/tests/Makefile.am +++ b/interfaces/OCaml/tests/Makefile.am @@ -134,7 +134,7 @@ test1_opt_SOURCES = test1.ml test1_opt$(EXEEXT): test1.cmx ../ppl_ocaml.cmxa $(OCAMLOPT_ENV) ocamlopt -o $@ \ -cc "$(CXX)" $(OCAMLOPT_COMPILE_FLAGS) \ - $(BUILT_PPL_FLAGS) $(BUILT_PWL_FLAGS) $(OCAMLC_LINK_FLAGS) \ + $(BUILT_PPL_FLAGS) $(BUILT_PWL_FLAGS) $(OCAMLOPT_LINK_FLAGS) \ ppl_ocaml.cmxa $< @@ -159,7 +159,7 @@ ppl_ocaml_generated_test_opt$(EXEEXT): \ ppl_ocaml_generated_test.cmx ../ppl_ocaml.cmxa $(OCAMLOPT_ENV) ocamlopt -o $@ \ -cc "$(CXX)" $(OCAMLOPT_COMPILE_FLAGS) \ - $(BUILT_PPL_FLAGS) $(BUILT_PWL_FLAGS) $(OCAMLC_LINK_FLAGS) \ + $(BUILT_PPL_FLAGS) $(BUILT_PWL_FLAGS) $(OCAMLOPT_LINK_FLAGS) \ ppl_ocaml.cmxa $< MOSTLYCLEANFILES = \

1 0

[GIT] ppl/ppl(master): Fixed parallel make.
by Abramo Bagnara 02 Apr '09

02 Apr '09

Module: ppl/ppl Branch: master Commit: ab09fc64171cec6b1571b5a6e01411ce1c91bd58 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ab09fc64171c… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Thu Apr 2 16:34:17 2009 +0200 Fixed parallel make. --- interfaces/Prolog/Ciao/Makefile.am | 11 +++++------ interfaces/Prolog/GNU/Makefile.am | 11 +++++------ interfaces/Prolog/SICStus/Makefile.am | 11 +++++------ interfaces/Prolog/SWI/Makefile.am | 11 +++++------ interfaces/Prolog/XSB/Makefile.am | 7 ++++--- interfaces/Prolog/YAP/Makefile.am | 11 +++++------ 6 files changed, 29 insertions(+), 33 deletions(-) diff --git a/interfaces/Prolog/Ciao/Makefile.am b/interfaces/Prolog/Ciao/Makefile.am index 1968a35..203717e 100644 --- a/interfaces/Prolog/Ciao/Makefile.am +++ b/interfaces/Prolog/Ciao/Makefile.am @@ -271,9 +271,10 @@ pl_check_test: ciao_pl_check$(EXEEXT) .libs/libppl_ciao.so $(EXPECTED_PCHK) >obtained_pchk diff -u --ignore-all-space $(EXPECTED_PCHK) obtained_pchk -clpq_test: ciao_clpq$(EXEEXT) .libs/libppl_ciao.so ../tests/script_clpq $(EXPECTED_CLPQ) - LANG=C; \ - for k in $(CLPQ_TESTS); do cp -f $(srcdir)/../tests/$$k .; done +$(CLPQ_TESTS): + cp -f $(srcdir)/../tests/$@ . + +clpq_test: ciao_clpq$(EXEEXT) .libs/libppl_ciao.so ../tests/script_clpq $(EXPECTED_CLPQ) $(CLPQ_TESTS) GLOBALSTKSIZE=1000000 \ $(LIBTOOL) --mode=execute \ -dlopen ../../../src/libppl.la \ @@ -283,9 +284,7 @@ clpq_test: ciao_clpq$(EXEEXT) .libs/libppl_ciao.so ../tests/script_clpq $(EXPECT <$(srcdir)/../tests/script_clpq >obtained_clpq diff -u --ignore-all-space $(EXPECTED_CLPQ) obtained_clpq -clpq2_test: ciao_clpq2$(EXEEXT) .libs/libppl_ciao.so ../tests/script_clpq2 $(EXPECTED_CLPQ2) - LANG=C; \ - for k in $(CLPQ_TESTS); do cp -f $(srcdir)/../tests/$$k .; done +clpq2_test: ciao_clpq2$(EXEEXT) .libs/libppl_ciao.so ../tests/script_clpq2 $(EXPECTED_CLPQ2) $(CLPQ_TESTS) GLOBALSTKSIZE=100000 \ $(LIBTOOL) --mode=execute \ -dlopen ../../../src/libppl.la \ diff --git a/interfaces/Prolog/GNU/Makefile.am b/interfaces/Prolog/GNU/Makefile.am index a18a389..b1d4dd2 100644 --- a/interfaces/Prolog/GNU/Makefile.am +++ b/interfaces/Prolog/GNU/Makefile.am @@ -257,9 +257,10 @@ pl_check_test: gnu_pl_check.pl ../tests/pl_check.pl $(EXPECTED_PCHK) ./ppl_gprolog <script_pchk diff -u --ignore-all-space $(EXPECTED_PCHK) obtained_pchk -clpq_test: gp_clpq ../tests/script_clpq $(EXPECTED_CLPQ) - LANG=C; \ - for k in $(CLPQ_TESTS); do cp -f $(srcdir)/../tests/$$k .; done +$(CLPQ_TESTS): + cp -f $(srcdir)/../tests/$@ . + +clpq_test: gp_clpq ../tests/script_clpq $(EXPECTED_CLPQ) $(CLPQ_TESTS) $(LIBTOOL) --mode=execute \ -dlopen ../../../src/libppl.la \ $(WATCHDOG_DLOPEN) \ @@ -267,9 +268,7 @@ clpq_test: gp_clpq ../tests/script_clpq $(EXPECTED_CLPQ) ./gp_clpq <$(SCRIPT_CLPQ) >obtained_clpq diff -u --ignore-all-space $(EXPECTED_CLPQ) obtained_clpq -clpq2_test: gp_clpq2 ../tests/script_clpq2 $(EXPECTED_CLPQ2) - LANG=C; \ - for k in $(CLPQ_TESTS); do cp -f $(srcdir)/../tests/$$k .; done +clpq2_test: gp_clpq2 ../tests/script_clpq2 $(EXPECTED_CLPQ2) $(CLPQ_TESTS) $(LIBTOOL) --mode=execute \ -dlopen ../../../src/libppl.la \ $(WATCHDOG_DLOPEN) \ diff --git a/interfaces/Prolog/SICStus/Makefile.am b/interfaces/Prolog/SICStus/Makefile.am index c691141..f1f6edb 100644 --- a/interfaces/Prolog/SICStus/Makefile.am +++ b/interfaces/Prolog/SICStus/Makefile.am @@ -272,11 +272,12 @@ pl_check_test: ppl_sicstus ppl_sicstus.pl sp_pl_check.pl ../tests/pl_check.pl $( fi diff -u --ignore-all-space $(EXPECTED_PCHK) obtained_pchk +$(CLPQ_TESTS): + cp -f $(srcdir)/../tests/$@ . + # FIXME: the last prerequisite is to get around a bug of `spld': see # http://www.cs.unipr.it/pipermail/ppl-devel/2006-January/007610.html -clpq_test: ppl_sicstus ppl_sicstus.pl sp_clpq.pl ../tests/clpq.pl ../tests/script_clpq $(EXPECTED_CLPQ) | pl_check_test - LANG=C; \ - for k in $(CLPQ_TESTS); do cp -f $(srcdir)/../tests/$$k .; done +clpq_test: ppl_sicstus ppl_sicstus.pl sp_clpq.pl ../tests/clpq.pl ../tests/script_clpq $(EXPECTED_CLPQ) $(CLPQ_TESTS) | pl_check_test $(LIBTOOL) --mode=execute \ -dlopen ../../../src/libppl.la \ $(WATCHDOG_DLOPEN) \ @@ -287,9 +288,7 @@ clpq_test: ppl_sicstus ppl_sicstus.pl sp_clpq.pl ../tests/clpq.pl ../tests/scrip # FIXME: the last prerequisite is to get around a bug of `spld': see # http://www.cs.unipr.it/pipermail/ppl-devel/2006-January/007610.html -clpq2_test: ppl_sicstus ppl_sicstus.pl sp_clpq.pl ../tests/clpq2.pl ../tests/script_clpq2 $(EXPECTED_CLPQ2) | clpq_test - LANG=C; \ - for k in $(CLPQ_TESTS); do cp -f $(srcdir)/../tests/$$k .; done +clpq2_test: ppl_sicstus ppl_sicstus.pl sp_clpq.pl ../tests/clpq2.pl ../tests/script_clpq2 $(EXPECTED_CLPQ2) $(CLPQ_TESTS) | clpq_test $(LIBTOOL) --mode=execute \ -dlopen ../../../src/libppl.la \ $(WATCHDOG_DLOPEN) \ diff --git a/interfaces/Prolog/SWI/Makefile.am b/interfaces/Prolog/SWI/Makefile.am index 41db227..fb00411 100644 --- a/interfaces/Prolog/SWI/Makefile.am +++ b/interfaces/Prolog/SWI/Makefile.am @@ -285,9 +285,10 @@ pl_check_test: swi_pl_check.pl ../tests/pl_check.pl $(EXPECTED_PCHK) fi diff -u --ignore-all-space $(EXPECTED_PCHK) obtained_pchk -clpq_test: pl_clpq ../tests/script_clpq $(EXPECTED_CLPQ) - LANG=C; \ - for k in $(CLPQ_TESTS); do cp -f $(srcdir)/../tests/$$k .; done +$(CLPQ_TESTS): + cp -f $(srcdir)/../tests/$@ . + +clpq_test: pl_clpq ../tests/script_clpq $(EXPECTED_CLPQ) $(CLPQ_TESTS) $(LIBTOOL) --mode=execute \ -dlopen ../../../src/libppl.la \ $(WATCHDOG_DLOPEN) \ @@ -295,9 +296,7 @@ clpq_test: pl_clpq ../tests/script_clpq $(EXPECTED_CLPQ) $(CHECKER) ./pl_clpq <$(srcdir)/../tests/script_clpq >obtained_clpq diff -u --ignore-all-space $(EXPECTED_CLPQ) obtained_clpq -clpq2_test: pl_clpq2 ../tests/script_clpq2 $(EXPECTED_CLPQ2) - LANG=C; \ - for k in $(CLPQ_TESTS); do cp -f $(srcdir)/../tests/$$k .; done +clpq2_test: pl_clpq2 ../tests/script_clpq2 $(EXPECTED_CLPQ2) $(CLPQ_TESTS) $(LIBTOOL) --mode=execute \ -dlopen ../../../src/libppl.la \ $(WATCHDOG_DLOPEN) \ diff --git a/interfaces/Prolog/XSB/Makefile.am b/interfaces/Prolog/XSB/Makefile.am index 2cbd801..1c6d5f5 100644 --- a/interfaces/Prolog/XSB/Makefile.am +++ b/interfaces/Prolog/XSB/Makefile.am @@ -228,9 +228,10 @@ EXPECTED_PCHK = $(srcdir)/../tests/expected_pchk_$(COEFFICIENT_MNEMONIC) endif !ASSERTIONS_ENABLED -check-local: libppl_xsb.la xsb_clpq.P ../tests/clpq.pl ../tests/script_clpq xsb_clpq2.P ../tests/clpq2.pl ../tests/script_clpq2 pl_check_test ppl_prolog_generated_test - LANG=C; \ - for k in $(CLPQ_TESTS); do cp -f $(srcdir)/../tests/$$k .; done +$(CLPQ_TESTS): + cp -f $(srcdir)/../tests/$@ . + +check-local: libppl_xsb.la xsb_clpq.P ../tests/clpq.pl ../tests/script_clpq xsb_clpq2.P ../tests/clpq2.pl ../tests/script_clpq2 pl_check_test ppl_prolog_generated_test (CLPQ_TESTS) if [ $(abs_srcdir) != `pwd` ]; then \ cp -f $(srcdir)/xsb_clpq.P . ; \ fi diff --git a/interfaces/Prolog/YAP/Makefile.am b/interfaces/Prolog/YAP/Makefile.am index 45c28d2..c147428 100644 --- a/interfaces/Prolog/YAP/Makefile.am +++ b/interfaces/Prolog/YAP/Makefile.am @@ -217,9 +217,10 @@ pl_check_test: yap_pl_check.pl ppl_yap.pl ../tests/pl_check.pl $(EXPECTED_PCHK) <script_pchk >obtained_pchk diff -u --ignore-all-space $(EXPECTED_PCHK) obtained_pchk -clpq_test: yap_clpq.pl ppl_yap.pl ../tests/clpq.pl ../tests/script_clpq $(EXPECTED_CLPQ) - LANG=C; \ - for k in $(CLPQ_TESTS); do cp -f $(srcdir)/../tests/$$k .; done +$(CLPQ_TESTS): + cp -f $(srcdir)/../tests/$@ . + +clpq_test: yap_clpq.pl ppl_yap.pl ../tests/clpq.pl ../tests/script_clpq $(EXPECTED_CLPQ) $(CLPQ_TESTS) echo "main." >script_clpq cat $(srcdir)/../tests/script_clpq >>script_clpq $(LIBTOOL) --mode=execute \ @@ -230,9 +231,7 @@ clpq_test: yap_clpq.pl ppl_yap.pl ../tests/clpq.pl ../tests/script_clpq $(EXPECT <script_clpq >obtained_clpq diff -u --ignore-all-space $(EXPECTED_CLPQ) obtained_clpq -clpq2_test: yap_clpq2.pl ppl_yap.pl ../tests/clpq2.pl ../tests/script_clpq2 $(EXPECTED_CLPQ2) - LANG=C; \ - for k in $(CLPQ_TESTS); do cp -f $(srcdir)/../tests/$$k .; done +clpq2_test: yap_clpq2.pl ppl_yap.pl ../tests/clpq2.pl ../tests/script_clpq2 $(EXPECTED_CLPQ2) $(CLPQ_TESTS) echo "main." >script_clpq2 cat $(srcdir)/../tests/script_clpq2 >>script_clpq2 $(LIBTOOL) --mode=execute \

1 0