Remove unnecessary global declarations and add noqa comments (#5865)

- Remove redundant global declarations where not needed
- Add noqa: F824 comments to suppress linter warnings forglobal/nonlocal variables
  in autograph test where it is done on purpose

Signed-off-by: Janusz Lisiecki <[email protected]>

Author: JanuszL

dali/python/nvidia/dali/_autograph/utils/ag_logging.py

@@ -108,7 +108,6 @@ def trace(*args):
 
 
 def get_verbosity():
-    global verbosity_level
     if verbosity_level is not None:
         return verbosity_level
     return int(os.getenv(VERBOSITY_VAR_NAME, DEFAULT_VERBOSITY))

dali/python/nvidia/dali/_utils/dali_trace.py

@@ -48,7 +48,6 @@ def set_tracing(*, enabled: bool = None, options={}):
 
 
 def is_tracing_enabled():
-    global _origin_trace_enabled
     return _origin_trace_enabled
 
 

dali/test/python/autograph/pyct/static_analysis/test_activity.py

@@ -705,7 +705,7 @@ def test_fn(a, b, c):  # pylint:disable=unused-argument
     def test_global_symbol(self):
         def test_fn(c):
             global global_a
-            global global_b
+            global global_b  # noqa: F824
             global_a = global_b + c
 
         node, _ = self._parse_and_analyze(test_fn)
@@ -722,7 +722,7 @@ def test_nonlocal_symbol(self):
 
         def test_fn(c):
             nonlocal nonlocal_a
-            nonlocal nonlocal_b
+            nonlocal nonlocal_b  # noqa: F824
             nonlocal_a = nonlocal_b + c
 
         node, _ = self._parse_and_analyze(test_fn)

dali/test/python/autograph/pyct/static_analysis/test_liveness.py

@@ -503,7 +503,7 @@ def test_fn(y):
 
     def test_global_symbol(self):
         def test_fn(c):
-            global global_a
+            global global_a  # noqa: F824
             global global_b
             if global_a:
                 global_b = c
@@ -521,7 +521,7 @@ def test_nonlocal_symbol(self):
         nonlocal_b = 13
 
         def test_fn(c):
-            nonlocal nonlocal_a
+            nonlocal nonlocal_a  # noqa: F824
             nonlocal nonlocal_b
             if nonlocal_a:
                 nonlocal_b = c

dali/test/python/autograph/pyct/static_analysis/test_reaching_definitions.py

@@ -425,7 +425,7 @@ def test_fn():
 
     def test_global(self):
         def test_fn():
-            global global_a
+            global global_a  # noqa: F824
             global global_b
             if global_a:
                 global_b = []
@@ -448,7 +448,7 @@ def test_nonlocal(self):
         b = 13
 
         def test_fn():
-            nonlocal a
+            nonlocal a  # noqa: F824
             nonlocal b
             if a:
                 b = []
@@ -475,7 +475,7 @@ def test_fn():
             b = 13
 
             def local_fn():
-                nonlocal a, b
+                nonlocal a, b  # noqa: F824
                 if a:
                     b = []
                 return a, b
@@ -515,7 +515,7 @@ def test_nonlocal(self):
         b = 13
 
         def test_fn():
-            nonlocal a
+            nonlocal a  # noqa: F824
             nonlocal b
             if a:
                 b = []
@@ -542,7 +542,7 @@ def test_fn():
             b = 13
 
             def local_fn():
-                nonlocal a, b
+                nonlocal a, b  # noqa: F824
                 if a:
                     b = []
                 return a, b

dali/test/python/autograph/pyct/static_analysis/test_type_inference.py

@@ -471,7 +471,7 @@ def bar():
     def test_local_function_closure_mutable_var(self):
         def test_fn(x: int):
             def foo():
-                nonlocal x
+                nonlocal x  # noqa: F824
                 return x
 
             foo()

dali/test/python/operator_1/test_operator_origin_trace.py

@@ -46,7 +46,6 @@ def capture_python_traces(fun, full_stack=False):
     full_stack : bool, optional
         Whether to capture the whole stack, by default False
     """
-    global extracted_stacks
     global base_frame
     base_frame = len(traceback.extract_stack()) if not full_stack else 0
 
@@ -85,14 +84,11 @@ def capture_dali_traces(pipe_def):
 
 def origin_trace():
     """Either return trace using test operator or capture it via Python API"""
-    global op_mode
     if op_mode == "dali.fn":
         return fn.origin_trace_dump()
     if op_mode == "dali.ops":
         return ops.OriginTraceDump()()  # Yup, super obvious __init__ + __call__
     # elif op_mode == "python":
-    global extracted_stacks
-    global base_frame
     # Skip last frame as it differs from calling the fn.origin_trace_dump above.
     extracted_stacks.append(traceback.extract_stack()[base_frame:-1])
     return None
@@ -105,7 +101,6 @@ def origin_trace_glob(op_mode):
 
 
 def compare_traces(dali_tbs, python_tbs, end_glob=origin_trace_glob):
-    global op_mode
     assert len(dali_tbs) == len(python_tbs)
     regex = fnmatch.translate(end_glob(op_mode))
     for dali_tb, python_tb in zip(dali_tbs, python_tbs):

dali/test/python/test_pool_utils.py

@@ -21,9 +21,6 @@ def capture_processes(pool):
     """Need to be called to register the processes created by the pool. It is later used
     by the teardown_function to check if no process stayed alive after the test finished.
     """
-    global pool_processes
-    global pool_threads
-    global pools
     if pool is not None:
         pools.append(weakref.ref(pool))
         pool_processes.extend(pool.pids())
@@ -47,9 +44,6 @@ def teardown_function():
 
     Be sure to call `capture_processes` in the test.
     """
-    global pool_processes
-    global pool_threads
-    global pools
     assert len(pool_processes), "No processes where tracked - did the test call capture_processes?"
     pools_not_collected = [pool_ref() is not None for pool_ref in pools]
     current_process = psutil.Process()

dali/test/python/webdataset_base.py

@@ -105,7 +105,6 @@ def file_reader_pipeline(
 
 
 def generate_temp_index_file(tar_file_path):
-    global wds2idx_script
     temp_index_file = tempfile.NamedTemporaryFile()
     assert_equals(
         call([wds2idx_script, tar_file_path, temp_index_file.name], stdout=open(os.devnull, "wb")),

qa/setup_packages.py

@@ -714,7 +714,6 @@ def get_links_indices(packages, cuda_version):
 
 
 def main():
-    global args
     if args.list:
         print_configs(args.cuda)
     elif args.num: