From fbd8aa596fbe3db6989767279308eab85837ad4c Mon Sep 17 00:00:00 2001 From: Aleksandar Djordjevic Date: Thu, 7 May 2026 12:08:11 +0200 Subject: [PATCH 1/3] ci: trigger workflows on rocprofiler-systems branch Add rocprofiler-systems to push/pull_request trigger lists in continuous-integration, formatting, and python-package workflows. Drop the obsolete omnitrace branch (renamed to rocprofiler-systems). Currently only master, develop, and the legacy omnitrace branch trigger CI. rocprofiler-systems is the active consumer-facing branch for the ROCm/rocm-systems superproject; PRs targeting it should run the same checks. Drive-by fixes uncovered by enabling the trigger: - python-package.yml: bump matrix from Python 3.7/3.8/3.9 to 3.10/3.11/3.12. The older versions no longer ship pre-built setup-python wheels for ubuntu-latest (Ubuntu 24.04). - continuous-integration.yml: include 'pip' in the conda env create command. Recent conda-forge python distributions do not ship pip by default, breaking the subsequent 'python -m pip install -r requirements.txt' step. --- .github/workflows/continuous-integration.yml | 10 +++++----- .github/workflows/formatting.yml | 4 ++-- .github/workflows/python-package.yml | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index a12b1dd38..8752b83a2 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -2,9 +2,9 @@ name: continuous-integration on: push: - branches: [ master, develop, omnitrace ] + branches: [ master, develop, rocprofiler-systems ] pull_request: - branches: [ master, develop, omnitrace ] + branches: [ master, develop, rocprofiler-systems ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -108,7 +108,7 @@ jobs: wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh bash miniconda.sh -b -p ${HOME}/miniconda conda config --set always_yes yes --set changeps1 no - conda create -c conda-forge -c defaults -n pyctest python=${{ matrix.PYTHON_VERSION }} pyctest + conda create -c conda-forge -c defaults -n pyctest python=${{ matrix.PYTHON_VERSION }} pyctest pip - name: Install Requirements run: | @@ -251,7 +251,7 @@ jobs: wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh bash miniconda.sh -b -p ${HOME}/miniconda conda config --set always_yes yes --set changeps1 no - conda create -c conda-forge -c defaults -n pyctest python=${{ matrix.PYTHON_VERSION }} pyctest + conda create -c conda-forge -c defaults -n pyctest python=${{ matrix.PYTHON_VERSION }} pyctest pip - name: Install Requirements run: | @@ -369,7 +369,7 @@ jobs: wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh bash miniconda.sh -b -p ${HOME}/miniconda conda config --set always_yes yes --set changeps1 no - conda create -c defaults -c conda-forge -n pyctest python=${{ matrix.PYTHON_VERSION }} pyctest + conda create -c defaults -c conda-forge -n pyctest python=${{ matrix.PYTHON_VERSION }} pyctest pip - name: Install Requirements run: | diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml index 1ae5d93e0..d1396954f 100644 --- a/.github/workflows/formatting.yml +++ b/.github/workflows/formatting.yml @@ -3,9 +3,9 @@ name: formatting on: push: - branches: [ master, develop, omnitrace ] + branches: [ master, develop, rocprofiler-systems ] pull_request: - branches: [ master, develop ] + branches: [ master, develop, rocprofiler-systems ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 6144bdea8..a7ca34dac 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -5,9 +5,9 @@ name: python-package on: push: - branches: [ master, develop, omnitrace ] + branches: [ master, develop, rocprofiler-systems ] pull_request: - branches: [ master, develop ] + branches: [ master, develop, rocprofiler-systems ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.7, 3.8, 3.9] + python-version: ['3.10', '3.11', '3.12'] steps: - uses: actions/checkout@v3 From e49cdb9093d8951a5e5946adbf104b5471bfd510 Mon Sep 17 00:00:00 2001 From: Aleksandar Djordjevic Date: Thu, 7 May 2026 12:35:04 +0200 Subject: [PATCH 2/3] lint: drop unused 'global' declarations (flake8 F824) flake8 added the F824 check (unused 'global' declaration where the name is never assigned in the scope). Seven pre-existing occurrences across setup.py, plotting.py, profiler.py, __main__.py, tracer.py were silent under older flake8 but now break the linting workflow on Python 3.10/3.11/3.12. Drop the dead declarations. --- setup.py | 3 --- timemory/plotting/plotting.py | 1 - timemory/profiler/profiler.py | 1 - timemory/roofline/__main__.py | 2 -- timemory/trace/tracer.py | 1 - 5 files changed, 8 deletions(-) diff --git a/setup.py b/setup.py index c5dbe4771..d54643592 100644 --- a/setup.py +++ b/setup.py @@ -90,7 +90,6 @@ def get_bool_option(_args, _name, default=False): def set_cmake_bool_option(opt, enable_opt, disable_opt): - global cmake_args try: if enable_opt: cmake_args.append("-D{}:BOOL={}".format(opt, "ON")) @@ -103,8 +102,6 @@ def set_cmake_bool_option(opt, enable_opt, disable_opt): def add_arg_bool_option( lc_name, disp_name, default=None, doc="", disp_aliases=[] ): - global parser - global cmake_options # enable option parser.add_argument( diff --git a/timemory/plotting/plotting.py b/timemory/plotting/plotting.py index 762baa23c..8899a594f 100644 --- a/timemory/plotting/plotting.py +++ b/timemory/plotting/plotting.py @@ -225,7 +225,6 @@ def echo_dart_tag(name, filepath, img_type=plot_parameters.img_type): # -------------------------------------------------------------------------------------- # def add_plotted_files(name, filepath, echo_dart): """Adds a file to the plotted file list and print CDash dart string""" - global plotted_files if echo_dart: filerealpath = os.path.realpath(filepath) echo_dart_tag(name, filerealpath) diff --git a/timemory/profiler/profiler.py b/timemory/profiler/profiler.py index ccdeed1b6..ad015d334 100644 --- a/timemory/profiler/profiler.py +++ b/timemory/profiler/profiler.py @@ -79,7 +79,6 @@ def exec_(_code_, _globs_=None, _locs_=None): class Profiler: """Provides decorators and context-manager for the timemory profilers""" - global _default_functor # static variable _conditional_functor = _default_functor diff --git a/timemory/roofline/__main__.py b/timemory/roofline/__main__.py index 686dc91e1..d3de61671 100644 --- a/timemory/roofline/__main__.py +++ b/timemory/roofline/__main__.py @@ -303,7 +303,6 @@ def plot_impl(args, ai_data, op_data, rank=None, label=None): def run(args, cmd): - global _errc if len(cmd) == 0: return @@ -429,7 +428,6 @@ def handle_error(ret, cmd, keep_going): def try_plot(): - global _errc try: # look for "--" and interpret anything after that diff --git a/timemory/trace/tracer.py b/timemory/trace/tracer.py index c4193ebdd..7e325816e 100644 --- a/timemory/trace/tracer.py +++ b/timemory/trace/tracer.py @@ -75,7 +75,6 @@ def exec_(_code_, _globs_=None, _locs_=None): class Tracer: """Provides decorators and context-manager for the timemory tracers""" - global _default_functor # static variable _conditional_functor = _default_functor From 36bb938af7257743b32ccbede12661ddbb720476 Mon Sep 17 00:00:00 2001 From: Aleksandar Djordjevic Date: Thu, 7 May 2026 12:39:10 +0200 Subject: [PATCH 3/3] lint: drop blank-line artifact from F824 cleanup (E303) --- timemory/profiler/profiler.py | 1 - timemory/trace/tracer.py | 1 - 2 files changed, 2 deletions(-) diff --git a/timemory/profiler/profiler.py b/timemory/profiler/profiler.py index ad015d334..b869ab00c 100644 --- a/timemory/profiler/profiler.py +++ b/timemory/profiler/profiler.py @@ -79,7 +79,6 @@ def exec_(_code_, _globs_=None, _locs_=None): class Profiler: """Provides decorators and context-manager for the timemory profilers""" - # static variable _conditional_functor = _default_functor diff --git a/timemory/trace/tracer.py b/timemory/trace/tracer.py index 7e325816e..b7e419f6b 100644 --- a/timemory/trace/tracer.py +++ b/timemory/trace/tracer.py @@ -75,7 +75,6 @@ def exec_(_code_, _globs_=None, _locs_=None): class Tracer: """Provides decorators and context-manager for the timemory tracers""" - # static variable _conditional_functor = _default_functor