minor: dtype as string (towards #21)

gallantlab · May 9, 2020 · 07c0a11 · 07c0a11
1 parent 7e254d9
commit 07c0a11
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/moten/core.py b/moten/core.py
@@ -27,7 +27,7 @@
 def raw_project_stimulus(stimulus,
                          filters,
                          vhsize=(),
-                         dtype=np.float32):
+                         dtype='float32'):
     '''Obtain responses to the stimuli from all filter quadrature-pairs.
 
     Parameters
@@ -80,7 +80,7 @@ def project_stimulus(stimulus,
                      quadrature_combination=sqrt_sum_squares,
                      output_nonlinearity=log_compress,
                      vhsize=(),
-                     dtype=np.float32):
+                     dtype='float32'):
     '''Compute the motion-energy filter responses to the stimuli.
 
     Parameters
@@ -134,7 +134,7 @@ def __init__(self,
                  nimages=np.inf,
                  batch_size=100,
                  output_nonlinearity=pointwise_square,
-                 dtype=np.float32):
+                 dtype='float32'):
         '''
         '''
         self.size = size

diff --git a/moten/io.py b/moten/io.py
@@ -62,7 +62,7 @@ def generate_frames_from_greyvideo(video_file, size=None, nimages=np.inf):
 def generate_frame_difference_from_greyvideo(video_file,
                                              size=None,
                                              nimages=np.inf,
-                                             dtype=np.float32):
+                                             dtype='float32'):
     vbuffer = video_buffer(video_file, nimages=nimages)
     previous_frame = 0
     for frame_index, image_rgb in enumerate(vbuffer):

diff --git a/moten/tests/test_spatiotemporal.py b/moten/tests/test_spatiotemporal.py
@@ -17,17 +17,17 @@ def test_oldapi():
 
     # inferred aspect ratio
     moten_features_defaults = moten.core.compute_filter_responses(luminance_images, 24,
-                                                                  dtype=np.float32)
+                                                                  dtype='float32')
 
     # wrong aspect ratio
     moten_features_wrong = moten.core.compute_filter_responses(luminance_images, 24,
                                                                aspect_ratio=1.0,
-                                                               dtype=np.float32)
+                                                               dtype='float32')
 
     # exact aspect ratio
     moten_features_exact = moten.core.compute_filter_responses(luminance_images, 24,
                                                           aspect_ratio=aspect_ratio,
-                                                          dtype=np.float32)
+                                                          dtype='float32')
 
 
     # custom pyramid
@@ -43,11 +43,11 @@ def test_oldapi():
 
     moten_features_custom = moten.core.compute_filter_responses(luminance_images, 24,
                                                                 aspect_ratio=aspect_ratio,
-                                                                dtype=np.float32,
+                                                                dtype='float32',
                                                                 pyramid_parameters=pyramid_parameters)
 
 
     # spatial only
     ##############################
     gabor_features_custom = moten.core.compute_spatial_gabor_responses(luminance_images,
-                                                                       dtype=np.float32)
+                                                                       dtype='float32')
diff --git a/moten/utils.py b/moten/utils.py
@@ -62,7 +62,7 @@ def iterator_func(*args, **kwargs):
 def pixbypix_covariance_from_frames_generator(data_generator,
                                               batch_size=1000,
                                               output_nonlinearity=pointwise_square,
-                                              dtype=np.float32):
+                                              dtype='float32'):
     '''
     Parameters
     ----------