TST fix tests for JAX-Galsim

galsim/utilities.py

@@ -36,6 +36,10 @@
 import copy
 from distutils.version import LooseVersion
 
+# import these here so JAX-GalSim can patch them
+import galsim
+import coord
+
 from . import _galsim
 from .errors import GalSimError, GalSimValueError, GalSimIncompatibleValuesError, GalSimRangeError
 from .errors import galsim_warn
@@ -1576,8 +1580,6 @@ def check_pickle(obj, func = lambda x : x, irreprable=False, random=None):
                         it has an rng attribute or it is a galsim.BaseDeviate]
     """
     # In case the repr uses these:
-    import galsim
-    import coord
     import astropy
     from numpy import array, uint16, uint32, int16, int32, float32, float64, complex64, complex128, ndarray
     from astropy.units import Unit

setup.py

@@ -122,6 +122,10 @@ def all_files_from(dir, ext=''):
 if "--debug" in sys.argv or "--verbose" in sys.argv:
     debug = True
 
+debug = True
+
+
+
 local_tmp = 'tmp'
 
 def get_compiler_type(compiler, check_unknown=True, output=False):
@@ -245,7 +249,7 @@ def supports_gpu(compiler, cc_type):
     extra_cflags = copt[cc_type]
     extra_lflags = lopt[cc_type]
     return try_compile(cpp_code, compiler, extra_cflags, extra_lflags)
-    
+
 # Check for the fftw3 library in some likely places
 def find_fftw_lib(output=False):
     import distutils.sysconfig
@@ -435,29 +439,29 @@ def find_eigen_dir(output=False):
         if output:
             print("Downloaded %s.  Unpacking tarball."%fname)
         with tarfile.open(fname) as tar:
-            
+
             def is_within_directory(directory, target):
-                
+
                 abs_directory = os.path.abspath(directory)
                 abs_target = os.path.abspath(target)
-            
+
                 prefix = os.path.commonprefix([abs_directory, abs_target])
-                
+
                 return prefix == abs_directory
-            
+
             def safe_extract(tar, path=".", members=None, *, numeric_owner=False):
                 # Avoid security vulnerability in tar.extractall function.
                 # This bit of code was added by the Advanced Research Center at Trellix in PR #1188.
                 # For more information about the security vulnerability, see
                 # https://github.com/advisories/GHSA-gw9q-c7gh-j9vm
-            
+
                 for member in tar.getmembers():
                     member_path = os.path.join(path, member.name)
                     if not is_within_directory(path, member_path):
                         raise Exception("Attempted Path Traversal in Tar File")
-            
-                tar.extractall(path, members, numeric_owner=numeric_owner) 
-            
+
+                tar.extractall(path, members, numeric_owner=numeric_owner)
+
             safe_extract(tar, dir)
         os.remove(fname)
         # This actually extracts into a subdirectory with a name eigen-eigen-5a0156e40feb/

tests/galsim_test_helpers.py

@@ -30,6 +30,29 @@
 from numpy.testing import assert_raises
 from numpy.testing import assert_warns
 
+__all__ = [
+    "default_params",
+    "gsobject_compare",
+    "printval",
+    "convertToShear",
+    "check_basic_x",
+    "check_basic_k",
+    "assert_floatlike",
+    "assert_intlike",
+    "check_basic",
+    "do_shoot",
+    "do_kvalue",
+    "radial_integrate",
+    "drawNoise",
+    "check_pickle",
+    "check_all_diff",
+    "timer",
+    "CaptureLog",
+    "assert_raises",
+    "assert_warns",
+    "Profile",
+]
+
 # This file has some helper functions that are used by tests from multiple files to help
 # avoid code duplication.
 
@@ -138,20 +161,32 @@ def check_basic_x(prof, name, approx_maxsb=False, scale=None):
         np.testing.assert_allclose(
                 image(i,j), prof._xValue(galsim.PositionD(x,y)), rtol=1.e-5,
                 err_msg="%s profile sb image does not match _xValue at %d,%d"%(name,i,j))
-    assert prof.withFlux.__doc__ == galsim.GSObject.withFlux.__doc__
-    assert prof.__class__.withFlux.__doc__ == galsim.GSObject.withFlux.__doc__
+    if hasattr(galsim, "_galsim"):
+        assert prof.withFlux.__doc__ == galsim.GSObject.withFlux.__doc__
+        assert prof.__class__.withFlux.__doc__ == galsim.GSObject.withFlux.__doc__
+    else:
+        for line in galsim.GSObject.withFlux.__doc__.splitlines():
+            if line.strip() and "LAX" not in line:
+                assert line.strip() in prof.withFlux.__doc__, (
+                    prof.withFlux.__doc__, galsim.GSObject.withFlux.__doc__,
+                )
+        for line in galsim.GSObject.withFlux.__doc__.splitlines():
+            if line.strip() and "LAX" not in line:
+                assert line.strip() in prof.__class__.withFlux.__doc__, (
+                    prof.__class__.withFlux.__doc__, galsim.GSObject.withFlux.__doc__,
+                )
 
     # Check negative flux:
     neg_image = prof.withFlux(-prof.flux).drawImage(method='sb', scale=scale, use_true_center=False)
-    np.testing.assert_almost_equal(neg_image.array/prof.flux, -image.array/prof.flux, 7,
-                                   '%s negative flux drawReal is not negative of +flux image'%name)
+    np.testing.assert_array_almost_equal(neg_image.array/prof.flux, -image.array/prof.flux, 7,
+                                         '%s negative flux drawReal is not negative of +flux image'%name)
 
     # Direct call to drawReal should also work and be equivalent to the above with scale = 1.
     prof.drawImage(image, method='sb', scale=1., use_true_center=False)
     image2 = image.copy()
     prof.drawReal(image2)
-    np.testing.assert_equal(image2.array, image.array,
-                            err_msg="%s drawReal not equivalent to drawImage"%name)
+    np.testing.assert_array_equal(image2.array, image.array,
+                                  err_msg="%s drawReal not equivalent to drawImage"%name)
 
     # If supposed to be axisymmetric, make sure it is.
     if prof.is_axisymmetric:
@@ -199,7 +234,7 @@ def check_basic_k(prof, name):
 
     # Check negative flux:
     neg_image = prof.withFlux(-prof.flux).drawKImage(kimage.copy())
-    np.testing.assert_almost_equal(neg_image.array/prof.flux, -kimage.array/prof.flux, 7,
+    np.testing.assert_array_almost_equal(neg_image.array/prof.flux, -kimage.array/prof.flux, 7,
                                    '%s negative flux drawK is not negative of +flux image'%name)
 
     # If supposed to be axisymmetric, make sure it is in the kValues.
@@ -211,6 +246,30 @@ def check_basic_k(prof, name):
             np.testing.assert_allclose(test_values, ref_value, rtol=1.e-5,
                                        err_msg="%s profile not axisymmetric in kValues"%name)
 
+def assert_floatlike(val):
+    assert (
+        isinstance(val, float)
+        or (
+            (not hasattr(galsim, "_galsim"))
+            and hasattr(val, "shape")
+            and val.shape == ()
+            and hasattr(val, "dtype")
+            and val.dtype.name in ["float", "float32", "float64"]
+        )
+    ), "Value is not float-like: type(%r) = %r" % (val, type(val))
+
+def assert_intlike(val):
+    assert (
+        isinstance(val, int)
+        or (
+            (not hasattr(galsim, "_galsim"))
+            and hasattr(val, "shape")
+            and val.shape == ()
+            and hasattr(val, "dtype")
+            and val.dtype.name in ["int", "int32", "int64"]
+        )
+    ), "Value is not int-like: type(%r) = %r" % (val, type(val))
+
 def check_basic(prof, name, approx_maxsb=False, scale=None, do_x=True, do_k=True):
     """Do some basic sanity checks that should work for all profiles.
     """
@@ -225,12 +284,12 @@ def check_basic(prof, name, approx_maxsb=False, scale=None, do_x=True, do_k=True
             prof.positive_flux - prof.negative_flux, prof.flux,
             err_msg="%s profile flux not equal to posflux + negflux"%name)
     assert isinstance(prof.centroid, galsim.PositionD)
-    assert isinstance(prof.flux, float)
-    assert isinstance(prof.positive_flux, float)
-    assert isinstance(prof.negative_flux, float)
-    assert isinstance(prof.max_sb, float)
-    assert isinstance(prof.stepk, float)
-    assert isinstance(prof.maxk, float)
+    assert_floatlike(prof.flux)
+    assert_floatlike(prof.positive_flux)
+    assert_floatlike(prof.negative_flux)
+    assert_floatlike(prof.max_sb)
+    assert_floatlike(prof.stepk)
+    assert_floatlike(prof.maxk)
     assert isinstance(prof.has_hard_edges, bool)
     assert isinstance(prof.is_axisymmetric, bool)
     assert isinstance(prof.is_analytic_x, bool)

tests/test_celestial.py

@@ -17,6 +17,7 @@
 #
 
 import numpy
+import numpy as np
 import os
 import sys
 import math

tests/test_chromatic.py

@@ -16,6 +16,7 @@
 #    and/or other materials provided with the distribution.
 #
 
+import copy
 import os
 import numpy as np
 

tests/test_config_gsobject.py

@@ -16,6 +16,7 @@
 #    and/or other materials provided with the distribution.
 #
 
+import logging
 import numpy as np
 import os
 import sys

tests/test_convolve.py

@@ -23,8 +23,8 @@
 import galsim
 from galsim_test_helpers import *
 
-imgdir = os.path.join(".", "SBProfile_comparison_images") # Directory containing the reference
-                                                          # images.
+# Directory containing the reference images.
+imgdir = os.path.join(os.path.dirname(__file__), "SBProfile_comparison_images")
 
 @timer
 def test_convolve():
@@ -497,9 +497,9 @@ def test_deconvolve():
 
     cen = galsim.PositionD(0,0)
     np.testing.assert_equal(inv_psf.centroid, cen)
-    np.testing.assert_almost_equal(inv_psf.flux, 1./psf.flux)
+    np.testing.assert_array_almost_equal(inv_psf.flux, 1./psf.flux)
     # This doesn't really have any meaning, but this is what we've assigned to a deconvolve max_sb.
-    np.testing.assert_almost_equal(inv_psf.max_sb, -psf.max_sb / psf.flux**2)
+    np.testing.assert_array_almost_equal(inv_psf.max_sb, -psf.max_sb / psf.flux**2)
 
     check_basic(inv_psf, "Deconvolve(Moffat)", do_x=False)
 

tests/test_correlatednoise.py

@@ -16,6 +16,7 @@
 #    and/or other materials provided with the distribution.
 #
 
+import os
 import time
 import numpy as np
 

tests/test_download.py

@@ -16,6 +16,7 @@
 #    and/or other materials provided with the distribution.
 #
 
+import os
 import sys
 import logging
 import builtins

tests/test_errors.py

@@ -16,6 +16,7 @@
 #    and/or other materials provided with the distribution.
 #
 
+import numpy as np
 import galsim
 from galsim_test_helpers import *
 

tests/test_fitsheader.py

@@ -51,7 +51,7 @@ def check_tpv(header):
         assert 54384.18627436 in header.itervalues()
 
     file_name = 'tpv.fits'
-    dir = 'fits_files'
+    dir = os.path.join(os.path.dirname(__file__), 'fits_files')
     # First option: give a file_name
     header = galsim.FitsHeader(file_name=os.path.join(dir,file_name))
     check_tpv(header)
@@ -191,7 +191,7 @@ def check_tpv(header):
 def test_scamp():
     """Test that we can read in a SCamp .head file correctly
     """
-    dir = 'fits_files'
+    dir = os.path.join(os.path.dirname(__file__), 'fits_files')
     file_name = 'scamp.head'
 
     header = galsim.FitsHeader(file_name=file_name, dir=dir, text_file=True)