Skip to content

Commit 6083022

Browse files
storage identiication correction
1 parent 084bb01 commit 6083022

File tree

5 files changed

+35
-21
lines changed

5 files changed

+35
-21
lines changed

src/awareness.jl

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -612,30 +612,31 @@ function identifyStorage()
612612
storage_features = Dict()
613613

614614
try
615-
command = `lsblk --scsi --json -d --bytes -o rota,size,tran`
615+
command = `lsblk --json -d --bytes -o rota,size,tran,type`
616616
dict = JSON.parse(read(command, String))
617617

618618
i = 1
619619
for device in dict["blockdevices"]
620-
621-
storage_device = Dict()
622-
storage_features[string(i)] = storage_device
623-
624-
storage_type = device["rota"] ? "HDD" : "SSD"
625-
storage_interface = uppercase(device["tran"])
626-
storage_size = device["size"]
627-
storage_latency = "unset"
628-
storage_bandwidth = "unset"
629-
storage_networkbandwidth = "unset"
630-
631-
storage_device["storage_type"] = storage_type
632-
storage_device["storage_interface"] = storage_interface
633-
storage_device["storage_size"] = storage_size
634-
storage_device["storage_latency"] = storage_latency
635-
storage_device["storage_bandwidth"] = storage_bandwidth
636-
storage_device["storage_networkbandwidth"] = storage_networkbandwidth
637-
638-
i = i + 1
620+
println(device["type"])
621+
if (device["type"] == "disk")
622+
storage_device = Dict()
623+
storage_features[string(i)] = storage_device
624+
625+
storage_type = device["rota"] ? "HDD" : "SSD"
626+
storage_interface = uppercase(device["tran"])
627+
storage_size = device["size"]
628+
storage_latency = "unset"
629+
storage_bandwidth = "unset"
630+
storage_networkbandwidth = "unset"
631+
632+
storage_device["storage_type"] = storage_type
633+
storage_device["storage_interface"] = storage_interface
634+
storage_device["storage_size"] = storage_size
635+
storage_device["storage_latency"] = storage_latency
636+
storage_device["storage_bandwidth"] = storage_bandwidth
637+
storage_device["storage_networkbandwidth"] = storage_networkbandwidth
638+
i = i + 1
639+
end
639640
end
640641
catch error
641642
println(stderr, "Error fetching storage info. Loading default values.")

src/platforms/amd/amd_processors.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -498,6 +498,7 @@ abstract type AMDEPYC_7543P <: AMDEPYC_7003 end
498498
abstract type AMDEPYC_7551 <: AMDEPYC_7001 end
499499
abstract type AMDEPYC_7551P <: AMDEPYC_7001 end
500500
abstract type AMDEPYC_7552 <: AMDEPYC_7002 end
501+
abstract type AMDEPYC_7571 <: AMDEPYC_7003_VCache end
501502
abstract type AMDEPYC_7573X <: AMDEPYC_7003_VCache end
502503
abstract type AMDEPYC_75F3 <: AMDEPYC_7003 end
503504
abstract type AMDEPYC_7601 <: AMDEPYC_7001 end

src/platforms/amd/db-processors.AMD.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ AMD;EPYC,7543,32,2.8G,64,64-bit,MMX;SSE;SSE2;SSE3;SSSE3;SSE4a;SSE4.1;SSE4.2;AVX;
224224
AMD;EPYC,7551,32,2.0G,64,64-bit,MMX;SSE;SSE2;SSE3;SSSE3;SSE4a;SSE4.1;SSE4.2;AVX;AVX2,Zen,AMDEPYC_7551,AMD,180,unset,unset,64MB,2666M,DDR4
225225
AMD;EPYC,7551,32,2.0G,64,64-bit,MMX;SSE;SSE2;SSE3;SSSE3;SSE4a;SSE4.1;SSE4.2;AVX;AVX2,Zen,AMDEPYC_7551,AMD,180,unset,unset,64MB,2666M,DDR4
226226
AMD;EPYC,7552,48,2.2G,96,64-bit,MMX;SSE;SSE2;SSE3;SSSE3;SSE4a;SSE4.1;SSE4.2;AVX;AVX2,Zen,AMDEPYC_7552,AMD,200,unset,unset,192MB,3200M,DDR4
227+
AMD;EPYC,7571,32,2.1G,64,64-bit,MMX;SSE;SSE2;SSE3;SSSE3;SSE4a;SSE4.1;SSE4.2;AVX;AVX2,Zen,AMDEPYC_7552,AMD,120,3072K,16M,64MB,3200M,DDR4
227228
AMD;EPYC,7573X,32,2.8G,64,64-bit,MMX;SSE;SSE2;SSE3;SSSE3;SSE4a;SSE4.1;SSE4.2;AVX;AVX2,Zen,AMDEPYC_7573X,AMD,280,unset,unset,768MB,3200M,DDR4
228229
AMD;EPYC,75F3,32,2.95G,64,64-bit,MMX;SSE;SSE2;SSE3;SSSE3;SSE4a;SSE4.1;SSE4.2;AVX;AVX2,Zen,AMDEPYC_75F3,AMD,280,unset,unset,256MB,3200M,DDR4
229230
AMD;EPYC,7601,32,2.2G,64,64-bit,MMX;SSE;SSE2;SSE3;SSSE3;SSE4a;SSE4.1;SSE4.2;AVX;AVX2,Zen,AMDEPYC_7601,AMD,180,unset,unset,64MB,2666M,DDR4

src/platforms/intel/db-processors.Intel.csv

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1833,7 +1833,9 @@ Intel;Xeon,6346,16,3.10G,32,64-bit,SSE4.2;AVX;AVX2;AVX-512,IceLake,IntelXeon_634
18331833
Intel;Xeon,6348,28,2.60G,56,64-bit,SSE4.2;AVX;AVX2;AVX-512,IceLake,IntelXeon_6348,Intel,235,unset,unset,unset
18341834
Intel;Xeon,6348H,24,2.30G,48,64-bit,SSE4.2;AVX;AVX2;AVX-512,CooperLake,IntelXeon_6348H,Intel,165,unset,unset,unset
18351835
Intel;Xeon,6354,18,3.00G,36,64-bit,SSE4.2;AVX;AVX2;AVX-512,IceLake,IntelXeon_6354,Intel,205,unset,unset,unset
1836-
Intel;Xeon,8153,16,2.00G,32,64-bit,SSE4.2;AVX;AVX2;AVX-512,Skylake,IntelXeon_8153,Intel,125,unset,unset,unset
1836+
Intel;Xeon,8124M,18,3.00G,26,64-bit,SSE4.2;AVX;AVX2;AVX-512,Skylake,IntelXeon_8124M,Intel,240,1.125M,18M,24.75
1837+
Intel;Xeon,8151,12,3.4G,24,64-bit,SSE4.2;AVX;AVX2;AVX-512,Skylake,IntelXeon_8151,Intel,240,unset,unset,unset
1838+
Intel;Xeon,8153,16,2G,32,64-bit,SSE4.2;AVX;AVX2;AVX-512,Skylake,IntelXeon_8153,Intel,125,unset,unset,unset
18371839
Intel;Xeon,8156,4,3.60G,8,64-bit,SSE4.2;AVX;AVX2;AVX-512,Skylake,IntelXeon_8156,Intel,105,unset,unset,unset
18381840
Intel;Xeon,8158,12,3.00G,24,64-bit,SSE4.2;AVX;AVX2;AVX-512,Skylake,IntelXeon_8158,Intel,150,unset,unset,unset
18391841
Intel;Xeon,8160,24,2.10G,48,64-bit,SSE4.2;AVX;AVX2;AVX-512,Skylake,IntelXeon_8160,Intel,150,unset,unset,unset
@@ -1848,11 +1850,13 @@ Intel;Xeon,8176F,28,2.10G,56,64-bit,SSE4.2;AVX;AVX2;AVX-512,Skylake,IntelXeon_81
18481850
Intel;Xeon,8180,28,2.50G,56,64-bit,SSE4.2;AVX;AVX2;AVX-512,Skylake,IntelXeon_8180,Intel,205,unset,unset,unset
18491851
Intel;Xeon,8253,16,2.20G,32,64-bit,SSE4.2;AVX;AVX2;AVX-512,CascadeLake,IntelXeon_8253,Intel,125,unset,unset,unset
18501852
Intel;Xeon,8256,4,3.80G,8,64-bit,SSE4.2;AVX;AVX2;AVX-512,CascadeLake,IntelXeon_8256,Intel,105,unset,unset,unset
1853+
Intel;Xeon,8259CL,24,2.10G,48,64-bit,SSE4.2;AVX;AVX2;AVX-512,CascadeLake,IntelXeon_8259CL,Intel,210,1536K,24M,35.75M
18511854
Intel;Xeon,8260,24,2.40G,48,64-bit,SSE4.2;AVX;AVX2;AVX-512,CascadeLake,IntelXeon_8260,Intel,165,unset,unset,unset
18521855
Intel;Xeon,8260L,24,2.40G,48,64-bit,SSE4.2;AVX;AVX2;AVX-512,CascadeLake,IntelXeon_8260L,Intel,165,unset,unset,unset
18531856
Intel;Xeon,8260Y,24,2.40G,48,64-bit,SSE4.2;AVX;AVX2;AVX-512,CascadeLake,IntelXeon_8260Y,Intel,165,unset,unset,unset
18541857
Intel;Xeon,8268,24,2.90G,48,64-bit,SSE4.2;AVX;AVX2;AVX-512,CascadeLake,IntelXeon_8268,Intel,205,unset,unset,unset
18551858
Intel;Xeon,8270,26,2.70G,52,64-bit,SSE4.2;AVX;AVX2;AVX-512,CascadeLake,IntelXeon_8270,Intel,205,unset,unset,unset
1859+
Intel;Xeon,8275CL,24,3.00G,48,64-bit,SSE4.2;AVX;AVX2;AVX-512,CascadeLake,IntelXeon_8275CL,Intel,240,1536K,24M,35.75
18561860
Intel;Xeon,8276,28,2.20G,56,64-bit,SSE4.2;AVX;AVX2;AVX-512,CascadeLake,IntelXeon_8276,Intel,165,unset,unset,unset
18571861
Intel;Xeon,8276L,28,2.20G,56,64-bit,SSE4.2;AVX;AVX2;AVX-512,CascadeLake,IntelXeon_8276L,Intel,165,unset,unset,unset
18581862
Intel;Xeon,8280,28,2.70G,56,64-bit,SSE4.2;AVX;AVX2;AVX-512,CascadeLake,IntelXeon_8280,Intel,205,unset,unset,unset
@@ -2262,13 +2266,15 @@ Intel;Xeon;E5;2660,v2,10,2.20G,20,64-bit,AVX,IvyBridgeEP,IntelXeon_E5_2660V2,Int
22622266
Intel;Xeon;E5;2660,v3,10,2.60G,20,64-bit,AVX2,Haswell,IntelXeon_E5_2660V3,Intel,105,unset,unset,unset
22632267
Intel;Xeon;E5;2660,v4,14,2.00G,28,64-bit,AVX2,Broadwell,IntelXeon_E5_2660V4,Intel,105,unset,unset,unset
22642268
Intel;Xeon;E5;2665,,8,2.40G,16,64-bit,AVX,SandyBridgeEP,IntelXeon_E5_2665,Intel,115,unset,unset,unset
2269+
Intel;Xeon;E5;2666,v3,10,2.9G,20,64-bit,AVX,Haswell,IntelXeon_E5_2666V3,Intel,135,640K,2560K,25M
22652270
Intel;Xeon;E5;2667,,6,2.90G,12,64-bit,AVX,SandyBridgeEP,IntelXeon_E5_2667,Intel,130,unset,unset,unset
22662271
Intel;Xeon;E5;2667,v2,8,3.30G,16,64-bit,AVX,IvyBridgeEP,IntelXeon_E5_2667V2,Intel,130,unset,unset,unset
22672272
Intel;Xeon;E5;2667,v3,8,3.20G,16,64-bit,AVX2,Haswell,IntelXeon_E5_2667V3,Intel,135,unset,unset,unset
22682273
Intel;Xeon;E5;2667,v4,8,3.20G,16,64-bit,AVX2,Broadwell,IntelXeon_E5_2667V4,Intel,135,unset,unset,unset
22692274
Intel;Xeon;E5;2670,,8,2.60G,16,64-bit,AVX,SandyBridgeEP,IntelXeon_E5_2670,Intel,115,unset,unset,unset
22702275
Intel;Xeon;E5;2670,v2,10,2.50G,20,64-bit,AVX,IvyBridgeEP,IntelXeon_E5_2670V2,Intel,115,unset,unset,unset
22712276
Intel;Xeon;E5;2670,v3,12,2.30G,24,64-bit,AVX2,Haswell,IntelXeon_E5_2670V3,Intel,120,unset,unset,unset
2277+
Intel;Xeon;E5;2676,v3,12,2.40G,24,64-bit,AVX2,Haswell,IntelXeon_E5_2670V3,Intel,120,768K,3072K,30M
22722278
Intel;Xeon;E5;2680,,8,2.70G,16,64-bit,AVX,SandyBridgeEP,IntelXeon_E5_2680,Intel,130,unset,unset,unset
22732279
Intel;Xeon;E5;2680,v2,10,2.80G,20,64-bit,AVX,IvyBridgeEP,IntelXeon_E5_2680V2,Intel,115,unset,unset,unset
22742280
Intel;Xeon;E5;2680,v3,12,2.50G,24,64-bit,AVX2,Haswell,IntelXeon_E5_2680V3,Intel,120,unset,unset,unset

src/platforms/intel/intel_processors_xeon.jl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,11 +245,13 @@ abstract type IntelXeon_E_2286M <: IntelXeon_E end; export IntelXeon_E_2286M
245245
abstract type IntelXeon_6262V <: IntelXeon_Scalable_g2 end; export IntelXeon_6262V
246246
abstract type IntelXeon_8253 <: IntelXeon_Scalable_g2 end; export IntelXeon_8253
247247
abstract type IntelXeon_8256 <: IntelXeon_Scalable_g2 end; export IntelXeon_8256
248+
abstract type IntelXeon_8259 <: IntelXeon_Scalable_g2 end; export IntelXeon_8259
248249
abstract type IntelXeon_8260 <: IntelXeon_Scalable_g2 end; export IntelXeon_8260
249250
abstract type IntelXeon_8260L <: IntelXeon_Scalable_g2 end; export IntelXeon_8260L
250251
abstract type IntelXeon_8260Y <: IntelXeon_Scalable_g2 end; export IntelXeon_8260Y
251252
abstract type IntelXeon_8268 <: IntelXeon_Scalable_g2 end; export IntelXeon_8268
252253
abstract type IntelXeon_8270 <: IntelXeon_Scalable_g2 end; export IntelXeon_8270
254+
abstract type IntelXeon_8275CL <: IntelXeon_Scalable_g2 end; export IntelXeon_8275CL
253255
abstract type IntelXeon_8276 <: IntelXeon_Scalable_g2 end; export IntelXeon_8276
254256
abstract type IntelXeon_8276L <: IntelXeon_Scalable_g2 end; export IntelXeon_8276L
255257
abstract type IntelXeon_8280 <: IntelXeon_Scalable_g2 end; export IntelXeon_8280
@@ -295,6 +297,8 @@ abstract type IntelXeon_E_2286M <: IntelXeon_E end; export IntelXeon_E_2286M
295297
abstract type IntelXeon_6150 <: IntelXeon_Scalable end; export IntelXeon_6150
296298
abstract type IntelXeon_6152 <: IntelXeon_Scalable end; export IntelXeon_6152
297299
abstract type IntelXeon_6154 <: IntelXeon_Scalable end; export IntelXeon_6154
300+
abstract type IntelXeon_8124M <: IntelXeon_Scalable end; export IntelXeon_8124M
301+
abstract type IntelXeon_8151 <: IntelXeon_Scalable end; export IntelXeon_8151
298302
abstract type IntelXeon_8153 <: IntelXeon_Scalable end; export IntelXeon_8153
299303
abstract type IntelXeon_8156 <: IntelXeon_Scalable end; export IntelXeon_8156
300304
abstract type IntelXeon_8158 <: IntelXeon_Scalable end; export IntelXeon_8158
@@ -594,6 +598,7 @@ abstract type IntelXeon_E_2286M <: IntelXeon_E end; export IntelXeon_E_2286M
594598
abstract type IntelXeon_E5_2660V3 <: IntelXeon_E5_v3 end; export IntelXeon_E5_2660V3
595599
abstract type IntelXeon_E5_2667V3 <: IntelXeon_E5_v3 end; export IntelXeon_E5_2667V3
596600
abstract type IntelXeon_E5_2670V3 <: IntelXeon_E5_v3 end; export IntelXeon_E5_2670V3
601+
abstract type IntelXeon_E5_2676V3 <: IntelXeon_E5_v3 end; export IntelXeon_E5_2676V3
597602
abstract type IntelXeon_E5_2680V3 <: IntelXeon_E5_v3 end; export IntelXeon_E5_2680V3
598603
abstract type IntelXeon_E5_2683V3 <: IntelXeon_E5_v3 end; export IntelXeon_E5_2683V3
599604
abstract type IntelXeon_E5_2687WV3 <: IntelXeon_E5_v3 end; export IntelXeon_E5_2687WV3

0 commit comments

Comments
 (0)