Merged in cbillington/labscript_devices/remove_workaround (pull request #54)

remove use of numpy dtype workaround

Author: chrisjbillington

AlazarTechBoard.py

@@ -18,9 +18,6 @@
 # or keep in local directory.
 import labscript_devices.atsapi as ats
 
-# Workaround for compound dtypes (numpy issue #10672)
-from labscript_utils.numpy_dtype_workaround import dtype_workaround
-
 # TDQM progress indicator defaults
 tqdm_kwargs = {'file': sys.stdout, 'ascii': False, 'ncols': 80}
 
@@ -165,7 +162,7 @@ def generate_code(self, hdf5_file):
         acquisitions_table_dtypes = [('connection', 'a256'), ('label', 'a256'), ('start', float),
                                      ('stop', float), ('wait label', 'a256'), ('scale factor', float), ('units', 'a256')]
         acquisition_table = np.empty(
-            len(acquisitions), dtype=dtype_workaround(acquisitions_table_dtypes))
+            len(acquisitions), dtype=acquisitions_table_dtypes)
         for i, acq in enumerate(acquisitions):
             acquisition_table[i] = acq
             grp = self.init_device_group(hdf5_file)
@@ -216,11 +213,11 @@ def find_clock_and_r(f, clocks):
     # that exceeds the requested frequency f.
     divisors, remainders = divmod(clocks, f)
     opts_dtypes = [('rem', 'i4'), ('div', 'i4'), ('clock', 'i4')]
-    opts = np.array(list(zip(remainders, divisors, clocks)), dtype=dtype_workaround(opts_dtypes))
-    opts.sort(order=b'rem' if PY2 else 'rem')
+    opts = np.array(list(zip(remainders, divisors, clocks)), dtype=opts_dtypes)
+    opts.sort(order='rem')
     minrem = opts['rem'][0]
     # This gets the option with minimum remainder and maximum divisor
-    bestopt = np.sort(opts[opts['rem'] == minrem], order=b'div' if PY2 else 'div')[-1]
+    bestopt = np.sort(opts[opts['rem'] == minrem], order='div')[-1]
     return bestopt['clock'], bestopt['div']
 
 

DummyIntermediateDevice.py

@@ -28,7 +28,6 @@
 
 from labscript_devices import labscript_device, BLACS_tab, BLACS_worker
 from labscript import IntermediateDevice, DigitalOut, AnalogOut, config
-from labscript_utils.numpy_dtype_workaround import dtype_workaround
 import numpy as np
 
 @labscript_device
@@ -62,7 +61,7 @@ def generate_code(self, hdf5_file):
             dtypes.append((device.name, device_dtype))
 
         # create dataset
-        out_table = np.zeros(len(times), dtype=dtype_workaround(dtypes))
+        out_table = np.zeros(len(times), dtype=dtypes)
         for device in self.child_devices:
             out_table[device.name][:] = device.raw_output
 

PulseBlaster.py

@@ -16,7 +16,6 @@
     str = unicode
 
 from labscript_devices import BLACS_tab, runviewer_parser
-from labscript_utils.numpy_dtype_workaround import dtype_workaround
 
 from labscript import Device, PseudoclockDevice, Pseudoclock, ClockLine, IntermediateDevice, DigitalQuantity, DigitalOut, DDS, config, LabscriptError, set_passed_properties
 
@@ -548,7 +547,7 @@ def write_pb_inst_to_h5(self, pb_inst, hdf5_file):
                     ('dds_en1', np.int32), ('phase_reset1', np.int32),
                     ('flags', np.int32), ('inst', np.int32),
                     ('inst_data', np.int32), ('length', np.float64)]
-        pb_inst_table = np.empty(len(pb_inst),dtype = dtype_workaround(pb_dtype))
+        pb_inst_table = np.empty(len(pb_inst),dtype = pb_dtype)
         for i,inst in enumerate(pb_inst):
             flagint = int(inst['flags'][::-1],2)
             instructionint = self.pb_instructions[inst['instruction']]

PulseBlaster_No_DDS.py

@@ -15,7 +15,6 @@
 if PY2:
     str = unicode
 
-from labscript_utils.numpy_dtype_workaround import dtype_workaround
 from labscript_devices import BLACS_tab, runviewer_parser
 from labscript_devices.PulseBlaster import PulseBlaster, PulseBlasterParser
 from labscript import PseudoclockDevice, config
@@ -34,7 +33,7 @@ class PulseBlaster_No_DDS(PulseBlaster):
 
     def write_pb_inst_to_h5(self, pb_inst, hdf5_file):
         # OK now we squeeze the instructions into a numpy array ready for writing to hdf5:
-        pb_dtype= dtype_workaround([('flags',np.int32), ('inst',np.int32), ('inst_data',np.int32), ('length',np.float64)])
+        pb_dtype= [('flags',np.int32), ('inst',np.int32), ('inst_data',np.int32), ('length',np.float64)]
         pb_inst_table = np.empty(len(pb_inst),dtype = pb_dtype)
         for i,inst in enumerate(pb_inst):
             flagint = int(inst['flags'][::-1],2)

RFBlaster.py

@@ -19,7 +19,6 @@
 from labscript import PseudoclockDevice, Pseudoclock, ClockLine, IntermediateDevice, DDS, config, startupinfo, LabscriptError, set_passed_properties
 import numpy as np
 
-from labscript_utils.numpy_dtype_workaround import dtype_workaround
 from labscript_devices import BLACS_tab, runviewer_parser
 
 # Define a RFBlasterPseudoclock that only accepts one child clockline
@@ -93,7 +92,7 @@ def generate_code(self, hdf5_file):
 
         # Generate clock and save raw instructions to the h5 file:
         PseudoclockDevice.generate_code(self, hdf5_file)
-        dtypes = dtype_workaround([('time',float),('amp0',float),('freq0',float),('phase0',float),('amp1',float),('freq1',float),('phase1',float)])
+        dtypes = [('time',float),('amp0',float),('freq0',float),('phase0',float),('amp1',float),('freq1',float),('phase1',float)]
 
         times = self.pseudoclock.times[self._clock_line]
 
@@ -108,9 +107,9 @@ def generate_code(self, hdf5_file):
         group.create_dataset('TABLE_DATA',compression=config.compression, data=data)
 
         # Quantise the data and save it to the h5 file:
-        quantised_dtypes = dtype_workaround([('time',np.int64),
+        quantised_dtypes = [('time',np.int64),
                             ('amp0',np.int32), ('freq0',np.int32), ('phase0',np.int32),
-                            ('amp1',np.int32), ('freq1',np.int32), ('phase1',np.int32)])
+                            ('amp1',np.int32), ('freq1',np.int32), ('phase1',np.int32)]
 
         quantised_data = np.zeros(len(times),dtype=quantised_dtypes)
         quantised_data['time'] = np.array(c.tT*1e6*data['time']+0.5)

__init__.py

@@ -25,6 +25,7 @@
 check_version('labscript', '2.1', '3')
 check_version('blacs', '2.4.0', '3.0.0')
 check_version('zprocess', '2.2.7', '3')
+check_version('numpy', '1.15.1', '2')
 
 from labscript_utils import labscript_suite_install_dir, dedent