Merge pull request #25 from mohawk2/fixups

Fixups for MacOS and testing
wlmb · Dec 31, 2024 · fe6a5b5 · fe6a5b5
2 parents cc2d1bb + 7fe658d
commit fe6a5b5
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 27 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        perl-version: ['5.14', '5.20']
+        perl-version: ['5.16', '5.20']
         include:
           - perl-version: '5.30'
             os: ubuntu-latest

diff --git a/Makefile.PL b/Makefile.PL
@@ -42,9 +42,7 @@ WriteMakefile(
     },
     TEST_REQUIRES => {
         'Machine::Epsilon'            => '0',
-	'Test::More'                  => '0',
-	'Test::Version'               => '1.003001'
-
+	'Test::More'                  => '0.88',
     },
     CONFIGURE_REQUIRES => {
 	'ExtUtils::MakeMaker' => '0',

diff --git a/lib/Photonic/Geometry/FromImage2D.pm b/lib/Photonic/Geometry/FromImage2D.pm
@@ -99,8 +99,8 @@ use Moo;
 use MooX::StrictConstructor;
 
 BEGIN {
-# Put inoffensive path. Or else, PDL::IO::Pic fails in taint mode.
-    $ENV{'PATH'} = '/bin:/usr/bin';
+# Put inoffensive path in taint mode. Or else, PDL::IO::Pic fails.
+    $ENV{PATH} = '/bin:/usr/bin' if ${^TAINT};
 }
 
 use PDL::Lite;
@@ -119,7 +119,6 @@ sub _build_B {
     my $self=shift;
     my $path=$self->path;
     ( $path ) = ($path =~ m|^([A-Z0-9_.-\\/]+)$|ig);
-    ($ENV{PATH})=($ENV{PATH}=~m|^([A-Z0-9_.-\\/]+)$|ig);
     confess
 	"Only letters, numbers, underscores, dots, slashes and hyphens " .
 	"allowed in file names"

diff --git a/lib/Photonic/Roles/Reorthogonalize.pm b/lib/Photonic/Roles/Reorthogonalize.pm
@@ -185,10 +185,10 @@ sub _fullorthogonalize_indeed {
 sub _checkorthogonalize {
     my ($self, $n, $a, $b, $c, $b_np1, $g_n, $g_np1)=@_;
     return 0 if $self->fullorthogonalize_N; #already orthogonalizing
-    if($self->_justorthogonalized){
+    if ($self->_justorthogonalized) {
 	$self->_write_justorthogonalized(0);
-	my $current_W=PDL->ones($n)*$self->noise;
-	my $next_W=PDL->ones($n+1)*$self->noise;
+	my $current_W=PDL->ones($g_n->type, $n)*$self->noise;
+	my $next_W=PDL->ones($g_np1->type, $n+1)*$self->noise;
 	$current_W->(-1).=$g_n;
 	$next_W->(-1).=$g_np1;
 	$self->_current_W($current_W);

diff --git a/t/field-lenr2.t b/t/field-lenr2.t
@@ -40,6 +40,7 @@ use Photonic::LE::NR2::SHChiTensor;
 use Test::More;
 use lib 't/lib';
 use TestUtils;
+use Machine::Epsilon;
 
 my $ea=1+2*i;
 my $eb=3+4*i;
@@ -364,46 +365,46 @@ $expected = pdl(<<'EOF');
  [ -0.014991596+0.011757369i ]
 ]
 EOF
-ok(Cagree($got, $expected, 1e-18), "SHChiTensor SHPs P2") or diag "got: $got\nexpected: $expected";
+ok(Cagree($got, $expected, machine_epsilon()), "SHChiTensor SHPs P2") or diag "got: $got\nexpected: $expected";
 $got = $chi->evaluate;
 $expected = pdl(<<'EOF');
-[ [ [ 2.06087e-17+3.64698e-17i ] ] ]
+[ [ [ 0 ] ] ]
 EOF
-ok(Cagree($got, $expected, 1e-41), "P2") or diag "got: $got\nexpected: $expected";
+ok(Cagree($got, $expected, machine_epsilon()), "P2") or diag "got: $got\nexpected: $expected";
 $got = $chi->evaluate(kind => 'f', mask => pdl(1));
 $expected = pdl(<<'EOF');
-[ [ [ 4.0239976e-18-9.855343e-19i ] ] ]
+[ [ [ 0 ] ] ]
 EOF
-ok(Cagree($got, $expected, 1e-50), "P2") or diag "got: $got\nexpected: $expected";
+ok(Cagree($got, $expected, machine_epsilon()), "P2") or diag "got: $got\nexpected: $expected";
 $got = $chi->evaluate(kind => 'l');
 $expected = pdl(<<'EOF');
-[ [ [ 1.4979937e-18+3.6442788e-18i ] ] ]
+[ [ [ 0 ] ] ]
 EOF
-ok(Cagree($got, $expected, 1e-51), "selfConsistentVecL") or diag "got: $got\nexpected: $expected";
+ok(Cagree($got, $expected, machine_epsilon()), "selfConsistentVecL") or diag "got: $got\nexpected: $expected";
 $got = $chi->evaluate(kind => 'a');
 $expected = pdl(<<'EOF');
-[ [ [ -4.890401e-16+5.6504395e-16i ] ] ]
+[ [ [ 0 ] ] ]
 EOF
-ok(Cagree($got, $expected, 1e-47), "P2LMCalt") or diag "got: $got\nexpected: $expected";
+ok(Cagree($got, $expected, machine_epsilon()), "P2LMCalt") or diag "got: $got\nexpected: $expected";
 $got = $chi->evaluate(kind => 'd');
 $expected = pdl(<<'EOF');
-[ [ [ 5.0464683e-18+2.5232341e-18i ] ] ]
+[ [ [ 0 ] ] ]
 EOF
-ok(Cagree($got, $expected, 1e-50), "dipolar") or diag "got: $got\nexpected: $expected";
+ok(Cagree($got, $expected, machine_epsilon()), "dipolar") or diag "got: $got\nexpected: $expected";
 $got = $chi->evaluate(kind => 'q');
 $expected = pdl(<<'EOF');
-[ [ [ 1.5770213e-19+3.1540427e-19i ] ] ]
+[ [ [ 0 ] ] ]
 EOF
-ok(Cagree($got, $expected, 1e-50), "quadrupolar") or diag "got: $got\nexpected: $expected";
+ok(Cagree($got, $expected, machine_epsilon()), "quadrupolar") or diag "got: $got\nexpected: $expected";
 $got = $chi->evaluate(kind => 'e');
 $expected = pdl(<<'EOF');
-[ [ [ 9.9352345e-18+1.5770213e-18i ] ] ]
+[ [ [ 0 ] ] ]
 EOF
-ok(Cagree($got, $expected, 1e-50), "external") or diag "got: $got\nexpected: $expected";
+ok(Cagree($got, $expected, machine_epsilon()), "external") or diag "got: $got\nexpected: $expected";
 $got = $chi->evaluate(kind => 'el');
 $expected = pdl(<<'EOF');
-[ [ [ 7.2542982e-18+1.4193192e-18i ] ] ]
+[ [ [ 0 ] ] ]
 EOF
-ok(Cagree($got, $expected, 1e-50), "externalVecL") or diag "got: $got\nexpected: $expected";
+ok(Cagree($got, $expected, machine_epsilon()), "externalVecL") or diag "got: $got\nexpected: $expected";
 
 done_testing;