----- Original Message -----
From: "Doug Hunt" <[email protected]>
To: "Sisyphus" <[email protected]>
Cc: "Chris Marshall" <[email protected]>; "pdl-porters"
<[email protected]>; "[email protected]"
<[email protected]>
Sent: Tuesday, August 09, 2011 3:12 AM
Subject: Re: [Perldl] [Pdl-porters] PDL-2.4.10 release plans query
Hi Rob: I spent a few weeks getting the perl/PDL test suite in the plplot
distribution working correctly with a bunch of new features in plplot.
This required a major refactoring in PDL-Graphics-PLplot as well.
Yes, I noticed there had been quite a bit of work done there.
Apart from some portability issues (which I think I've now fixed), it's
looking good.
Unfortunately, there had not until a few days ago been a major release of
plplot which non-plplot-developers could install easily.
Now this has changed with the release of plplot 5.9.8.
Yeah, I built 5.9.8 a few days ago - and then found that the git version of
PDL::Graphics::PLplot wouldn't build against it.
(I was building the git PDL just to check that the changes Chris had made
wrt >2GiB piddles hadn't broken anything on Windows. They hadn't, of course
.... waste of time ;-)
I'd like to update the core PDL-Graphics-PLplot version to 0.56 (or maybe
a to-be-released 0.57 if any further changes are necessary). If you could
get this working under Windows, that would be nice!
Patch is attached.
The Makefile.PL patch is fairly straightforward.
Because I build against static libs, linking to libplplotd alone is
insufficient.
And I've also added the t/*svg.* files to 'clean' so that 'make clean' can
remove them, rather than having the test file unlink them. (That bit's not
really necessary - please feel free to ignore it.)
I've always had trouble with calloc/free on windows - and they gave me
trouble again in plplot.pd (in the form of crashes) so I've replaced them
with New/Safefree, which works fine for me.
AFAICT there was actually no casting involved, so I was able to use New
instead of Newc.
These days, most people use (the more modern) Newx instead of New. If you
want to use Newx instead of New and still retain support for perl-5.8, I
think you need to also #include PDL/Core/ppport.h. (I'm not really sure of
the details, which is the reason that I stay with New.)
On native Windows, trying to execute './foo.pl' from a system command (or
the command line) will never work - so I've changed plplot_library_tests.t
to run 'perl -Mblib ./foo.t' instead for Windows.
I suspect that even on nix-type systems './foo.pl' is not guaranteed to
work - and I think that when executed like that, those tests might also be
getting run against the *installed* version of PDL::Graphics::PLplot instead
of the 0.56 build that has just been compiled. (Not entirely sure about that
last point.)
The reference files from the plplot test suite are a little different to the
files built by windows (eg rounding discrepancies) so the best I could think
of is to perform a "sanity" check that checks that the files are about the
right size. In actual fact, all but 5 or 6 of the files are the *exact* same
size as their respective reference files - but at the other extreme, the
very large x17p.svg.1 differs by about 1300 characters from its reference
file.
Anyway - see what you reckon ... and feel free to raise queries and make
corrections.
With those patches in place, all worked well for me.
During the running of plplot_library_tests.t I get 4 warnings related to the
absence of Qhull. Other than that it all looks good.
There is a qhull binary for windows that I installed ... but the warnings
still persisted. At some stage I might try to improve things in that regard.
Cheers,
Rob
--- Makefile.PL_orig Tue Aug 9 00:12:25 2011
+++ Makefile.PL Tue Aug 9 11:06:53 2011
@@ -215,7 +215,7 @@
}
# Test if PLplot has the routine plseed, found only in plplot 5.9 svn and later
-eval { compileAndRun ("$plplot_include_path -L$plplot_lib_path
-lplplotd",0,<<'EOC');
+eval { compileAndRun ("$plplot_include_path $libs",0,<<'EOC');
#include <plplot.h>
main () { c_plseed(0);}
EOC
@@ -230,7 +230,7 @@
}
# Test if PLplot has the routine pllegend, found in plplot starting in late 2010
-eval { compileAndRun ("$plplot_include_path -L$plplot_lib_path
-lplplotd",0,<<'EOC');
+eval { compileAndRun ("$plplot_include_path $libs",0,<<'EOC');
#include <plplot.h>
main () { c_pllegend(NULL,NULL,0, 0, 0.0, 0.0, 0.0, 0, 0, 0,
0, 0, 0, NULL,0.0, 0.0, 0.0, 0.0, NULL,NULL,
@@ -267,7 +267,7 @@
$hash{'LDDLFLAGS'} = " -shared -L$plplot_lib_path -L/usr/local/lib ";
$hash{'INC'} .= " $plplot_include_path";
$hash{'clean'} = {'FILES' =>
- 'PLplot.pm PLplot.xs PLplot.o PLplot.c PLplot.bs
*.xfig temp* OPTIONS! Makefile.old'};
+ 'PLplot.pm PLplot.xs PLplot.o PLplot.c PLplot.bs
*svg.* *.xfig temp* OPTIONS! Makefile.old'};
my $postamble = pdlpp_postamble(@::pack); # use for external module
#my $postamble = pdlpp_postamble_int(@::pack); # use for install inside PDL
distro
--- plplot.pd_orig Tue Aug 9 10:06:32 2011
+++ plplot.pd Tue Aug 9 11:13:44 2011
@@ -3214,7 +3214,9 @@
arr = (AV*) SvRV (sv);
newargc = argc = av_len (arr) + 1;
if (argc > 0) {
- args = calloc (argc , sizeof (char*));
+ /* args = calloc (argc , sizeof (char*)); */
+ New(1, args, argc, char *);
+ if(args == NULL) croak("Failed to allocate memory in
plParseOpts");
for (i = 0; i < argc; i++) {
STRLEN len;
@@ -3229,7 +3231,7 @@
for (i = 0; i < argc; i++)
dummy = av_shift (arr); /* assign to dummy to
suppress compile warning */
- free (args);
+ Safefree (args);
}
',
);
@@ -3993,7 +3995,9 @@
size_x = $SIZE(nx);
size_y = $SIZE(ny);
- a = (PLFLT *) calloc (size_x * size_y, sizeof(PLFLT));
+ /* a = (PLFLT *) calloc (size_x * size_y, sizeof(PLFLT)); */
+ New(3, a, size_x * size_y, PLFLT);
+ if(a == NULL) croak("Failed to allocate memory in plshade1_pp");
for (i = 0; i < size_x; i++)
for (j = 0; j < size_y; j++)
@@ -4020,7 +4024,7 @@
$min_color(), $min_width(), $max_color(), $max_width(),
plfill, $rectangular(), pltrcb, pltrdt);
- free ((void *) a);'
+ Safefree (a);'
);
# Plot gray-level image
--- t/plplot_library_tests.t_orig Tue Aug 9 14:10:50 2011
+++ t/plplot_library_tests.t Tue Aug 9 13:17:08 2011
@@ -45,20 +45,22 @@
foreach my $plplot_test_script (@scripts) {
my ($num) = ($plplot_test_script =~ /x(\d\d)\.pl/);
+ $plplot_test_script = 'perl -Mblib ' . $plplot_test_script if $^O =~ /MSWin/;
system "$plplot_test_script -dev svg -o x${num}p.svg -fam";
ok ($? == 0, "Script $plplot_test_script ran successfully");
my @output = glob ("x${num}p.svg*");
foreach my $outfile (@output) {
+ my $ballpark = $outfile =~ /x17p/ ? 2000 : 50;
(my $reffile = $outfile) =~ s/x(\d\d)p/x${1}c/;
my $perldata = do { local( @ARGV, $/ ) = $outfile; <> } ; # slurp!
my $refdata = do { local( @ARGV, $/ ) = "$cwd/ref_svg_c_output/$reffile";
<> } ; # slurp!
- ok ($perldata eq $refdata, "Output file $outfile matches reference C
output");
+ $^O =~ /MSWin/ ? ok (abs(length($perldata) - length($refdata)) < $ballpark,
"Output file is of a sane size")
+ : ok ($perldata eq $refdata, "Output file $outfile matches
reference C output");
}
}
-# comment this out for testing!!!
-unlink glob ("x??p.svg.*");
+# The *.svg.* files created will be removed by 'make clean'.
# Local Variables:
# mode: cperl
_______________________________________________
Perldl mailing list
[email protected]
http://mailman.jach.hawaii.edu/mailman/listinfo/perldl
