dxpy 0.398.0__tar.gz → 0.399.0__tar.gz

{dxpy-0.398.0 → dxpy-0.399.0}/PKG-INFO

@@ -1,11 +1,12 @@
 Metadata-Version: 2.1
 Name: dxpy
-Version: 0.398.0
+Version: 0.399.0
 Summary: DNAnexus Platform API bindings for Python
 Home-page: https://github.com/dnanexus/dx-toolkit
 Author: Aleksandra Zalcman, Andrey Kislyuk, Anurag Biyani, Geet Duggal, Katherine Lai, Kurt Jensen, Marek Hrvol, Ohad Rodeh, Phil Sung
 Author-email: support@dnanexus.com
 License: Apache Software License
+Platform: UNKNOWN
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
@@ -124,3 +125,5 @@ We have the following convention for these scripts:
   if __name__ == '__main__':
       main()
   ```
+
+

{dxpy-0.398.0 → dxpy-0.399.0}/dxpy/cli/parsers.py

@@ -313,8 +313,18 @@ class PrintInstanceTypeHelp(argparse.Action):
         print()
         print('Available instance types:')
         print()
-        print(format_table(InstanceTypesCompleter.instance_types.values(),
-                           column_names=list(InstanceTypesCompleter.instance_types.values())[0]._fields))
+        print(format_table(InstanceTypesCompleter.standard_instance_types.values(),
+                           column_names=list(InstanceTypesCompleter.standard_instance_types.values())[0]._fields))
+        print()
+        print('GPU instance types:')
+        print()
+        print(format_table(InstanceTypesCompleter.gpu_instance_types.values(),
+                           column_names=list(InstanceTypesCompleter.gpu_instance_types.values())[0]._fields))
+        print()
+        print('FPGA instance types:')
+        print()
+        print(format_table(InstanceTypesCompleter.fpga_instance_types.values(),
+                           column_names=list(InstanceTypesCompleter.fpga_instance_types.values())[0]._fields))
         parser.exit(0)
 
 instance_type_arg = argparse.ArgumentParser(add_help=False)

{dxpy-0.398.0 → dxpy-0.399.0}/dxpy/scripts/dx_app_wizard.py

@@ -366,10 +366,10 @@ array:boolean  array:int      boolean        hash           string''')
     print('')
     print(BOLD('Common AWS instance types:'))
     print(format_table(InstanceTypesCompleter.aws_preferred_instance_types.values(),
-                       column_names=list(InstanceTypesCompleter.instance_types.values())[0]._fields))
+                       column_names=list(InstanceTypesCompleter.aws_preferred_instance_types.values())[0]._fields))
     print(BOLD('Common Azure instance types:'))
     print(format_table(InstanceTypesCompleter.azure_preferred_instance_types.values(),
-                       column_names=list(InstanceTypesCompleter.instance_types.values())[0]._fields))
+                       column_names=list(InstanceTypesCompleter.azure_preferred_instance_types.values())[0]._fields))
     print(fill(BOLD('Default instance type:') + ' The instance type you select here will apply to all entry points in ' +
                'your app unless you override it. See ' +
                BOLD('https://documentation.dnanexus.com/developer/api/running-analyses/instance-types') + ' for more information.'))

dxpy-0.399.0/dxpy/toolkit_version.py

@@ -0,0 +1 @@
+version = '0.399.0'

{dxpy-0.398.0 → dxpy-0.399.0}/dxpy/utils/completer.py

@@ -410,111 +410,218 @@ class MultiCompleter():
             return None
 
 class InstanceTypesCompleter():
-    InstanceTypeSpec = namedtuple('InstanceTypeSpec', ('Name', 'Memory_GB', 'Storage_GB', 'CPU_Cores'))
+    InstanceTypeSpec = namedtuple('InstanceTypeSpec', ('Name', 'CPU_Cores', 'Memory_GiB', 'Storage_GB'))
+    GpuInstanceTypeSpec = namedtuple('GpuInstanceTypeSpec', ('Name', 'CPU_Cores', 'Memory_GiB', 'Storage_GB', 'GPU', 'GPU_Memory_GiB'))
+    FpgaInstanceTypeSpec = namedtuple('FpgaInstanceTypeSpec', ('Name', 'CPU_Cores', 'Memory_GiB', 'Storage_GB', 'FPGA'))
 
     # AWS
     aws_preferred_instance_types = OrderedDict()
-    for i in (InstanceTypeSpec('mem1_ssd1_v2_x2', 4.0, 50, 2),
-              InstanceTypeSpec('mem1_ssd1_v2_x4', 8.0, 100, 4),
-              InstanceTypeSpec('mem1_ssd1_v2_x8', 16.0, 200, 8),
-              InstanceTypeSpec('mem1_ssd1_v2_x16', 32.0, 400, 16),
-              InstanceTypeSpec('mem1_ssd1_v2_x36', 72.0, 900, 36),
-              InstanceTypeSpec('mem1_ssd1_v2_x72', 144.0, 1800, 72),
-
-              InstanceTypeSpec('mem2_ssd1_v2_x2', 8.0, 75, 2),
-              InstanceTypeSpec('mem2_ssd1_v2_x4', 16.0, 150, 4),
-              InstanceTypeSpec('mem2_ssd1_v2_x8', 32.0, 300, 8),
-              InstanceTypeSpec('mem2_ssd1_v2_x16', 64.0, 600, 16),
-              InstanceTypeSpec('mem2_ssd1_v2_x32', 128.0, 1200, 32),
-              InstanceTypeSpec('mem2_ssd1_v2_x48', 144.0, 1800, 48),
-              InstanceTypeSpec('mem2_ssd1_v2_x64', 256.0, 2400, 64),
-              InstanceTypeSpec('mem2_ssd1_v2_x96', 384.0, 3600, 96),
-
-              InstanceTypeSpec('mem3_ssd1_v2_x2', 16.0, 75, 2),
-              InstanceTypeSpec('mem3_ssd1_v2_x4', 32.0, 150, 4),
-              InstanceTypeSpec('mem3_ssd1_v2_x8', 64.0, 300, 8),
-              InstanceTypeSpec('mem3_ssd1_v2_x16', 128.0, 600, 16),
-              InstanceTypeSpec('mem3_ssd1_v2_x32', 256.0, 1200, 32),
-              InstanceTypeSpec('mem3_ssd1_v2_x48', 384.0, 1800, 48),
-              InstanceTypeSpec('mem3_ssd1_v2_x64', 512.0, 3200, 64),
-              InstanceTypeSpec('mem3_ssd1_v2_x96', 768.0, 3600, 96),
-
-              InstanceTypeSpec('mem3_ssd3_x2', 16.0, 1250, 2),
-              InstanceTypeSpec('mem3_ssd3_x4', 32.0, 2500, 4),
-              InstanceTypeSpec('mem3_ssd3_x8', 64.0, 5000, 8),
-              InstanceTypeSpec('mem3_ssd3_x12', 96.0, 7500, 12),
-              InstanceTypeSpec('mem3_ssd3_x24', 192.0, 15000, 24),
-              InstanceTypeSpec('mem3_ssd3_x48', 384.0, 30000, 48),
-              InstanceTypeSpec('mem3_ssd3_x96', 768.0, 60000, 96),
-
-              InstanceTypeSpec('mem4_ssd1_x128', 1952.0, 3840, 128),
-
-              InstanceTypeSpec('mem1_ssd2_v2_x2', 4.0, 160, 2),
-              InstanceTypeSpec('mem1_ssd2_v2_x4', 8.0, 320, 4),
-              InstanceTypeSpec('mem1_ssd2_v2_x8', 16.0, 640, 8),
-              InstanceTypeSpec('mem1_ssd2_v2_x16', 32.0, 1280, 16),
-              InstanceTypeSpec('mem1_ssd2_v2_x36', 72.0, 2880, 36),
-              InstanceTypeSpec('mem1_ssd2_v2_x72', 144.0, 5760, 72)):
+    for i in (InstanceTypeSpec('mem1_ssd1_v2_x2', 2, 4.0, 50),
+              InstanceTypeSpec('mem1_ssd1_v2_x4', 4, 8.0, 100),
+              InstanceTypeSpec('mem1_ssd1_v2_x8', 8, 16.0, 200),
+              InstanceTypeSpec('mem1_ssd1_v2_x16', 16, 32.0, 400),
+              InstanceTypeSpec('mem1_ssd1_v2_x36', 36, 72.0, 900),
+              InstanceTypeSpec('mem1_ssd1_v2_x72', 72, 144.0, 1800),
+
+              InstanceTypeSpec('mem1_ssd2_v2_x2', 2, 4.0, 160),
+              InstanceTypeSpec('mem1_ssd2_v2_x4', 4, 8.0, 320),
+              InstanceTypeSpec('mem1_ssd2_v2_x8', 8, 16.0, 640),
+              InstanceTypeSpec('mem1_ssd2_v2_x16', 16, 32.0, 1280),
+              InstanceTypeSpec('mem1_ssd2_v2_x36', 36, 72.0, 2880),
+              InstanceTypeSpec('mem1_ssd2_v2_x72', 72, 144.0, 5760),
+
+              InstanceTypeSpec('mem2_ssd1_v2_x2', 2, 8.0, 75),
+              InstanceTypeSpec('mem2_ssd1_v2_x4', 4, 16.0, 150),
+              InstanceTypeSpec('mem2_ssd1_v2_x8', 8, 32.0, 300),
+              InstanceTypeSpec('mem2_ssd1_v2_x16', 16, 64.0, 600),
+              InstanceTypeSpec('mem2_ssd1_v2_x32', 32, 128.0, 1200),
+              InstanceTypeSpec('mem2_ssd1_v2_x48', 48, 144.0, 1800),
+              InstanceTypeSpec('mem2_ssd1_v2_x64', 64, 256.0, 2400),
+              InstanceTypeSpec('mem2_ssd1_v2_x96', 96, 384.0, 3600),
+
+              InstanceTypeSpec('mem2_ssd2_v2_x2', 2, 8.0, 160),
+              InstanceTypeSpec('mem2_ssd2_v2_x4', 4, 16.0, 320),
+              InstanceTypeSpec('mem2_ssd2_v2_x8', 8, 32.0, 640),
+              InstanceTypeSpec('mem2_ssd2_v2_x16', 16, 64.0, 1280),
+              InstanceTypeSpec('mem2_ssd2_v2_x32', 32, 128.0, 2560),
+              InstanceTypeSpec('mem2_ssd2_v2_x48', 48, 192.0, 3840),
+              InstanceTypeSpec('mem2_ssd2_v2_x64', 64, 256.0, 5120),
+              InstanceTypeSpec('mem2_ssd2_v2_x96', 96, 384.0, 7480),
+
+              InstanceTypeSpec('mem3_ssd1_v2_x2', 2, 16.0, 75),
+              InstanceTypeSpec('mem3_ssd1_v2_x4', 4, 32.0, 150),
+              InstanceTypeSpec('mem3_ssd1_v2_x8', 8, 64.0, 300),
+              InstanceTypeSpec('mem3_ssd1_v2_x16', 16, 128.0, 600),
+              InstanceTypeSpec('mem3_ssd1_v2_x32', 32, 256.0, 1200),
+              InstanceTypeSpec('mem3_ssd1_v2_x48', 48, 384.0, 1800),
+              InstanceTypeSpec('mem3_ssd1_v2_x64', 64, 512.0, 3200),
+              InstanceTypeSpec('mem3_ssd1_v2_x96', 96, 768.0, 3600),
+
+              InstanceTypeSpec('mem3_ssd2_v2_x2', 2, 15.25, 475),
+              InstanceTypeSpec('mem3_ssd2_v2_x4', 4, 30.5, 950),
+              InstanceTypeSpec('mem3_ssd2_v2_x8', 8, 61.0, 1900),
+              InstanceTypeSpec('mem3_ssd2_v2_x16', 16, 122.0, 3800),
+              InstanceTypeSpec('mem3_ssd2_v2_x32', 32, 244.0, 7600),
+              InstanceTypeSpec('mem3_ssd2_v2_x64', 64, 488.0, 15200),
+
+              InstanceTypeSpec('mem3_ssd3_x2', 2, 16.0, 1250),
+              InstanceTypeSpec('mem3_ssd3_x4', 4, 32.0, 2500),
+              InstanceTypeSpec('mem3_ssd3_x8', 8, 64.0, 5000),
+              InstanceTypeSpec('mem3_ssd3_x12', 12, 96.0, 7500),
+              InstanceTypeSpec('mem3_ssd3_x24', 24, 192.0, 15000),
+              InstanceTypeSpec('mem3_ssd3_x48', 48, 384.0, 30000),
+              InstanceTypeSpec('mem3_ssd3_x96', 96, 768.0, 60000),
+
+              InstanceTypeSpec('mem4_ssd1_x128', 128, 1952.0, 3840)):
         aws_preferred_instance_types[i.Name] = i
 
     # Azure
     azure_preferred_instance_types = OrderedDict()
-    for i in (InstanceTypeSpec('azure:mem1_ssd1_x2', 3.9, 32, 2),
-              InstanceTypeSpec('azure:mem1_ssd1_x4', 7.8, 64, 4),
-              InstanceTypeSpec('azure:mem1_ssd1_x8', 15.7, 128, 8),
-              InstanceTypeSpec('azure:mem1_ssd1_x16', 31.4, 256, 16),
-
-              InstanceTypeSpec('azure:mem2_ssd1_x1', 3.5, 128, 1),
-              InstanceTypeSpec('azure:mem2_ssd1_x2', 7.0, 128, 2),
-              InstanceTypeSpec('azure:mem2_ssd1_x4', 14.0, 128, 4),
-              InstanceTypeSpec('azure:mem2_ssd1_x8', 28.0, 256, 8),
-              InstanceTypeSpec('azure:mem2_ssd1_x16', 56.0, 512, 16),
-
-              InstanceTypeSpec('azure:mem3_ssd1_x2', 14.0, 128, 2),
-              InstanceTypeSpec('azure:mem3_ssd1_x4', 28.0, 128, 4),
-              InstanceTypeSpec('azure:mem3_ssd1_x8', 56.0, 256, 8),
-              InstanceTypeSpec('azure:mem3_ssd1_x16', 112.0, 512, 16),
-              InstanceTypeSpec('azure:mem3_ssd1_x20', 140.0, 640, 20),
-
-              InstanceTypeSpec('azure:mem4_ssd1_x2', 28.0, 128, 2),
-              InstanceTypeSpec('azure:mem4_ssd1_x4', 56.0, 128, 4),
-              InstanceTypeSpec('azure:mem4_ssd1_x8', 112.0, 256, 8),
-              InstanceTypeSpec('azure:mem4_ssd1_x16', 224, 512, 16),
-              InstanceTypeSpec('azure:mem4_ssd1_x32', 448, 1024, 32)):
+    for i in (InstanceTypeSpec('azure:mem1_ssd1_x2', 2, 3.9, 32),
+              InstanceTypeSpec('azure:mem1_ssd1_x4', 4, 7.8, 64),
+              InstanceTypeSpec('azure:mem1_ssd1_x8', 8, 15.7, 128),
+              InstanceTypeSpec('azure:mem1_ssd1_x16', 16, 31.4, 256),
+
+              InstanceTypeSpec('azure:mem2_ssd1_x1', 1, 3.5, 128),
+              InstanceTypeSpec('azure:mem2_ssd1_x2', 2, 7.0, 128),
+              InstanceTypeSpec('azure:mem2_ssd1_x4', 4, 14.0, 128),
+              InstanceTypeSpec('azure:mem2_ssd1_x8', 8, 28.0, 256),
+              InstanceTypeSpec('azure:mem2_ssd1_x16', 16, 56.0, 512),
+
+              InstanceTypeSpec('azure:mem3_ssd1_x2', 2, 14.0, 128),
+              InstanceTypeSpec('azure:mem3_ssd1_x4', 4, 28.0, 128),
+              InstanceTypeSpec('azure:mem3_ssd1_x8', 8, 56.0, 256),
+              InstanceTypeSpec('azure:mem3_ssd1_x16', 16, 112.0, 512),
+              InstanceTypeSpec('azure:mem3_ssd1_x20', 20, 140.0, 640),
+
+              InstanceTypeSpec('azure:mem4_ssd1_x2', 2, 28.0, 128),
+              InstanceTypeSpec('azure:mem4_ssd1_x4', 4, 56.0, 128),
+              InstanceTypeSpec('azure:mem4_ssd1_x8', 8, 112.0, 256),
+              InstanceTypeSpec('azure:mem4_ssd1_x16', 16, 224.0, 512),
+              InstanceTypeSpec('azure:mem4_ssd1_x32', 32, 448.0, 1024),
+
+              InstanceTypeSpec('azure:mem5_ssd2_x64', 64, 1792.0, 8192),
+              InstanceTypeSpec('azure:mem5_ssd2_x128', 128, 3892.0, 16384)):
         azure_preferred_instance_types[i.Name] = i
-    instance_types = OrderedDict()
-    instance_types.update(aws_preferred_instance_types)
-    instance_types.update(azure_preferred_instance_types)
-
-    for i in (InstanceTypeSpec('mem1_ssd1_x2', 3.8, 32, 2),
-              InstanceTypeSpec('mem1_ssd1_x4', 7.5, 80, 4),
-              InstanceTypeSpec('mem1_ssd1_x8', 15.0, 160, 8),
-              InstanceTypeSpec('mem1_ssd1_x16', 30.0, 320, 16),
-              InstanceTypeSpec('mem1_ssd1_x32', 60.0, 640, 32),
-
-              InstanceTypeSpec('mem2_ssd1_x2', 7.5, 32, 2),
-              InstanceTypeSpec('mem2_ssd1_x4', 15.0, 80, 4),
-              InstanceTypeSpec('mem2_ssd1_x8', 30.0, 160, 8),
-
-              InstanceTypeSpec('mem3_ssd1_x2', 15.0, 32, 2),
-              InstanceTypeSpec('mem3_ssd1_x4', 30.5, 80, 4),
-              InstanceTypeSpec('mem3_ssd1_x8', 61.0, 160, 8),
-              InstanceTypeSpec('mem3_ssd1_x16', 122.0, 320, 16),
-              InstanceTypeSpec('mem3_ssd1_x32', 244.0, 640, 32),
-
-              InstanceTypeSpec('mem1_ssd2_x2', 3.8, 160, 2),
-              InstanceTypeSpec('mem1_ssd2_x4', 7.5, 320, 4),
-              InstanceTypeSpec('mem1_ssd2_x8', 15, 640, 8),
-              InstanceTypeSpec('mem1_ssd2_x16', 30, 1280, 16),
-              InstanceTypeSpec('mem1_ssd2_x36', 60, 2880, 36),
-              InstanceTypeSpec('mem2_hdd2_v2_x2', 8.0, 1000, 2),
-              InstanceTypeSpec('mem2_hdd2_v2_x4', 16.0, 2000, 4),
-
-              InstanceTypeSpec('mem3_hdd2_v2_x2', 16.0, 500, 2),
-              InstanceTypeSpec('mem3_hdd2_v2_x4', 32.0, 1000, 4),
-              InstanceTypeSpec('mem3_hdd2_v2_x8', 64.0, 2000, 8)):
-        instance_types[i.Name] = i
+
+    gpu_instance_types = OrderedDict()
+    for i in (GpuInstanceTypeSpec('mem2_ssd1_gpu_x16', 16, 64.0, 225, '1 NVIDIA T4', 16.0),
+              GpuInstanceTypeSpec('mem2_ssd1_gpu_x32', 32, 128.0, 900, '1 NVIDIA T4', 16.0),
+              GpuInstanceTypeSpec('mem2_ssd1_gpu1_x32', 32, 128.0, 900, '1 NVIDIA T4', 16.0),
+              GpuInstanceTypeSpec('mem2_ssd1_gpu_x64', 64, 256.0, 900, '1 NVIDIA T4', 16.0),
+              GpuInstanceTypeSpec('mem2_ssd1_gpu1_x64', 64, 256.0, 900, '1 NVIDIA T4', 16.0),
+              GpuInstanceTypeSpec('mem2_ssd1_gpu_x48', 48, 192.0, 900, '4 NVIDIA T4', 64.0),
+              GpuInstanceTypeSpec('mem2_ssd1_gpu4_x48', 48, 192.0, 900, '4 NVIDIA T4', 64.0),
+
+              GpuInstanceTypeSpec('mem2_ssd2_gpu1_x4', 4, 16.0, 250, '1 NVIDIA A10G', 24.0),
+              GpuInstanceTypeSpec('mem2_ssd2_gpu1_x8', 8, 32.0, 450, '1 NVIDIA A10G', 24.0),
+              GpuInstanceTypeSpec('mem2_ssd2_gpu1_x16', 16, 64.0, 600, '1 NVIDIA A10G', 24.0),
+              GpuInstanceTypeSpec('mem2_ssd2_gpu1_x32', 32, 128.0, 900, '1 NVIDIA A10G', 24.0),
+              GpuInstanceTypeSpec('mem2_ssd2_gpu1_x64', 64, 256.0, 1900, '1 NVIDIA A10G', 24.0),
+              GpuInstanceTypeSpec('mem2_ssd2_gpu4_x48', 48, 192.0, 3800, '4 NVIDIA A10G', 96.0),
+              GpuInstanceTypeSpec('mem2_ssd2_gpu4_x96', 96, 384.0, 3800, '4 NVIDIA A10G', 96.0),
+              GpuInstanceTypeSpec('mem2_ssd2_gpu8_x192', 192, 768.0, 7600, '8 NVIDIA A10G', 192.0),
+
+              GpuInstanceTypeSpec('mem2_ssd2_gpu1_v2_x4', 4, 16.0, 250, '1 NVIDIA L4', 24.0),
+              GpuInstanceTypeSpec('mem2_ssd2_gpu1_v2_x8', 8, 32.0, 450, '1 NVIDIA L4', 24.0),
+              GpuInstanceTypeSpec('mem2_ssd2_gpu1_v2_x16', 16, 64.0, 600, '1 NVIDIA L4', 24.0),
+              GpuInstanceTypeSpec('mem2_ssd2_gpu1_v2_x32', 32, 128.0, 900, '1 NVIDIA L4', 24.0),
+              GpuInstanceTypeSpec('mem2_ssd2_gpu1_v2_x64', 64, 256.0, 1880, '1 NVIDIA L4', 24.0),
+              GpuInstanceTypeSpec('mem2_ssd2_gpu4_v2_x48', 48, 192.0, 3760, '4 NVIDIA L4', 96.0),
+              GpuInstanceTypeSpec('mem2_ssd2_gpu4_v2_x96', 96, 384.0, 3760, '4 NVIDIA L4', 96.0),
+              GpuInstanceTypeSpec('mem2_ssd2_gpu8_v2_x192', 192, 768.0, 7520, '8 NVIDIA L4', 192.0),
+              GpuInstanceTypeSpec('mem3_ssd1_gpu1_x16', 16, 128.0, 600, '1 NVIDIA L4', 24.0),
+              GpuInstanceTypeSpec('mem3_ssd1_gpu1_x32', 32, 256.0, 900, '1 NVIDIA L4', 24.0),
+
+              GpuInstanceTypeSpec('mem3_ssd1_gpu_x8', 8, 61.0, 160, '1 NVIDIA V100', 16.0),
+              GpuInstanceTypeSpec('mem3_ssd1_gpu_x32', 32, 244.0, 640, '4 NVIDIA V100', 64.0),
+              GpuInstanceTypeSpec('mem3_ssd1_gpu_x64', 64, 488.0, 1280, '8 NVIDIA V100', 128.0),
+              GpuInstanceTypeSpec('azure:mem3_ssd2_gpu4_x64', 64, 488.0, 2048, '4 NVIDIA V100', 64.0)):
+        gpu_instance_types[i.Name] = i
+
+    fpga_instance_types = OrderedDict()
+    for i in (FpgaInstanceTypeSpec('mem3_ssd2_fpga1_x24', 24, 256.0, 940, 1),
+              FpgaInstanceTypeSpec('mem3_ssd2_fpga1_x48', 48, 512.0, 1880, 2),
+              FpgaInstanceTypeSpec('mem3_ssd2_fpga1_x192', 192, 2048.0, 7520, 8)):
+        fpga_instance_types[i.Name] = i
+
+    aws_other_instance_types = OrderedDict()
+    for i in (InstanceTypeSpec('mem1_ssd1_x2', 2, 3.8, 32),
+              InstanceTypeSpec('mem1_ssd1_x4', 4, 7.5, 80),
+              InstanceTypeSpec('mem1_ssd1_x8', 8, 15.0, 160),
+              InstanceTypeSpec('mem1_ssd1_x16', 16, 30.0, 320),
+              InstanceTypeSpec('mem1_ssd1_x32', 32, 60.0, 640),
+
+              InstanceTypeSpec('mem1_ssd2_x2', 2, 3.8, 160),
+              InstanceTypeSpec('mem1_ssd2_x4', 4, 7.5, 320),
+              InstanceTypeSpec('mem1_ssd2_x8', 8, 15.0, 640),
+              InstanceTypeSpec('mem1_ssd2_x16', 16, 30.0, 1280),
+              InstanceTypeSpec('mem1_ssd2_x36', 36, 60.0, 2880),
+
+              InstanceTypeSpec('mem2_ssd1_x2', 2, 7.5, 32),
+              InstanceTypeSpec('mem2_ssd1_x4', 4, 15.0, 80),
+              InstanceTypeSpec('mem2_ssd1_x8', 8, 30.0, 160),
+
+              InstanceTypeSpec('mem2_ssd2_x2', 2, 8.0, 160),
+              InstanceTypeSpec('mem2_ssd2_x4', 4, 16.0, 320),
+              InstanceTypeSpec('mem2_ssd2_x8', 8, 32.0, 1280),
+              InstanceTypeSpec('mem2_ssd2_x16', 16, 64.0, 2560),
+              InstanceTypeSpec('mem2_ssd2_x40', 40, 160.0, 3200),
+              InstanceTypeSpec('mem2_ssd2_x64', 64, 256.0, 5120),
+
+              InstanceTypeSpec('mem3_ssd1_x2', 2, 15.0, 32),
+              InstanceTypeSpec('mem3_ssd1_x4', 4, 30.5, 80),
+              InstanceTypeSpec('mem3_ssd1_x8', 8, 61.0, 160),
+              InstanceTypeSpec('mem3_ssd1_x16', 16, 122.0, 320),
+              InstanceTypeSpec('mem3_ssd1_x32', 32, 244.0, 640),
+
+              InstanceTypeSpec('mem3_ssd2_x4', 4, 30.5, 800),
+              InstanceTypeSpec('mem3_ssd2_x8', 8, 61.0, 1600),
+              InstanceTypeSpec('mem3_ssd2_x16', 16, 122.0, 3200),
+              InstanceTypeSpec('mem3_ssd2_x32', 32, 244.0, 6400),
+
+              InstanceTypeSpec('mem1_hdd1_x2', 2, 3.75, 200),
+              InstanceTypeSpec('mem1_hdd1_x4', 4, 7.5, 400),
+              InstanceTypeSpec('mem1_hdd1_x8', 8, 15.0, 800),
+              InstanceTypeSpec('mem1_hdd1_x16', 16, 30.0, 1600),
+              InstanceTypeSpec('mem1_hdd1_x36', 36, 60.0, 3200),
+
+              InstanceTypeSpec('mem1_hdd1_v2_x2', 2, 4.0, 200),
+              InstanceTypeSpec('mem1_hdd1_v2_x4', 4, 8.0, 400),
+              InstanceTypeSpec('mem1_hdd1_v2_x8', 8, 16.0, 800),
+              InstanceTypeSpec('mem1_hdd1_v2_x16', 16, 32.0, 1600),
+              InstanceTypeSpec('mem1_hdd1_v2_x36', 36, 72.0, 3600),
+              InstanceTypeSpec('mem1_hdd1_v2_x72', 72, 144.0, 7200),
+              InstanceTypeSpec('mem1_hdd1_v2_x96', 96, 192.0, 9600),
+
+              InstanceTypeSpec('mem1_hdd2_x1', 1, 1.7, 160),
+              InstanceTypeSpec('mem1_hdd2_x8', 8, 7.0, 1680),
+              InstanceTypeSpec('mem1_hdd2_x32', 32, 60.5, 3360),
+
+              InstanceTypeSpec('mem2_hdd2_x1', 1, 3.8, 410),
+              InstanceTypeSpec('mem2_hdd2_x2', 2, 7.5, 840),
+              InstanceTypeSpec('mem2_hdd2_x4', 4, 15.0, 1680),
+
+              InstanceTypeSpec('mem2_hdd2_v2_x2', 2, 8.0, 1000),
+              InstanceTypeSpec('mem2_hdd2_v2_x4', 4, 16.0, 2000),
+
+              InstanceTypeSpec('mem3_hdd2_v2_x2', 2, 16.0, 500),
+              InstanceTypeSpec('mem3_hdd2_v2_x4', 4, 32.0, 1000),
+              InstanceTypeSpec('mem3_hdd2_v2_x8', 8, 64.0, 2000)):
+        aws_other_instance_types[i.Name] = i
+
     default_instance_type = aws_preferred_instance_types['mem1_ssd1_v2_x4']
+
+    standard_instance_types = OrderedDict()
+    standard_instance_types.update(aws_preferred_instance_types)
+    standard_instance_types.update(azure_preferred_instance_types)
+    standard_instance_types.update(aws_other_instance_types)
+
+    instance_types = OrderedDict()
+    instance_types.update(standard_instance_types)
+    instance_types.update(gpu_instance_types)
+    instance_types.update(fpga_instance_types)
+
     instance_type_names = instance_types.keys()
 
     def complete(self, text, state):
@@ -522,3 +629,6 @@ class InstanceTypesCompleter():
             return self.instance_type_names[state]
         except IndexError:
             return None
+
+    def __call__(self, prefix, parsed_args, **kwargs):
+        return [name for name in self.instance_type_names if name.startswith(prefix)]

{dxpy-0.398.0 → dxpy-0.399.0}/dxpy.egg-info/PKG-INFO

@@ -1,11 +1,12 @@
 Metadata-Version: 2.1
 Name: dxpy
-Version: 0.398.0
+Version: 0.399.0
 Summary: DNAnexus Platform API bindings for Python
 Home-page: https://github.com/dnanexus/dx-toolkit
 Author: Aleksandra Zalcman, Andrey Kislyuk, Anurag Biyani, Geet Duggal, Katherine Lai, Kurt Jensen, Marek Hrvol, Ohad Rodeh, Phil Sung
 Author-email: support@dnanexus.com
 License: Apache Software License
+Platform: UNKNOWN
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
@@ -124,3 +125,5 @@ We have the following convention for these scripts:
   if __name__ == '__main__':
       main()
   ```
+
+

{dxpy-0.398.0 → dxpy-0.399.0}/dxpy.egg-info/SOURCES.txt

@@ -5,6 +5,22 @@ requirements_setuptools.txt
 requirements_test.txt
 setup.cfg
 setup.py
+/home/kjensen/dx-toolkit/src/python/scripts/dx-clone-asset
+/home/kjensen/dx-toolkit/src/python/scripts/dx-docker
+/home/kjensen/dx-toolkit/src/python/scripts/dx-download-all-inputs
+/home/kjensen/dx-toolkit/src/python/scripts/dx-fetch-bundled-depends
+/home/kjensen/dx-toolkit/src/python/scripts/dx-generate-dxapp
+/home/kjensen/dx-toolkit/src/python/scripts/dx-jobutil-add-output
+/home/kjensen/dx-toolkit/src/python/scripts/dx-jobutil-dxlink
+/home/kjensen/dx-toolkit/src/python/scripts/dx-jobutil-get-identity-token
+/home/kjensen/dx-toolkit/src/python/scripts/dx-jobutil-new-job
+/home/kjensen/dx-toolkit/src/python/scripts/dx-jobutil-parse-link
+/home/kjensen/dx-toolkit/src/python/scripts/dx-jobutil-report-error
+/home/kjensen/dx-toolkit/src/python/scripts/dx-log-stream
+/home/kjensen/dx-toolkit/src/python/scripts/dx-mount-all-inputs
+/home/kjensen/dx-toolkit/src/python/scripts/dx-notebook-reconnect
+/home/kjensen/dx-toolkit/src/python/scripts/dx-print-bash-vars
+/home/kjensen/dx-toolkit/src/python/scripts/dx-upload-all-outputs
 dxpy/__init__.py
 dxpy/api.py
 dxpy/app_builder.py
@@ -148,22 +164,6 @@ dxpy/utils/printing.py
 dxpy/utils/resolver.py
 dxpy/utils/spelling_corrector.py
 dxpy/utils/version.py
-scripts/dx-clone-asset
-scripts/dx-docker
-scripts/dx-download-all-inputs
-scripts/dx-fetch-bundled-depends
-scripts/dx-generate-dxapp
-scripts/dx-jobutil-add-output
-scripts/dx-jobutil-dxlink
-scripts/dx-jobutil-get-identity-token
-scripts/dx-jobutil-new-job
-scripts/dx-jobutil-parse-link
-scripts/dx-jobutil-report-error
-scripts/dx-log-stream
-scripts/dx-mount-all-inputs
-scripts/dx-notebook-reconnect
-scripts/dx-print-bash-vars
-scripts/dx-upload-all-outputs
 test/test_batch.py
 test/test_create_cohort.py
 test/test_describe.py

{dxpy-0.398.0 → dxpy-0.399.0}/dxpy.egg-info/entry_points.txt

@@ -3,3 +3,4 @@ dx = dxpy.scripts.dx:main
 dx-app-wizard = dxpy.scripts.dx_app_wizard:main
 dx-build-app = dxpy.scripts.dx_build_app:main
 dx-build-applet = dxpy.scripts.dx_build_applet:main
+

{dxpy-0.398.0 → dxpy-0.399.0}/test/test_dx_bash_helpers.py

@@ -992,12 +992,12 @@ class TestDXBashHelperMethods(unittest.TestCase):
         max_threads = 8
         for inst in instance_types.values():
             num_threads = _get_num_parallel_threads(
-                max_threads, inst.CPU_Cores, inst.Memory_GB * 1024
+                max_threads, inst.CPU_Cores, inst.Memory_GiB * 1024
             )
             self.assertTrue(num_threads >= 1 and num_threads <= max_threads)
             self.assertTrue(num_threads <= inst.CPU_Cores)
             self.assertTrue(
-                num_threads * 1200 <= inst.Memory_GB * 1024 or num_threads == 1
+                num_threads * 1200 <= inst.Memory_GiB * 1024 or num_threads == 1
             )
 
 

dxpy-0.398.0/dxpy/toolkit_version.py

@@ -1 +0,0 @@
-version = '0.398.0'