Update upstream source from tag 'upstream/1.23.15'
Update to upstream version '1.23.15'
with Debian dir 76d8069ef098bdff453dba5ad1511b7ae7bf13c8
Bas Couwenberg
3 years ago
11 | 11 | use PDL::CCS::Ops; |
12 | 12 | use strict; |
13 | 13 | |
14 | our $VERSION = '1.23.14'; ##-- update with perl-reversion from Perl::Version module | |
14 | our $VERSION = '1.23.15'; ##-- update with perl-reversion from Perl::Version module | |
15 | 15 | our @ISA = ('PDL::Exporter'); |
16 | 16 | our @ccs_binops = (qw(plus minus mult divide modulo power), |
17 | 17 | qw(gt ge lt le eq ne spaceship), |
31 | 31 | 'PDL_IND', |
32 | 32 | 'PDL_LL' |
33 | 33 | ], |
34 | 'INT_TYPE_MAX_IONAME' => 'ccs_indx', | |
34 | 35 | 'USE_PDL_INDX' => 1 |
35 | 36 | ); |
36 | 37 |
8 | 8 | use PDL; |
9 | 9 | use strict; |
10 | 10 | |
11 | our $VERSION = '1.23.14'; ##-- update with perl-reversion from Perl::Version module | |
11 | our $VERSION = '1.23.15'; ##-- update with perl-reversion from Perl::Version module | |
12 | 12 | our @ISA = ('PDL::Exporter'); |
13 | 13 | our @EXPORT_OK = |
14 | 14 | ( |
8 | 8 | use Carp qw(confess); |
9 | 9 | use strict; |
10 | 10 | |
11 | our $VERSION = '1.23.14'; | |
11 | our $VERSION = '1.23.15'; | |
12 | 12 | our @ISA = ('PDL::Exporter'); |
13 | 13 | our @EXPORT_OK = |
14 | 14 | ( |
9 | 9 | use Carp qw(confess); |
10 | 10 | use strict; |
11 | 11 | |
12 | our $VERSION = '1.23.14'; | |
12 | our $VERSION = '1.23.15'; | |
13 | 13 | our @ISA = ('PDL::Exporter'); |
14 | 14 | our @EXPORT_OK = |
15 | 15 | ( |
11 | 11 | use Carp qw(confess); |
12 | 12 | use strict; |
13 | 13 | |
14 | our $VERSION = '1.23.14'; | |
14 | our $VERSION = '1.23.15'; | |
15 | 15 | our @ISA = ('PDL::Exporter'); |
16 | 16 | our @EXPORT_OK = qw(ccs_writefraw ccs_readfraw ccs_mapfraw); |
17 | 17 | our %EXPORT_TAGS = |
12 | 12 | use Carp qw(confess); |
13 | 13 | use strict; |
14 | 14 | |
15 | our $VERSION = '1.23.14'; | |
15 | our $VERSION = '1.23.15'; | |
16 | 16 | our @ISA = ('PDL::Exporter'); |
17 | 17 | our @EXPORT_OK = |
18 | 18 | ( |
12 | 12 | use Carp qw(confess); |
13 | 13 | use strict; |
14 | 14 | |
15 | our $VERSION = '1.23.14'; | |
15 | our $VERSION = '1.23.15'; | |
16 | 16 | our @ISA = ('PDL::Exporter'); |
17 | 17 | our @EXPORT_OK = |
18 | 18 | ( |
11 | 11 | use Carp qw(confess); |
12 | 12 | use strict; |
13 | 13 | |
14 | our $VERSION = '1.23.14'; | |
14 | our $VERSION = '1.23.15'; | |
15 | 15 | our @ISA = ('PDL::Exporter'); |
16 | 16 | our @EXPORT_OK = |
17 | 17 | ( |
12 | 12 | |
13 | 13 | |
14 | 14 | |
15 | $PDL::CCS::MatrixOps::VERSION = 1.23.14; | |
15 | $PDL::CCS::MatrixOps::VERSION = 1.23.15; | |
16 | 16 | @ISA = ( 'PDL::Exporter','DynaLoader' ); |
17 | 17 | push @PDL::Core::PP, __PACKAGE__; |
18 | 18 | bootstrap PDL::CCS::MatrixOps $VERSION; |
4 | 4 | ##====================================================================== |
5 | 5 | |
6 | 6 | use PDL::VectorValued::Dev; |
7 | my $VERSION = '1.23.14'; ##-- update with perl-reversion from Perl::Version module | |
7 | my $VERSION = '1.23.15'; ##-- update with perl-reversion from Perl::Version module | |
8 | 8 | pp_setversion($VERSION); |
9 | 9 | |
10 | 10 | ##-- for integer-type keys |
18 | 18 | *can = \&UNIVERSAL::can; |
19 | 19 | } |
20 | 20 | |
21 | our $VERSION = '1.23.14'; ##-- update with perl-reversion from Perl::Version module | |
21 | our $VERSION = '1.23.15'; ##-- update with perl-reversion from Perl::Version module | |
22 | 22 | our @ISA = qw(); |
23 | 23 | our %EXPORT_TAGS = |
24 | 24 | ( |
12 | 12 | |
13 | 13 | |
14 | 14 | |
15 | $PDL::CCS::Ops::VERSION = 1.23.14; | |
15 | $PDL::CCS::Ops::VERSION = 1.23.15; | |
16 | 16 | @ISA = ( 'PDL::Exporter','DynaLoader' ); |
17 | 17 | push @PDL::Core::PP, __PACKAGE__; |
18 | 18 | bootstrap PDL::CCS::Ops $VERSION; |
4 | 4 | ##====================================================================== |
5 | 5 | |
6 | 6 | use PDL::VectorValued::Dev; |
7 | my $VERSION = '1.23.14'; ##-- update with perl-reversion from Perl::Version module | |
7 | my $VERSION = '1.23.15'; ##-- update with perl-reversion from Perl::Version module | |
8 | 8 | pp_setversion($VERSION); |
9 | 9 | |
10 | 10 | ##------------------------------------------------------ |
12 | 12 | |
13 | 13 | |
14 | 14 | |
15 | $PDL::CCS::Ufunc::VERSION = 1.23.14; | |
15 | $PDL::CCS::Ufunc::VERSION = 1.23.15; | |
16 | 16 | @ISA = ( 'PDL::Exporter','DynaLoader' ); |
17 | 17 | push @PDL::Core::PP, __PACKAGE__; |
18 | 18 | bootstrap PDL::CCS::Ufunc $VERSION; |
4 | 4 | ##====================================================================== |
5 | 5 | |
6 | 6 | use PDL::VectorValued::Dev; |
7 | my $VERSION = '1.23.14'; ##-- update with perl-reversion from Perl::Version module | |
7 | my $VERSION = '1.23.15'; ##-- update with perl-reversion from Perl::Version module | |
8 | 8 | pp_setversion($VERSION); |
9 | 9 | |
10 | 10 | ##------------------------------------------------------ |
384 | 384 | #GenericTypes => ['B','S','U','L',], ##-- 'Q', 'N' |
385 | 385 | GenericTypes=>$PDL::CCS::Config::ccsConfig{INT_TYPE_CHRS}, |
386 | 386 | }, |
387 | max_type_perl => 'ccs_indx', | |
387 | max_type_perl => $PDL::CCS::Config::ccsConfig{INT_TYPE_MAX_IONAME}, | |
388 | 388 | init_missingOut=>'missingOut = missingVal;', |
389 | 389 | tmp_addmissing =>'if (nMissing > 0) { tmp = tmp | missingVal; }', |
390 | 390 | tmp_addval =>'tmp = (tmp | $nzvalsIn(NnzIn=>nnzii));', |
405 | 405 | #GenericTypes => ['B','S','U','L',], ##-- 'Q', 'N' |
406 | 406 | GenericTypes=>$PDL::CCS::Config::ccsConfig{INT_TYPE_CHRS}, |
407 | 407 | }, |
408 | max_type_perl => 'ccs_indx', | |
408 | max_type_perl => $PDL::CCS::Config::ccsConfig{INT_TYPE_MAX_IONAME}, | |
409 | 409 | init_missingOut=>'missingOut = missingVal;', |
410 | 410 | tmp_addmissing =>'if (nMissing > 0) { tmp &= missingVal; }', |
411 | 411 | tmp_addval =>'tmp = (tmp & $nzvalsIn(NnzIn=>nnzii));', |
492 | 492 | ccs_accum_def('nbad', 'number of bad values', |
493 | 493 | extra =>{HandleBad=>1}, |
494 | 494 | out_type =>'int+', |
495 | max_type_perl =>'ccs_indx', | |
495 | max_type_perl =>'ccs_indx', #$PDL::CCS::Config::ccsConfig{INT_TYPE_MAX_IONAME}, | |
496 | # | |
496 | 497 | #init_missingOut=>'missingOut=$N();', |
497 | 498 | init_missingOut=>'missingOut=missingVal;', ##-- not really right, but compatible |
498 | 499 | ($PDL::Bad::Status |
519 | 520 | ccs_accum_def('ngood', 'number of good values', |
520 | 521 | extra =>{HandleBad=>1}, |
521 | 522 | out_type =>'int+', |
522 | max_type_perl =>'ccs_indx', | |
523 | max_type_perl =>'ccs_indx', #$PDL::CCS::Config::ccsConfig{INT_TYPE_MAX_IONAME}, | |
523 | 524 | #init_missingOut=>'missingOut=$N();', |
524 | 525 | init_missingOut=>'missingOut=missingVal;', ##-- not really right, but compatible |
525 | 526 | ($PDL::Bad::Status |
545 | 546 | ## Operations: Accumulators (Ufuncs): nnz |
546 | 547 | ccs_accum_def('nnz', 'number of non-zero values', |
547 | 548 | out_type =>'int+', |
548 | max_type_perl =>'ccs_indx', | |
549 | max_type_perl =>$PDL::CCS::Config::ccsConfig{INT_TYPE_MAX_IONAME}, | |
549 | 550 | #init_missingOut=>'missingOut=$N();', |
550 | 551 | init_missingOut=>'missingOut=missingVal;', ##-- not really right, but compatible |
551 | 552 | tmp_addmissing =>'if (nMissing > 0 && missingVal != 0) { tmp += nMissing; }', |
12 | 12 | |
13 | 13 | |
14 | 14 | |
15 | $PDL::CCS::Utils::VERSION = 1.23.14; | |
15 | $PDL::CCS::Utils::VERSION = 1.23.15; | |
16 | 16 | @ISA = ( 'PDL::Exporter','DynaLoader' ); |
17 | 17 | push @PDL::Core::PP, __PACKAGE__; |
18 | 18 | bootstrap PDL::CCS::Utils $VERSION; |
4 | 4 | ##====================================================================== |
5 | 5 | |
6 | 6 | use PDL::VectorValued::Dev; |
7 | my $VERSION = '1.23.14'; ##-- update with perl-reversion from Perl::Version module | |
7 | my $VERSION = '1.23.15'; ##-- update with perl-reversion from Perl::Version module | |
8 | 8 | pp_setversion($VERSION); |
9 | 9 | |
10 | 10 | ##------------------------------------------------------ |
2 | 2 | ## Description: set version for PDL::CCS |
3 | 3 | |
4 | 4 | package PDL::CCS::Version; |
5 | our $VERSION = '1.23.14'; ##-- update with perl-reversion from Perl::Version module | |
5 | our $VERSION = '1.23.15'; ##-- update with perl-reversion from Perl::Version module | |
6 | 6 | |
7 | 7 | 1; ##-- make perl happy |
63 | 63 | ##-- check output type |
64 | 64 | SKIP: { |
65 | 65 | skip("${label}:type - only for PDL >= v2.014",1) if (!$HAVE_PDL_2_014); |
66 | ||
67 | # bandover,borover type-checks fail again as of PDL v2.039 | |
68 | # + see http://www.cpantesters.org/cpan/report/9ea0e2bc-a3e5-11eb-8917-5f9a624ac675 | |
69 | # # Failed test 'bandover:missing=0:type' | |
70 | # # at /local/home/moocow/work/diss/perl/public/PDL-CCS/t/common.plt line 11. | |
71 | # # got: 'indx' | |
72 | # # expected: 'longlong' | |
73 | skip("${label}:type - not b*over in PDL >= v2.039 ",1) if ($HAVE_PDL_2_039 && $ufunc_name =~ /^b(?:and|or)over$/); | |
74 | 66 | isok("${label}:type", $ccs_rc->type, $dense_rc->type); |
75 | 67 | } |
76 | 68 |
14 | 14 | use PDL::CCS::IO::FastRaw; |
15 | 15 | use strict; |
16 | 16 | |
17 | our $VERSION = '1.23.14'; ##-- update with perl-reversion from Perl::Version module | |
17 | our $VERSION = '1.23.15'; ##-- update with perl-reversion from Perl::Version module | |
18 | 18 | our @ISA = ('PDL::Exporter'); |
19 | 19 | our @EXPORT_OK = |
20 | 20 | ( |
0 | v1.23.15 Tue, 27 Apr 2021 13:13:20 +0200 moocow | |
1 | + added new PDL-2.039 integer-type listing code to Config.PL | |
2 | + fixed downcasting in b*over methods be PDL-compatible (problem was 'max_int_type' option to ccs_accum_def()) | |
3 | + re-enabled b*over tests skipped in v1.23.14 | |
4 | + added Makefile.PL META_MERGE section pointing to new public github repo moocow-the-bovine/PDL-CCS | |
5 | - github repo is just a fork of read-only ZDL git mirror of upstream SVN repository | |
6 | ||
0 | 7 | v1.23.14 Mon, 26 Apr 2021 14:58:50 +0200 moocow |
1 | 8 | + skip some b(and|or)over type-check tests to avoid test failures for PDL >= v2.039 |
2 | 9 | - CCS implementations are returning 'indx' type here, dense PDL versions are giving 'longlong' for input type=double |
44 | 44 | $cconfig{INDX_TYPEDEF} = "typedef $cconfig{INDX_CTYPE} CCS_Indx; /**< typedef for CCS indices */\n"; |
45 | 45 | $cconfig{INDX_FUNCDEF} = "*ccs_indx = \\&PDL::$cconfig{INDX_FUNC}; ##-- typecasting for CCS indices\n"; |
46 | 46 | |
47 | ##-- figure out what integer types we have available | |
47 | 48 | require PDL::Types; |
48 | $cconfig{INT_TYPE_KEYS} = [map {$_->{sym}} | |
49 | sort {$a->{numval} <=> $b->{numval}} | |
50 | grep {$_->{ppsym} =~ /^(?:[BSULQN]|LL|US)$/} | |
51 | values %PDL::Types::typehash | |
52 | ]; | |
53 | $cconfig{INT_TYPE_CHRS} = [map {$_->{ppsym}} @PDL::Types::typehash{ @{$cconfig{INT_TYPE_KEYS}} }]; | |
49 | if (version->parse($PDL::VERSION) >= version->parse("2.039")) { | |
50 | ##-- integer types for b*over &c, PDL >= v2.039: elegant (and more correct) | |
51 | local $, = ' '; | |
52 | $cconfig{INT_TYPE_KEYS} = [map {$_->sym} grep {$_->integer} PDL::Types::types()]; | |
53 | $cconfig{INT_TYPE_CHRS} = [map {$_->ppsym} grep {$_->integer} PDL::Types::types()]; | |
54 | $cconfig{INT_TYPE_MAX_IONAME} = (grep {$_->integer} PDL::Types::types())[-1]->ioname; | |
55 | } else { | |
56 | ##-- integer types for b*over &c, PDL < v2.039: functional (and mostly equivalent) | |
57 | $cconfig{INT_TYPE_KEYS} = [map {$_->{sym}} | |
58 | sort {$a->{numval} <=> $b->{numval}} | |
59 | grep {$_->{ppsym} =~ /^(?:[BSULQN]|LL|US)$/} | |
60 | values %PDL::Types::typehash | |
61 | ]; | |
62 | $cconfig{INT_TYPE_CHRS} = [map {$_->{ppsym}} @PDL::Types::typehash{ @{$cconfig{INT_TYPE_KEYS}} }]; | |
63 | ||
64 | ##-- PDL < v2.039 downcasts to 'indx' if available (but probably should use 'longlong' if it could) | |
65 | #$cconfig{INT_TYPE_MAX_IONAME} = $PDL::Types::typehash{$cconfig{INT_TYPE_KEYS}[-1]}{ioname}; ##-- -> longlong | |
66 | $cconfig{INT_TYPE_MAX_IONAME} = 'ccs_indx'; | |
67 | } | |
54 | 68 | |
55 | 69 | ##-- save cache file |
56 | 70 | open(CONFIGPM,">./CCS/Config.pm") |
44 | 44 | } |
45 | 45 | }, |
46 | 46 | "release_status" : "stable", |
47 | "version" : "v1.23.14", | |
47 | "version" : "v1.23.15", | |
48 | "x_repository" : { | |
49 | "type" : "git", | |
50 | "url" : "git://github.com/moocow-the-bovine/PDL-CCS.git", | |
51 | "web" : "https://github.com/moocow-the-bovine/PDL-CCS" | |
52 | }, | |
48 | 53 | "x_serialization_backend" : "JSON::PP version 4.02" |
49 | 54 | } |
26 | 26 | PDL: '0' |
27 | 27 | PDL::VectorValued: v1.0.4 |
28 | 28 | Test::More: '0' |
29 | version: v1.23.14 | |
29 | version: v1.23.15 | |
30 | x_repository: | |
31 | type: git | |
32 | url: git://github.com/moocow-the-bovine/PDL-CCS.git | |
33 | web: https://github.com/moocow-the-bovine/PDL-CCS | |
30 | 34 | x_serialization_backend: 'CPAN::Meta::YAML version 0.018' |
40 | 40 | 'ExtUtils::MakeMaker'=>0, |
41 | 41 | 'Data::Dumper' => 0, |
42 | 42 | }, |
43 | ## | |
44 | META_MERGE => { | |
45 | "meta-spec" => { version => 2 }, | |
46 | repository => { | |
47 | url => 'git://github.com/moocow-the-bovine/PDL-CCS.git', | |
48 | type => 'git', | |
49 | web => 'https://github.com/moocow-the-bovine/PDL-CCS', | |
50 | }, | |
51 | }, | |
43 | 52 | ); |
44 | 53 | |
45 | 54 | ##-- avoid applying 'processPL' rules to 'Config.PL' |
11 | 11 | |
12 | 12 | =item * PDL E<gt>= v2.4.2 |
13 | 13 | |
14 | Tested version(s) 2.4.2, 2.4.3, 2.4.7_001, 2.4.9_015. | |
14 | Tested version(s) 2.4.2, 2.4.3, 2.4.7_001, 2.4.9_015, 2.4.10, 2.019, 2.039 | |
15 | 15 | |
16 | 16 | =item * PDL::VectorValued E<gt>= v0.07001 |
17 | 17 | |
31 | 31 | Build this module as you would any perl module, by doing something |
32 | 32 | akin to the following: |
33 | 33 | |
34 | gzip -dc distname-XX.YY.tar.gz | tar -xof - | |
35 | cd distname-XX.YY/ | |
34 | gzip -dc PDL-CCS-XYZ.tar.gz | tar -xof - | |
35 | cd PDL-CCS-XYZ/ | |
36 | 36 | perl Makefile.PL |
37 | 37 | make |
38 | 38 | make test # optional |
46 | 46 | |
47 | 47 | =head1 COPYRIGHT |
48 | 48 | |
49 | Copyright (c) 2005-2018 by Bryan Jurish. All rights reserved. | |
49 | Copyright (c) 2005-2021 by Bryan Jurish. All rights reserved. | |
50 | 50 | |
51 | 51 | This package is free software, and entirely without warranty. |
52 | 52 | You may redistribute it and/or modify it under the same terms |
6 | 6 | REQUIREMENTS |
7 | 7 | * PDL >= v2.4.2 |
8 | 8 | |
9 | Tested version(s) 2.4.2, 2.4.3, 2.4.7_001, 2.4.9_015. | |
9 | Tested version(s) 2.4.2, 2.4.3, 2.4.7_001, 2.4.9_015, 2.4.10, 2.019, | |
10 | 2.039 | |
10 | 11 | |
11 | 12 | * PDL::VectorValued >= v0.07001 |
12 | 13 | |
22 | 23 | Build this module as you would any perl module, by doing something akin |
23 | 24 | to the following: |
24 | 25 | |
25 | gzip -dc distname-XX.YY.tar.gz | tar -xof - | |
26 | cd distname-XX.YY/ | |
26 | gzip -dc PDL-CCS-XYZ.tar.gz | tar -xof - | |
27 | cd PDL-CCS-XYZ/ | |
27 | 28 | perl Makefile.PL |
28 | 29 | make |
29 | 30 | make test # optional |
35 | 36 | Bryan Jurish <moocow@cpan.org> |
36 | 37 | |
37 | 38 | COPYRIGHT |
38 | Copyright (c) 2005-2018 by Bryan Jurish. All rights reserved. | |
39 | Copyright (c) 2005-2021 by Bryan Jurish. All rights reserved. | |
39 | 40 | |
40 | 41 | This package is free software, and entirely without warranty. You may |
41 | 42 | redistribute it and/or modify it under the same terms as Perl itself. |