Added tests for custom features

Author: efim-a-efim

test/unit/slurm/test_slurm_config_generator.py

@@ -224,6 +224,32 @@ def test_generate_slurm_config_with_custom_settings(mocker, test_datadir, tmpdir
         _assert_files_are_equal(tmpdir / file_name, test_datadir / "expected_outputs" / output_file_name)
 
 
+def test_generate_slurm_config_with_custom_features(mocker, test_datadir, tmpdir):
+    _mock_head_node_config(mocker)
+
+    input_file = os.path.join(test_datadir, "sample_input.yaml")
+    instance_types_data = os.path.join(test_datadir, "sample_instance_types_data.json")
+
+    template_directory = get_template_folder()
+    generate_slurm_config_files(
+        tmpdir,
+        template_directory,
+        input_file,
+        instance_types_data,
+        dryrun=False,
+        no_gpu=False,
+        compute_node_bootstrap_timeout=1600,
+        realmemory_to_ec2memory_ratio=0.95,
+        slurmdbd_user="slurm",
+        cluster_name="test-cluster",
+    )
+
+    for queue in ["efa", "gpu", "multiple_spot"]:
+        file_name = f"pcluster/slurm_parallelcluster_{queue}_partition.conf"
+        output_file_name = f"pcluster/slurm_parallelcluster_{queue}_partition.conf"
+        _assert_files_are_equal(tmpdir / file_name, test_datadir / "expected_outputs" / output_file_name)
+
+
 def test_generate_slurm_config_with_job_exc_alloc(mocker, test_datadir, tmpdir):
     _mock_head_node_config(mocker)
 

test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_with_custom_features/expected_outputs/pcluster/slurm_parallelcluster_efa_partition.conf

@@ -0,0 +1,7 @@
+# This file is automatically generated by pcluster
+
+NodeName=efa-st-efa-c5n-[1-1] CPUs=36 RealMemory=186777 State=CLOUD Feature=c5n.18xlarge,efa,efa-c5n,static Weight=1 CustomEfaComputeParam=unique_efa_compute_value OtherEfaComputeParam=second_efa_compute_value
+NodeName=efa-dy-efa-c5n-[1-4] CPUs=36 RealMemory=186777 State=CLOUD Feature=c5n.18xlarge,dynamic,efa,efa-c5n Weight=1000 CustomEfaComputeParam=unique_efa_compute_value OtherEfaComputeParam=second_efa_compute_value
+
+NodeSet=efa_nodes Nodes=efa-st-efa-c5n-[1-1],efa-dy-efa-c5n-[1-4]
+PartitionName=efa Nodes=efa_nodes MaxTime=INFINITE State=UP CustomEfaParam=unique_efa_value OtherEfaParam=second_efa_value

test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_with_custom_features/expected_outputs/pcluster/slurm_parallelcluster_gpu_partition.conf

@@ -0,0 +1,8 @@
+# This file is automatically generated by pcluster
+
+NodeName=gpu-st-gpu-g38xlarge-[1-1] CPUs=32 RealMemory=237363 State=CLOUD Feature=g3.8xlarge,gpu,gpu-g38xlarge,myfeat-gpu,static Weight=1 Gres=gpu:m60:2 CustomNvidiaParam=nvidia_setting CustomAmdParam=amd_setting CustomIntelParam=intel_setting
+NodeName=gpu-dy-gpu-g38xlarge-[1-4] CPUs=32 RealMemory=237363 State=CLOUD Feature=dynamic,g3.8xlarge,gpu,gpu-g38xlarge,myfeat-gpu Weight=1000 Gres=gpu:m60:2 CustomNvidiaParam=nvidia_setting CustomAmdParam=amd_setting CustomIntelParam=intel_setting
+NodeName=gpu-dy-gpu-p3dn24xlarge-[1-10] CPUs=96 RealMemory=747110 State=CLOUD Feature=dynamic,gpu,gpu-p3dn24xlarge,p3dn.24xlarge Weight=1000 Gres=gpu:v100:8
+
+NodeSet=gpu_nodes Nodes=gpu-st-gpu-g38xlarge-[1-1],gpu-dy-gpu-g38xlarge-[1-4],gpu-dy-gpu-p3dn24xlarge-[1-10]
+PartitionName=gpu Nodes=gpu_nodes MaxTime=INFINITE State=UP CustomParam=unique_value OtherParam=second_value TreeAsThird=3

test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_with_custom_features/expected_outputs/pcluster/slurm_parallelcluster_multiple_spot_partition.conf

@@ -0,0 +1,8 @@
+# This file is automatically generated by pcluster
+
+NodeName=multiple_spot-st-multiplespot-1-[1-5] CPUs=4 RealMemory=7296 State=CLOUD Feature=c4.xlarge,multiplespot-1,myfeat1,qwerty2,static Weight=1 CustomComputeParam=unique_compute_value OtherComputeParam=second_compute_value
+NodeName=multiple_spot-dy-multiplespot-1-[1-5] CPUs=4 RealMemory=7296 State=CLOUD Feature=c4.xlarge,dynamic,multiplespot-1,myfeat1,qwerty2 Weight=1000 CustomComputeParam=unique_compute_value OtherComputeParam=second_compute_value
+NodeName=multiple_spot-st-multiplespot-2-[1-5] CPUs=4 RealMemory=15564 State=CLOUD Feature=c5.2xlarge,multiplespot-2,static Weight=1
+
+NodeSet=multiple_spot_nodes Nodes=multiple_spot-st-multiplespot-1-[1-5],multiple_spot-dy-multiplespot-1-[1-5],multiple_spot-st-multiplespot-2-[1-5]
+PartitionName=multiple_spot Nodes=multiple_spot_nodes MaxTime=INFINITE State=UP Default=YES CustomQueueParam=unique_queue_value OtherQueueParam=second_queue_value

test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_with_custom_features/sample_input.yaml

@@ -0,0 +1,93 @@
+Scheduling:
+  SlurmQueues:
+    - Name: multiple_spot
+      CustomSlurmSettings:
+        CustomQueueParam: unique_queue_value
+        OtherQueueParam: second_queue_value
+      CapacityType: SPOT
+      ComputeResources:
+        - Name: multiplespot-1
+          DisableSimultaneousMultithreading: false
+          Efa:
+            Enabled: false
+            GdrSupport: false
+          CustomSlurmSettings:
+            CustomComputeParam: unique_compute_value
+            OtherComputeParam: second_compute_value
+            Feature: myfeat1,qwerty2
+          InstanceType: c4.xlarge
+          MaxCount: 10
+          MinCount: 5
+          StaticNodePriority: 1
+          DynamicNodePriority: 1000
+        - DisableSimultaneousMultithreading: true
+          Efa:
+            Enabled: false
+            GdrSupport: false
+          InstanceType: c5.2xlarge
+          MaxCount: 5
+          MinCount: 5
+          Name: multiplespot-2
+          StaticNodePriority: 1
+          DynamicNodePriority: 1000
+    - Name: efa
+      CapacityType: ONDEMAND
+      CustomSlurmSettings:
+        CustomEfaParam: unique_efa_value
+        OtherEfaParam: second_efa_value
+      ComputeResources:
+        - Name: efa-c5n
+          CustomSlurmSettings:
+            CustomEfaComputeParam: unique_efa_compute_value
+            OtherEfaComputeParam: second_efa_compute_value
+          DisableSimultaneousMultithreading: true
+          Efa:
+            Enabled: true
+            GdrSupport: false
+          InstanceType: c5n.18xlarge
+          MaxCount: 5
+          MinCount: 1
+          StaticNodePriority: 1
+          DynamicNodePriority: 1000
+      ComputeSettings: null
+      CustomActions: null
+    - Name: gpu
+      CapacityType: ONDEMAND
+      CustomSlurmSettings:
+        CustomParam: unique_value
+        OtherParam: second_value
+        TreeAsThird: 3
+      ComputeResources:
+        - Name: gpu-g38xlarge
+          DisableSimultaneousMultithreading: false
+          Efa:
+            Enabled: false
+            GdrSupport: false
+          CustomSlurmSettings:
+            CustomNvidiaParam: nvidia_setting
+            CustomAmdParam: amd_setting
+            CustomIntelParam: intel_setting
+            Feature: myfeat-gpu
+          InstanceType: g3.8xlarge
+          MaxCount: 5
+          MinCount: 1
+          StaticNodePriority: 1
+          DynamicNodePriority: 1000
+        - Name: gpu-p3dn24xlarge
+          DisableSimultaneousMultithreading: false
+          Efa:
+            Enabled: false
+            GdrSupport: false
+          InstanceType: p3dn.24xlarge
+          MaxCount: 10
+          MinCount: 0
+          StaticNodePriority: 1
+          DynamicNodePriority: 1000
+      ComputeSettings: null
+      CustomActions: null
+  Scheduler: slurm
+  SlurmSettings:
+    ScaledownIdletime: 10
+    EnableMemoryBasedScheduling: false
+    Database: null
+    ExternalSlurmdbd: null

test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_with_custom_features/sample_instance_types_data.json

@@ -0,0 +1 @@
+{"t3.micro": {"InstanceType": "t3.micro", "CurrentGeneration": true, "FreeTierEligible": false, "SupportedUsageClasses": ["on-demand", "spot"], "SupportedRootDeviceTypes": ["ebs"], "SupportedVirtualizationTypes": ["hvm"], "BareMetal": false, "Hypervisor": "nitro", "ProcessorInfo": {"SupportedArchitectures": ["x86_64"], "SustainedClockSpeedInGhz": 2.5}, "VCpuInfo": {"DefaultVCpus": 2, "DefaultCores": 1, "DefaultThreadsPerCore": 2, "ValidCores": [1], "ValidThreadsPerCore": [1, 2]}, "MemoryInfo": {"SizeInMiB": 1024}, "InstanceStorageSupported": false, "EbsInfo": {"EbsOptimizedSupport": "default", "EncryptionSupport": "supported", "EbsOptimizedInfo": {"BaselineBandwidthInMbps": 87, "BaselineThroughputInMBps": 10.875, "BaselineIops": 500, "MaximumBandwidthInMbps": 2085, "MaximumThroughputInMBps": 260.625, "MaximumIops": 11800}, "NvmeSupport": "unsupported"}, "NetworkInfo": {"NetworkPerformance": "Up to 5 Gigabit", "MaximumNetworkInterfaces": 2, "MaximumNetworkCards": 1, "DefaultNetworkCardIndex": 0, "NetworkCards": [{"NetworkCardIndex": 0, "NetworkPerformance": "Up to 5 Gigabit", "MaximumNetworkInterfaces": 2}], "Ipv4AddressesPerInterface": 2, "Ipv6AddressesPerInterface": 2, "Ipv6Supported": true, "EnaSupport": "required", "EfaSupported": false}, "PlacementGroupInfo": {"SupportedStrategies": ["partition", "spread"]}, "HibernationSupported": true, "BurstablePerformanceSupported": true, "DedicatedHostsSupported": false, "AutoRecoverySupported": true}, "c4.xlarge": {"InstanceType": "c4.xlarge", "CurrentGeneration": true, "FreeTierEligible": false, "SupportedUsageClasses": ["spot", "ondemand"], "SupportedRootDeviceTypes": ["ebs"], "SupportedVirtualizationTypes": ["hvm"], "BareMetal": false, "Hypervisor": "xen", "ProcessorInfo": {"SupportedArchitectures": ["x86_64"], "SustainedClockSpeedInGhz": 2.9}, "VCpuInfo": {"DefaultVCpus": 4, "DefaultCores": 2, "DefaultThreadsPerCore": 2, "ValidCores": [1, 2], "ValidThreadsPerCore": [1, 2]}, "MemoryInfo": {"SizeInMiB": 7680}, "InstanceStorageSupported": false, "EbsInfo": {"EbsOptimizedSupport": "default", "EncryptionSupport": "supported", "EbsOptimizedInfo": {"BaselineBandwidthInMbps": 750, "BaselineThroughputInMBps": 93.75, "BaselineIops": 6000, "MaximumBandwidthInMbps": 750, "MaximumThroughputInMBps": 93.75, "MaximumIops": 6000}, "NvmeSupport": "unsupported"}, "NetworkInfo": {"NetworkPerformance": "High", "MaximumNetworkInterfaces": 4, "MaximumNetworkCards": 1, "DefaultNetworkCardIndex": 0, "NetworkCards": [{"NetworkCardIndex": 0, "NetworkPerformance": "High", "MaximumNetworkInterfaces": 4}], "Ipv4AddressesPerInterface": 15, "Ipv6AddressesPerInterface": 15, "Ipv6Supported": true, "EnaSupport": "unsupported", "EfaSupported": false}, "PlacementGroupInfo": {"SupportedStrategies": ["cluster", "partition", "spread"]}, "HibernationSupported": true, "BurstablePerformanceSupported": false, "DedicatedHostsSupported": true, "AutoRecoverySupported": true}, "c5.2xlarge": {"InstanceType": "c5.2xlarge", "CurrentGeneration": true, "FreeTierEligible": false, "SupportedUsageClasses": ["spot", "ondemand"], "SupportedRootDeviceTypes": ["ebs"], "SupportedVirtualizationTypes": ["hvm"], "BareMetal": false, "Hypervisor": "nitro", "ProcessorInfo": {"SupportedArchitectures": ["x86_64"], "SustainedClockSpeedInGhz": 3.4}, "VCpuInfo": {"DefaultVCpus": 8, "DefaultCores": 4, "DefaultThreadsPerCore": 2, "ValidCores": [2, 4], "ValidThreadsPerCore": [1, 2]}, "MemoryInfo": {"SizeInMiB": 16384}, "InstanceStorageSupported": false, "EbsInfo": {"EbsOptimizedSupport": "default", "EncryptionSupport": "supported", "EbsOptimizedInfo": {"BaselineBandwidthInMbps": 2300, "BaselineThroughputInMBps": 287.5, "BaselineIops": 10000, "MaximumBandwidthInMbps": 4750, "MaximumThroughputInMBps": 593.75, "MaximumIops": 20000}, "NvmeSupport": "unsupported"}, "NetworkInfo": {"NetworkPerformance": "Up to 10 Gigabit", "MaximumNetworkInterfaces": 4, "MaximumNetworkCards": 1, "DefaultNetworkCardIndex": 0, "NetworkCards": [{"NetworkCardIndex": 0, "NetworkPerformance": "Up to 10 Gigabit", "MaximumNetworkInterfaces": 4}], "Ipv4AddressesPerInterface": 15, "Ipv6AddressesPerInterface": 15, "Ipv6Supported": true, "EnaSupport": "required", "EfaSupported": false}, "PlacementGroupInfo": {"SupportedStrategies": ["cluster", "partition", "spread"]}, "HibernationSupported": true, "BurstablePerformanceSupported": false, "DedicatedHostsSupported": true, "AutoRecoverySupported": true}, "c5n.18xlarge": {"InstanceType": "c5n.18xlarge", "CurrentGeneration": true, "FreeTierEligible": false, "SupportedUsageClasses": ["spot", "ondemand"], "SupportedRootDeviceTypes": ["ebs"], "SupportedVirtualizationTypes": ["hvm"], "BareMetal": false, "Hypervisor": "nitro", "ProcessorInfo": {"SupportedArchitectures": ["x86_64"], "SustainedClockSpeedInGhz": 3.4}, "VCpuInfo": {"DefaultVCpus": 72, "DefaultCores": 36, "DefaultThreadsPerCore": 2, "ValidCores": [4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36], "ValidThreadsPerCore": [1, 2]}, "MemoryInfo": {"SizeInMiB": 196608}, "InstanceStorageSupported": false, "EbsInfo": {"EbsOptimizedSupport": "default", "EncryptionSupport": "supported", "EbsOptimizedInfo": {"BaselineBandwidthInMbps": 19000, "BaselineThroughputInMBps": 2375.0, "BaselineIops": 80000, "MaximumBandwidthInMbps": 19000, "MaximumThroughputInMBps": 2375.0, "MaximumIops": 80000}, "NvmeSupport": "unsupported"}, "NetworkInfo": {"NetworkPerformance": "100 Gigabit", "MaximumNetworkInterfaces": 15, "MaximumNetworkCards": 1, "DefaultNetworkCardIndex": 0, "NetworkCards": [{"NetworkCardIndex": 0, "NetworkPerformance": "100 Gigabit", "MaximumNetworkInterfaces": 15}], "Ipv4AddressesPerInterface": 50, "Ipv6AddressesPerInterface": 50, "Ipv6Supported": true, "EnaSupport": "required", "EfaSupported": true}, "PlacementGroupInfo": {"SupportedStrategies": ["cluster", "partition", "spread"]}, "HibernationSupported": false, "BurstablePerformanceSupported": false, "DedicatedHostsSupported": true, "AutoRecoverySupported": true}, "g3.8xlarge": {"InstanceType": "g3.8xlarge", "CurrentGeneration": true, "FreeTierEligible": false, "SupportedUsageClasses": ["spot", "ondemand"], "SupportedRootDeviceTypes": ["ebs"], "SupportedVirtualizationTypes": ["hvm"], "BareMetal": false, "Hypervisor": "xen", "ProcessorInfo": {"SupportedArchitectures": ["x86_64"], "SustainedClockSpeedInGhz": 2.7}, "VCpuInfo": {"DefaultVCpus": 32, "DefaultCores": 16, "DefaultThreadsPerCore": 2, "ValidCores": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16], "ValidThreadsPerCore": [1, 2]}, "MemoryInfo": {"SizeInMiB": 249856}, "InstanceStorageSupported": false, "EbsInfo": {"EbsOptimizedSupport": "default", "EncryptionSupport": "supported", "EbsOptimizedInfo": {"BaselineBandwidthInMbps": 7000, "BaselineThroughputInMBps": 875.0, "BaselineIops": 40000, "MaximumBandwidthInMbps": 7000, "MaximumThroughputInMBps": 875.0, "MaximumIops": 40000}, "NvmeSupport": "unsupported"}, "NetworkInfo": {"NetworkPerformance": "10 Gigabit", "MaximumNetworkInterfaces": 8, "MaximumNetworkCards": 1, "DefaultNetworkCardIndex": 0, "NetworkCards": [{"NetworkCardIndex": 0, "NetworkPerformance": "10 Gigabit", "MaximumNetworkInterfaces": 8}], "Ipv4AddressesPerInterface": 30, "Ipv6AddressesPerInterface": 30, "Ipv6Supported": true, "EnaSupport": "supported", "EfaSupported": false}, "GpuInfo": {"Gpus": [{"Name": "M60", "Manufacturer": "NVIDIA", "Count": 2, "MemoryInfo": {"SizeInMiB": 8192}}], "TotalGpuMemoryInMiB": 16384}, "PlacementGroupInfo": {"SupportedStrategies": ["cluster", "partition", "spread"]}, "HibernationSupported": false, "BurstablePerformanceSupported": false, "DedicatedHostsSupported": true, "AutoRecoverySupported": false}, "p3dn.24xlarge": {"InstanceType": "p3dn.24xlarge", "CurrentGeneration": true, "FreeTierEligible": false, "SupportedUsageClasses": ["spot", "ondemand"], "SupportedRootDeviceTypes": ["ebs"], "SupportedVirtualizationTypes": ["hvm"], "BareMetal": false, "Hypervisor": "nitro", "ProcessorInfo": {"SupportedArchitectures": ["x86_64"], "SustainedClockSpeedInGhz": 2.5}, "VCpuInfo": {"DefaultVCpus": 96, "DefaultCores": 48, "DefaultThreadsPerCore": 2, "ValidCores": [4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48], "ValidThreadsPerCore": [1, 2]}, "MemoryInfo": {"SizeInMiB": 786432}, "InstanceStorageSupported": true, "InstanceStorageInfo": {"TotalSizeInGB": 1800, "Disks": [{"SizeInGB": 900, "Count": 2, "Type": "ssd"}], "NvmeSupport": "required"}, "EbsInfo": {"EbsOptimizedSupport": "default", "EncryptionSupport": "supported", "EbsOptimizedInfo": {"BaselineBandwidthInMbps": 19000, "BaselineThroughputInMBps": 2375.0, "BaselineIops": 80000, "MaximumBandwidthInMbps": 19000, "MaximumThroughputInMBps": 2375.0, "MaximumIops": 80000}, "NvmeSupport": "required"}, "NetworkInfo": {"NetworkPerformance": "100 Gigabit", "MaximumNetworkInterfaces": 15, "MaximumNetworkCards": 1, "DefaultNetworkCardIndex": 0, "NetworkCards": [{"NetworkCardIndex": 0, "NetworkPerformance": "100 Gigabit", "MaximumNetworkInterfaces": 15}], "Ipv4AddressesPerInterface": 50, "Ipv6AddressesPerInterface": 50, "Ipv6Supported": true, "EnaSupport": "required", "EfaSupported": true}, "GpuInfo": {"Gpus": [{"Name": "V100", "Manufacturer": "NVIDIA", "Count": 8, "MemoryInfo": {"SizeInMiB": 32768}}], "TotalGpuMemoryInMiB": 262144}, "PlacementGroupInfo": {"SupportedStrategies": ["cluster", "partition", "spread"]}, "HibernationSupported": false, "BurstablePerformanceSupported": false, "DedicatedHostsSupported": false, "AutoRecoverySupported": false}}