Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Azure VMs and regions for 2024-07-01 #5100

Merged
merged 6 commits into from
Jul 2, 2024
Merged

Update Azure VMs and regions for 2024-07-01 #5100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fe880a6
Update Azure VMs and regions for 2024-07-01
adamrtalbot Jul 1, 2024
6f1374c
Handle alternative spelling of machine memory size for Azure VMs
adamrtalbot Jul 1, 2024
4a0f016
Fix creation of AzVmType class to handle different spellings of attri…
adamrtalbot Jul 1, 2024
8030f8c
Bump MB instead of Mb
pditommaso Jul 1, 2024
0027f07
Remove all empty files and run script again
adamrtalbot Jul 2, 2024
a7b81ea
Merge branch 'master' into update_azure_regions_vms_2024_07_01
adamrtalbot Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion plugins/nf-azure/src/main/nextflow/cloud/azure/batch/AzBatchService.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ class AzBatchService implements Closeable {

protected Double computeScore(int cpus, MemoryUnit mem, Map entry) {
def vmCores = entry.numberOfCores as int
double vmMemGb = (entry.memoryInMb as int) /1024
double vmMemGb = (entry.memoryInMB as int) /1024

if( cpus > vmCores ) {
return null
Expand Down
6 changes: 3 additions & 3 deletions plugins/nf-azure/src/main/nextflow/cloud/azure/batch/AzVmType.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ class AzVmType {
AzVmType(Map map) {
this.name = map.name
this.maxDataDiskCount = map.maxDataDiskCount as Integer
this.memory = map.memoryInMb ? MemoryUnit.of( "$map.memoryInMb MB" ) : null
this.memory = map.memoryInMB ? MemoryUnit.of( "$map.memoryInMB MB" ) : null
this.numberOfCores = map.numberOfCores as Integer
this.osDiskSize = map.osDiskSizeInMb ? MemoryUnit.of( "$map.osDiskSizeInMb MB" ) : null
this.resourceDiskSize = map.resourceDiskSizeInMb ? MemoryUnit.of( "$map.resourceDiskSizeInMb MB" ) : null
this.osDiskSize = map.osDiskSizeInMB ? MemoryUnit.of( "$map.osDiskSizeInMB MB" ) : null
this.resourceDiskSize = map.resourceDiskSizeInMB ? MemoryUnit.of( "$map.resourceDiskSizeInMB MB" ) : null
}
}
Loading