@@ -199,25 +199,25 @@ discard block |
||
199 | 199 | $min = 1e99; |
200 | 200 | $max = 0; |
201 | 201 | foreach ($results as $r) { |
202 | - $f = $r->flops / (4.3e9 *3600); |
|
202 | + $f = $r->flops/(4.3e9*3600); |
|
203 | 203 | if ($f > $max) $max = $f; |
204 | 204 | if ($f < $min) $min = $f; |
205 | 205 | $x[] = $f; |
206 | 206 | } |
207 | 207 | $n = 800; |
208 | 208 | $count = []; |
209 | - for ($i=0; $i<$n; $i++) { |
|
209 | + for ($i = 0; $i < $n; $i++) { |
|
210 | 210 | $count[$i] = 0; |
211 | 211 | } |
212 | 212 | $range = $max - $min; |
213 | 213 | foreach ($x as $f) { |
214 | - $d = intval($n*($f-$min)/$range); |
|
215 | - if ($d >= $n) $d = $n-1; |
|
214 | + $d = intval($n*($f - $min)/$range); |
|
215 | + if ($d >= $n) $d = $n - 1; |
|
216 | 216 | $count[$d] += 1; |
217 | 217 | } |
218 | 218 | $data = []; |
219 | - for ($i=0; $i<$n; $i++) { |
|
220 | - $data[] = [$min+($i*$range)/$n, $count[$i]]; |
|
219 | + for ($i = 0; $i < $n; $i++) { |
|
220 | + $data[] = [$min + ($i*$range)/$n, $count[$i]]; |
|
221 | 221 | } |
222 | 222 | graph($data, 'hours', 'count'); |
223 | 223 | page_tail(); |
@@ -225,7 +225,7 @@ discard block |
||
225 | 225 | |
226 | 226 | $batch = BoincBatch::lookup_id(get_int('batch_id')); |
227 | 227 | if (!$batch) error_page('no batch'); |
228 | -switch(get_str('action')) { |
|
228 | +switch (get_str('action')) { |
|
229 | 229 | case 'err_host': |
230 | 230 | err_host($batch); |
231 | 231 | break; |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | } |
193 | 193 | |
194 | 194 | function flops_graph($batch) { |
195 | - page_head("Batch $batch->id job runtimes"); |
|
195 | + page_head("batch $batch->id job runtimes"); |
|
196 | 196 | echo " |
197 | 197 | <p> |
198 | 198 | Runtimes of completed jobs, normalized to an average (4.3 GFLOPS) computer. |
@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | } |
252 | 252 | } |
253 | 253 | arsort($x); |
254 | - page_head("Batch $batch->id: completed jobs grouped by host"); |
|
254 | + page_head("batch $batch->id: completed jobs grouped by host"); |
|
255 | 255 | text_start(); |
256 | 256 | start_table(); |
257 | 257 | table_header('Host', 'OS', '# jobs'); |
@@ -24,77 +24,77 @@ discard block |
||
24 | 24 | define('KW_CATEGORY_SCIENCE', 0); |
25 | 25 | define('KW_CATEGORY_LOC', 1); |
26 | 26 | |
27 | -define('KW_ASTRONOMY', 1); |
|
28 | -define('KW_SETI', 2); |
|
29 | -define('KW_PULSARS', 3); |
|
30 | -define('KW_GW', 4); |
|
31 | -define('KW_COSMOLOGY', 5); |
|
32 | -define('KW_PHYSICS', 6); |
|
27 | +define('KW_ASTRONOMY', 1); |
|
28 | +define('KW_SETI', 2); |
|
29 | +define('KW_PULSARS', 3); |
|
30 | +define('KW_GW', 4); |
|
31 | +define('KW_COSMOLOGY', 5); |
|
32 | +define('KW_PHYSICS', 6); |
|
33 | 33 | define('KW_PARTICLE_PHYSICS', 7); |
34 | -define('KW_NANOSCIENCE', 8); |
|
35 | -define('KW_BIOMED', 9); |
|
34 | +define('KW_NANOSCIENCE', 8); |
|
35 | +define('KW_BIOMED', 9); |
|
36 | 36 | define('KW_DRUG_DISCOVERY', 10); |
37 | -define('KW_PROTEINS', 11); |
|
38 | -define('KW_GENETICS', 12); |
|
39 | -define('KW_DISEASE', 13); |
|
40 | -define('KW_CANCER', 14); |
|
41 | -define('KW_MATH_CS', 15); |
|
42 | -define('KW_AI', 16); |
|
43 | -define('KW_OCEANIA', 17); |
|
44 | -define('KW_AUSTRALIA', 18); |
|
37 | +define('KW_PROTEINS', 11); |
|
38 | +define('KW_GENETICS', 12); |
|
39 | +define('KW_DISEASE', 13); |
|
40 | +define('KW_CANCER', 14); |
|
41 | +define('KW_MATH_CS', 15); |
|
42 | +define('KW_AI', 16); |
|
43 | +define('KW_OCEANIA', 17); |
|
44 | +define('KW_AUSTRALIA', 18); |
|
45 | 45 | |
46 | -define('KW_EUROPE', 20); |
|
47 | -define('KW_GERMANY', 21); |
|
48 | -define('KW_ASIA', 22); |
|
49 | -define('KW_AMERICAS', 23); |
|
50 | -define('KW_US', 24); |
|
51 | -define('KW_UCB', 25); |
|
52 | -define('KW_AEI', 26); |
|
53 | -define('KW_CERN', 27); |
|
54 | -define('KW_UW', 28); |
|
55 | -define('KW_EARTH_SCI', 29); |
|
56 | -define('KW_SPAIN', 30); |
|
57 | -define('KW_SAN_JORGE', 31); |
|
58 | -define('KW_NUMBER_THEORY', 32); |
|
59 | -define('KW_CRYPTO', 33); |
|
60 | -define('KW_ENV_RESEARCH', 34); |
|
61 | -define('KW_CLIMATE', 35); |
|
62 | -define('KW_CZECH', 36); |
|
46 | +define('KW_EUROPE', 20); |
|
47 | +define('KW_GERMANY', 21); |
|
48 | +define('KW_ASIA', 22); |
|
49 | +define('KW_AMERICAS', 23); |
|
50 | +define('KW_US', 24); |
|
51 | +define('KW_UCB', 25); |
|
52 | +define('KW_AEI', 26); |
|
53 | +define('KW_CERN', 27); |
|
54 | +define('KW_UW', 28); |
|
55 | +define('KW_EARTH_SCI', 29); |
|
56 | +define('KW_SPAIN', 30); |
|
57 | +define('KW_SAN_JORGE', 31); |
|
58 | +define('KW_NUMBER_THEORY', 32); |
|
59 | +define('KW_CRYPTO', 33); |
|
60 | +define('KW_ENV_RESEARCH', 34); |
|
61 | +define('KW_CLIMATE', 35); |
|
62 | +define('KW_CZECH', 36); |
|
63 | 63 | define('KW_CHARLES_PRAGUE', 37); |
64 | -define('KW_RECHENKRAFT', 38); |
|
65 | -define('KW_RHEINMAIN', 39); |
|
66 | -define('KW_HUNGARY', 40); |
|
67 | -define('KW_IRELAND', 41); |
|
68 | -define('KW_UC_DUBLIN', 42); |
|
69 | -define('KW_POLAND', 43); |
|
70 | -define('KW_RUSSIA', 44); |
|
64 | +define('KW_RECHENKRAFT', 38); |
|
65 | +define('KW_RHEINMAIN', 39); |
|
66 | +define('KW_HUNGARY', 40); |
|
67 | +define('KW_IRELAND', 41); |
|
68 | +define('KW_UC_DUBLIN', 42); |
|
69 | +define('KW_POLAND', 43); |
|
70 | +define('KW_RUSSIA', 44); |
|
71 | 71 | define('KW_SW_STATE_RUSSIA', 45); |
72 | -define('KW_RAS', 46); |
|
73 | -define('KW_PRBB', 47); |
|
74 | -define('KW_UK', 48); |
|
75 | -define('KW_OXFORD', 49); |
|
76 | -define('KW_CHINA', 50); |
|
77 | -define('KW_U_DAYTON', 51); |
|
78 | -define('KW_WRIGHT_STATE', 52); |
|
79 | -define('KW_USC', 53); |
|
80 | -define('KW_FULLERTON', 54); |
|
81 | -define('KW_ARIZONA_STATE', 55); |
|
82 | -define('KW_U_ILLINOIS', 56); |
|
83 | -define('KW_U_WARSAW', 57); |
|
84 | -define('KW_RPI', 58); |
|
85 | -define('KW_INTERNATIONAL', 59); |
|
86 | -define('KW_UND', 60); |
|
87 | -define('KW_HOLLAND', 61); |
|
88 | -define('KW_CHEMISTRY', 62); |
|
89 | -define('KW_GAMES', 63); |
|
90 | -define('KW_VIRUS', 64); |
|
91 | -define('KW_FRANCE', 65); |
|
92 | -define('KW_CANADA', 66); |
|
93 | -define('KW_PSU', 67); |
|
94 | -define('KW_SU', 68); |
|
95 | -define('KW_SINAI_U', 69); |
|
96 | -define('KW_AFRICA', 70); |
|
97 | -define('KW_EGYPT', 71); |
|
72 | +define('KW_RAS', 46); |
|
73 | +define('KW_PRBB', 47); |
|
74 | +define('KW_UK', 48); |
|
75 | +define('KW_OXFORD', 49); |
|
76 | +define('KW_CHINA', 50); |
|
77 | +define('KW_U_DAYTON', 51); |
|
78 | +define('KW_WRIGHT_STATE', 52); |
|
79 | +define('KW_USC', 53); |
|
80 | +define('KW_FULLERTON', 54); |
|
81 | +define('KW_ARIZONA_STATE', 55); |
|
82 | +define('KW_U_ILLINOIS', 56); |
|
83 | +define('KW_U_WARSAW', 57); |
|
84 | +define('KW_RPI', 58); |
|
85 | +define('KW_INTERNATIONAL', 59); |
|
86 | +define('KW_UND', 60); |
|
87 | +define('KW_HOLLAND', 61); |
|
88 | +define('KW_CHEMISTRY', 62); |
|
89 | +define('KW_GAMES', 63); |
|
90 | +define('KW_VIRUS', 64); |
|
91 | +define('KW_FRANCE', 65); |
|
92 | +define('KW_CANADA', 66); |
|
93 | +define('KW_PSU', 67); |
|
94 | +define('KW_SU', 68); |
|
95 | +define('KW_SINAI_U', 69); |
|
96 | +define('KW_AFRICA', 70); |
|
97 | +define('KW_EGYPT', 71); |
|
98 | 98 | |
99 | 99 | $job_keywords = array(); |
100 | 100 | |
@@ -352,7 +352,7 @@ discard block |
||
352 | 352 | } |
353 | 353 | } |
354 | 354 | |
355 | -function kw_options($id, $indent='') { |
|
355 | +function kw_options($id, $indent = '') { |
|
356 | 356 | global $job_keywords; |
357 | 357 | $kw = $job_keywords[$id]; |
358 | 358 | $opts = [[$id, "$indent$kw->name"]]; |
@@ -369,7 +369,7 @@ discard block |
||
369 | 369 | return $kw->name; |
370 | 370 | } |
371 | 371 | |
372 | -function kw_array_to_str($kws, $sep='<br>') { |
|
372 | +function kw_array_to_str($kws, $sep = '<br>') { |
|
373 | 373 | $x = array_map('strval', $kws); |
374 | 374 | $x = array_map('kw_id_to_name', $x); |
375 | 375 | return implode($sep, $x); |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | // show list of BUDA apps and variants, |
37 | 37 | // w/ buttons for adding and deleting |
38 | 38 | // |
39 | -function app_list($notice=null) { |
|
39 | +function app_list($notice = null) { |
|
40 | 40 | global $buda_root; |
41 | 41 | if (!is_dir($buda_root)) { |
42 | 42 | mkdir($buda_root); |
@@ -224,7 +224,7 @@ discard block |
||
224 | 224 | // |
225 | 225 | $x = "<input_template>\n"; |
226 | 226 | $ninfiles = count($desc->input_file_names); |
227 | - for ($i=0; $i<$ninfiles; $i++) { |
|
227 | + for ($i = 0; $i < $ninfiles; $i++) { |
|
228 | 228 | $x .= " <file_info>\n <sticky/>\n <no_delete/>\n <executable/>\n </file_info>\n"; |
229 | 229 | } |
230 | 230 | $x .= " <workunit>\n"; |
@@ -245,7 +245,7 @@ discard block |
||
245 | 245 | ); |
246 | 246 | |
247 | 247 | $x .= sprintf(" <max_delay>%f</max_delay>\n", |
248 | - $desc->max_delay_days * 86400. |
|
248 | + $desc->max_delay_days*86400. |
|
249 | 249 | ); |
250 | 250 | |
251 | 251 | $x .= " <buda_app_name>$app</buda_app_name>\n"; |
@@ -318,7 +318,7 @@ discard block |
||
318 | 318 | } else { |
319 | 319 | $creating = true; |
320 | 320 | } |
321 | - $variant = sprintf('%s_%s', $cpu_type, $plan_class?$plan_class:'cpu'); |
|
321 | + $variant = sprintf('%s_%s', $cpu_type, $plan_class ? $plan_class : 'cpu'); |
|
322 | 322 | if (!is_valid_filename($variant)) { |
323 | 323 | error_page(filename_rules()); |
324 | 324 | } |
@@ -463,8 +463,8 @@ discard block |
||
463 | 463 | } |
464 | 464 | } |
465 | 465 | |
466 | -function app_form($desc=null) { |
|
467 | - page_head_select2($desc?"Edit BUDA app $desc->name":'Create BUDA app'); |
|
466 | +function app_form($desc = null) { |
|
467 | + page_head_select2($desc ? "Edit BUDA app $desc->name" : 'Create BUDA app'); |
|
468 | 468 | form_start('buda.php'); |
469 | 469 | form_input_hidden('action', 'app_action'); |
470 | 470 | if ($desc) { |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | ); |
196 | 196 | } |
197 | 197 | form_input_text("Plan class$pc", 'plan_class', $variant_desc->plan_class); |
198 | - form_select("Dockerfile$sb", 'dockerfile', $sbitems, $variant_desc->dockerfile); |
|
198 | + form_select("dockerfile$sb", 'dockerfile', $sbitems, $variant_desc->dockerfile); |
|
199 | 199 | form_select2_multi("Application files$sb", 'app_files', $sbitems, $variant_desc->app_files); |
200 | 200 | form_submit('OK'); |
201 | 201 | form_end(); |
@@ -393,7 +393,7 @@ discard block |
||
393 | 393 | // Note: we don't currently allow indirect file access. |
394 | 394 | // If we did, we'd need to create job.toml to mount project dir |
395 | 395 | |
396 | - app_list("Variant $variant added for app $app."); |
|
396 | + app_list("variant $variant added for app $app."); |
|
397 | 397 | } |
398 | 398 | |
399 | 399 | function variant_delete() { |
@@ -420,7 +420,7 @@ discard block |
||
420 | 420 | if ($ret) { |
421 | 421 | error_page("delete failed"); |
422 | 422 | } |
423 | - $notice = "Variant $variant of app $app removed."; |
|
423 | + $notice = "variant $variant of app $app removed."; |
|
424 | 424 | app_list($notice); |
425 | 425 | } else { |
426 | 426 | page_head("Confirm"); |
@@ -450,7 +450,7 @@ discard block |
||
450 | 450 | if ($ret) { |
451 | 451 | error_page('delete failed'); |
452 | 452 | } |
453 | - $notice = "App $app removed."; |
|
453 | + $notice = "app $app removed."; |
|
454 | 454 | app_list($notice); |
455 | 455 | } else { |
456 | 456 | page_head('Confirm'); |
@@ -547,7 +547,7 @@ discard block |
||
547 | 547 | } |
548 | 548 | $dir = "$buda_root/$app_name"; |
549 | 549 | if (file_exists($dir)) { |
550 | - error_page("App $app_name already exists."); |
|
550 | + error_page("app $app_name already exists."); |
|
551 | 551 | } |
552 | 552 | mkdir($dir); |
553 | 553 | $desc->user_id = $user->id; |
@@ -639,7 +639,7 @@ discard block |
||
639 | 639 | |
640 | 640 | $is_assim_move = is_assim_move($app); |
641 | 641 | |
642 | - page_head("Batch $batch_id"); |
|
642 | + page_head("batch $batch_id"); |
|
643 | 643 | text_start(800); |
644 | 644 | start_table(); |
645 | 645 | row2("name", $batch->name); |
@@ -923,7 +923,7 @@ discard block |
||
923 | 923 | |
924 | 924 | if (get_int('confirmed', true)) { |
925 | 925 | abort_batch($batch); |
926 | - page_head("Batch $batch_id aborted"); |
|
926 | + page_head("batch $batch_id aborted"); |
|
927 | 927 | return_link(); |
928 | 928 | page_tail(); |
929 | 929 | } else { |
@@ -952,7 +952,7 @@ discard block |
||
952 | 952 | |
953 | 953 | if (get_int('confirmed', true)) { |
954 | 954 | retire_batch($batch); |
955 | - page_head("Batch $batch_id retired"); |
|
955 | + page_head("batch $batch_id retired"); |
|
956 | 956 | return_link(); |
957 | 957 | page_tail(); |
958 | 958 | } else { |
@@ -649,7 +649,7 @@ discard block |
||
649 | 649 | if ($owner) { |
650 | 650 | row2('submitter', $owner->name); |
651 | 651 | } |
652 | - row2("application", $app?$app->name:'---'); |
|
652 | + row2("application", $app ? $app->name : '---'); |
|
653 | 653 | row2("state", batch_state_string($batch->state)); |
654 | 654 | //row2("# jobs", $batch->njobs); |
655 | 655 | //row2("# error jobs", $batch->nerror_jobs); |
@@ -739,11 +739,11 @@ discard block |
||
739 | 739 | "GFLOPS-hours" |
740 | 740 | ]; |
741 | 741 | row_heading_array($x); |
742 | - foreach($wus as $wu) { |
|
742 | + foreach ($wus as $wu) { |
|
743 | 743 | if ($status && $wu->status != $status) continue; |
744 | 744 | $y = ''; |
745 | 745 | $c = '---'; |
746 | - switch($wu->status) { |
|
746 | + switch ($wu->status) { |
|
747 | 747 | case WU_SUCCESS: |
748 | 748 | $resultid = $wu->canonical_resultid; |
749 | 749 | $y = sprintf('<font color="%s">completed</font>', COLOR_SUCCESS); |
@@ -832,7 +832,7 @@ discard block |
||
832 | 832 | if ($result->id == $wu->canonical_resultid) { |
833 | 833 | $log_names = get_outfile_log_names($result); |
834 | 834 | $nfiles = count($log_names); |
835 | - for ($i=0; $i<$nfiles; $i++) { |
|
835 | + for ($i = 0; $i < $nfiles; $i++) { |
|
836 | 836 | $name = $log_names[$i]; |
837 | 837 | // don't show 'view' link if it's a .zip |
838 | 838 | $y = "$name: "; |
@@ -856,7 +856,7 @@ discard block |
||
856 | 856 | $phys_names = get_outfile_phys_names($result); |
857 | 857 | $log_names = get_outfile_log_names($result); |
858 | 858 | $nfiles = count($log_names); |
859 | - for ($i=0; $i<$nfiles; $i++) { |
|
859 | + for ($i = 0; $i < $nfiles; $i++) { |
|
860 | 860 | $path = dir_hier_path( |
861 | 861 | $phys_names[$i], $upload_dir, $fanout |
862 | 862 | ); |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | // |
83 | 83 | function unzip_batch_file($user, $batch_file) { |
84 | 84 | @mkdir("../../buda_batches"); |
85 | - for ($i=0; $i<1000; $i++) { |
|
85 | + for ($i = 0; $i < 1000; $i++) { |
|
86 | 86 | $batch_dir = "../../buda_batches/$i"; |
87 | 87 | $batch_dir_name = $i; |
88 | 88 | $ret = @mkdir($batch_dir); |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | } |
134 | 134 | $job_files = []; |
135 | 135 | $cmdline = ''; |
136 | - foreach(scandir("$batch_dir/$fname") as $f2) { |
|
136 | + foreach (scandir("$batch_dir/$fname") as $f2) { |
|
137 | 137 | if ($f2[0] == '.') continue; |
138 | 138 | if ($f2 == 'cmdline') { |
139 | 139 | $cmdline = trim(file_get_contents("$batch_dir/$fname/cmdline")); |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | function stage_input_files($batch_dir, $batch_desc, $batch_id) { |
188 | 188 | $n = count($batch_desc->shared_files); |
189 | 189 | $batch_desc->shared_files_phys_names = []; |
190 | - for ($i=0; $i<$n; $i++) { |
|
190 | + for ($i = 0; $i < $n; $i++) { |
|
191 | 191 | $path = sprintf('%s/%s', $batch_dir, $batch_desc->shared_files[$i]); |
192 | 192 | [$md5, $size] = $batch_desc->shared_file_infos[$i]; |
193 | 193 | $phys_name = sprintf('batch_%d_%s', $batch_id, $md5); |
@@ -197,7 +197,7 @@ discard block |
||
197 | 197 | foreach ($batch_desc->jobs as $job) { |
198 | 198 | $n = count($batch_desc->unshared_files); |
199 | 199 | $job->phys_names = []; |
200 | - for ($i=0; $i<$n; $i++) { |
|
200 | + for ($i = 0; $i < $n; $i++) { |
|
201 | 201 | $path = sprintf('%s/%s/%s', |
202 | 202 | $batch_dir, $job->dir, $batch_desc->unshared_files[$i] |
203 | 203 | ); |
@@ -236,7 +236,7 @@ discard block |
||
236 | 236 | $job_cmds .= "$job_cmd\n"; |
237 | 237 | } |
238 | 238 | $wrapper_cmdline = sprintf('"%s %s"', |
239 | - $wrapper_verbose?'--verbose':'', |
|
239 | + $wrapper_verbose ? '--verbose' : '', |
|
240 | 240 | $cmdline |
241 | 241 | ); |
242 | 242 | $cmd = sprintf( |
@@ -283,7 +283,7 @@ discard block |
||
283 | 283 | $max_runtime_days = (double)$max_runtime_days; |
284 | 284 | if ($max_runtime_days <= 0) error_page('bad runtime limit'); |
285 | 285 | if ($max_runtime_days > 100) error_page('bad runtime limit'); |
286 | - $max_fpops = $max_runtime_days * 4.3e9 * 86400; |
|
286 | + $max_fpops = $max_runtime_days*4.3e9*86400; |
|
287 | 287 | |
288 | 288 | $exp_runtime_days = get_str('exp_runtime_days'); |
289 | 289 | if (!is_numeric($exp_runtime_days)) error_page('bad expected runtime'); |
@@ -293,7 +293,7 @@ discard block |
||
293 | 293 | if ($exp_runtime_days > $max_runtime_days) { |
294 | 294 | error_page('exp must be < max runtime'); |
295 | 295 | } |
296 | - $exp_fpops = $exp_runtime_days * 4.3e9 * 86400; |
|
296 | + $exp_fpops = $exp_runtime_days*4.3e9*86400; |
|
297 | 297 | |
298 | 298 | $app_desc = get_buda_app_desc($app); |
299 | 299 |
@@ -346,7 +346,7 @@ |
||
346 | 346 | handle_get_info(); |
347 | 347 | } else { |
348 | 348 | $dev = get_str("dev", true); |
349 | - $user_agent = get_str("user_agent", true); // for debugging |
|
349 | + $user_agent = get_str("user_agent", true); // for debugging |
|
350 | 350 | if (!$user_agent) { |
351 | 351 | $user_agent = $_SERVER['HTTP_USER_AGENT']; |
352 | 352 | } |