Skip to content

Commit 8d25f9a

Browse files
lukstafilukstafi
committed
Utils.set_log_level to also update Debug_runtime.log_level 
1 parent 1eebc47 commit 8d25f9a

File tree

9 files changed

+25
-21
lines changed

9 files changed

+25
-21
lines changed

‎arrayjit/lib/utils.ml‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,6 @@ let settings =
5050
print_decimals_precision = 2;
5151
}
5252

53-
let with_runtime_debug () = settings.output_debug_files_in_build_directory && settings.log_level > 1
54-
55-
let enable_runtime_debug () =
56-
settings.output_debug_files_in_build_directory <- true;
57-
settings.log_level <- max 2 settings.log_level
58-
5953
let accessed_global_args = Hash_set.create (module String)
6054

6155
let read_cmdline_or_env_var n =
@@ -293,6 +287,16 @@ module Debug_runtime = (val _get_local_debug_runtime ())
293287

294288
(* [%%global_debug_interrupts { max_nesting_depth = 100; max_num_children = 1000 }] *)
295289

290+
let set_log_level level =
291+
settings.log_level <- level;
292+
Debug_runtime.log_level := level
293+
294+
let with_runtime_debug () = settings.output_debug_files_in_build_directory && settings.log_level > 1
295+
296+
let enable_runtime_debug () =
297+
settings.output_debug_files_in_build_directory <- true;
298+
set_log_level @@ max 2 settings.log_level
299+
296300
let rec union_find ~equal map ~key ~rank =
297301
match Map.find map key with
298302
| None -> (key, rank)

‎bin/einsum_trivia.ml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ let _suspended () =
2222
Stdlib.Format.force_newline ()
2323

2424
let _suspended () =
25-
Utils.settings.log_level <- 2;
25+
Utils.set_log_level 2;
2626
Utils.settings.output_debug_files_in_build_directory <- true;
2727
Utils.settings.debug_log_from_routines <- true;
2828
let module Backend = (val Arrayjit.Backends.fresh_backend ~backend_name:"cuda" ()) in
@@ -43,7 +43,7 @@ let _suspended () =
4343
Backend.unsafe_cleanup ()
4444

4545
let () =
46-
Utils.settings.log_level <- 2;
46+
Utils.set_log_level 2;
4747
Utils.settings.output_debug_files_in_build_directory <- true;
4848
Utils.settings.debug_log_from_routines <- true;
4949
let module Backend = (val Arrayjit.Backends.fresh_backend ()) in

‎bin/hello_world.ml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ module Rand = Arrayjit.Rand.Lib
1111
let hello1 () =
1212
Rand.init 0;
1313
let module Backend = (val Arrayjit.Backends.fresh_backend ()) in
14-
Utils.settings.log_level <- 2;
14+
Utils.set_log_level 2;
1515
(* Utils.settings.output_debug_files_in_build_directory <- true; *)
1616
let device = Backend.(new_virtual_device @@ get_device ~ordinal:0) in
1717
let ctx = Backend.init device in
@@ -28,7 +28,7 @@ let hello1 () =
2828
let hello2 () =
2929
Rand.init 0;
3030
let module Backend = (val Arrayjit.Backends.fresh_backend ()) in
31-
Utils.settings.log_level <- 2;
31+
Utils.set_log_level 2;
3232
(* Utils.settings.output_debug_files_in_build_directory <- true; *)
3333
(* Utils.settings.debug_log_from_routines <- true; *)
3434
let device = Backend.(new_virtual_device @@ get_device ~ordinal:0) in
@@ -95,7 +95,7 @@ let hello4 () =
9595
Stdio.printf "\n%!"
9696

9797
let hello5 () =
98-
Utils.settings.log_level <- 2;
98+
Utils.set_log_level 2;
9999
Utils.settings.output_debug_files_in_build_directory <- true;
100100
Utils.settings.debug_log_from_routines <- true;
101101
let module Backend = (val Arrayjit.Backends.fresh_backend ()) in
@@ -110,7 +110,7 @@ let hello5 () =
110110
Tensor.print ~force:true ~with_code:false ~with_grad:false `Default @@ ho
111111

112112
let hello6 () =
113-
Utils.settings.log_level <- 2;
113+
Utils.set_log_level 2;
114114
Utils.settings.output_debug_files_in_build_directory <- true;
115115
Utils.settings.debug_log_from_routines <- true;
116116
let module Backend = (val Arrayjit.Backends.fresh_backend ()) in

‎bin/micrograd_basic.ml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ let%diagn_sexp () =
1414
let ctx = Backend.init device in
1515
Utils.settings.output_debug_files_in_build_directory <- true;
1616
Utils.settings.debug_log_from_routines <- true;
17-
Utils.settings.log_level <- 2;
17+
Utils.set_log_level 2;
1818
Rand.init 0;
1919
let%op c = "a" [ -4 ] + "b" [ 2 ] in
2020
let%op d = c + c + 1 in

‎bin/moons_benchmark.ml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ let classify_moons ~seed ~on_device ~inlining_cutoff ~num_devices ~batch_size ~b
3232
CDSL.virtualize_settings.max_visits <- inlining_cutoff;
3333
Tensor.default_value_prec := value_prec;
3434
Tensor.default_grad_prec := grad_prec;
35-
Utils.settings.log_level <- 3;
35+
Utils.set_log_level 3;
3636
Utils.settings.output_debug_files_in_build_directory <- true;
3737
Utils.settings.debug_log_from_routines <- true;
3838
Rand.init (* seed *) 0;

‎bin/moons_demo.ml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ module Debug_runtime = Utils.Debug_runtime
1212
let demo () =
1313
Rand.init 0;
1414
Utils.enable_runtime_debug ();
15-
Utils.settings.log_level <- 3;
15+
Utils.set_log_level 3;
1616
(* Utils.settings.debug_log_from_routines <- true; *)
1717
let hid_dim = 16 in
1818
let len = 300 in

‎bin/moons_demo_parallel.ml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ module Utils = Arrayjit.Utils
99
module Rand = Arrayjit.Rand.Lib
1010

1111
let experiment ~seed ~backend_name ~config () =
12-
(* Utils.settings.log_level <- 1; *)
13-
(* Utils.settings.log_level <- 3; *)
12+
(* Utils.set_log_level 1; *)
13+
(* Utils.set_log_level 3; *)
1414
(* Utils.settings.output_debug_files_in_build_directory <- true; *)
1515
(* Utils.settings.debug_log_from_routines <- true; *)
1616
(* let hid_dim = 16 in *)

‎bin/zero2hero_1of7.ml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ let () =
9494
Stdio.print_endline ""
9595

9696
let _suspended () =
97-
(* Utils.settings.log_level <- 2; *)
97+
(* Utils.set_log_level 2; *)
9898
Utils.settings.output_debug_files_in_build_directory <- true;
9999
(* Utils.settings.debug_log_from_routines <- true; *)
100100
Rand.init 0;
@@ -152,7 +152,7 @@ let _suspended () =
152152

153153
let _suspended () =
154154
Rand.init 0;
155-
Utils.settings.log_level <- 2;
155+
Utils.set_log_level 2;
156156
Utils.settings.output_debug_files_in_build_directory <- true;
157157
Utils.settings.debug_log_from_routines <- true;
158158
let%op e = "a" [ 2 ] *. "b" [ -3 ] in

‎lib/train.ml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ module CDSL = struct
2323
let virtualize_settings = Arrayjit.Low_level.virtualize_settings
2424

2525
let enable_all_debugs ?(debug_logs = false) ?(hosted_only = true) () =
26-
Utils.settings.log_level <- max 1 @@ Utils.settings.log_level;
26+
Utils.set_log_level @@ max 1 @@ Utils.settings.log_level;
2727
Utils.settings.output_debug_files_in_build_directory <- true;
2828
if hosted_only then virtualize_settings.enable_device_only <- false;
2929
if debug_logs then Utils.settings.debug_log_from_routines <- true
3030

3131
let disable_all_debugs ?(restore_defaults = false) () =
3232
Utils.settings.debug_log_from_routines <- false;
33-
Utils.settings.log_level <- 0;
33+
Utils.set_log_level 0;
3434
Utils.settings.output_debug_files_in_build_directory <- false;
3535
if restore_defaults then virtualize_settings.enable_device_only <- true
3636
end

0 commit comments

Comments
 (0)