Merge branch 'main' into jnovo

ROCm · Jul 29, 2024 · 1c7bd30 · 1c7bd30
2 parents c1d1fa6 + da6a60c
commit 1c7bd30
Show file tree

Hide file tree

Showing 15 changed files with 21 additions and 220 deletions.
diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml
@@ -29,14 +29,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - distro: "ubuntu"
-            version: "18.04"
           - distro: "ubuntu"
             version: "20.04"
           - distro: "ubuntu"
             version: "22.04"
-          - distro: "opensuse"
-            version: "15.2"
           - distro: "opensuse"
             version: "15.3"
           - distro: "opensuse"
@@ -86,22 +82,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # ubuntu 18.04
-          - os-distro: "ubuntu"
-            os-version: "18.04"
-            rocm-version: "0.0"
-          - os-distro: "ubuntu"
-            os-version: "18.04"
-            rocm-version: "4.5"
-          - os-distro: "ubuntu"
-            os-version: "18.04"
-            rocm-version: "5.0"
-          - os-distro: "ubuntu"
-            os-version: "18.04"
-            rocm-version: "5.1"
-          - os-distro: "ubuntu"
-            os-version: "18.04"
-            rocm-version: "5.2"
           # ubuntu 20.04
           - os-distro: "ubuntu"
             os-version: "20.04"

diff --git a/.github/workflows/cpack.yml b/.github/workflows/cpack.yml
@@ -9,6 +9,7 @@ on:
       - v*
     paths-ignore:
       - '*.md'
+      - 'docs/**'
       - 'source/docs/**'
   pull_request:
     branches: [main]
@@ -31,10 +32,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # ubuntu 18.04
-          - os-distro: "ubuntu"
-            os-version: "18.04"
-            rocm-version: "0.0"
           # ubuntu 20.04
           - os-distro: "ubuntu"
             os-version: "20.04"

diff --git a/.github/workflows/opensuse.yml b/.github/workflows/opensuse.yml
@@ -6,6 +6,7 @@ on:
     branches: [ main, develop ]
     paths-ignore:
       - '*.md'
+      - 'docs/**'
       - 'source/docs/**'
       - 'source/python/gui/**'
       - '.github/workflows/docs.yml'
@@ -17,6 +18,7 @@ on:
     branches: [ main, develop ]
     paths-ignore:
       - '*.md'
+      - 'docs/**'
       - 'source/docs/**'
       - 'source/python/gui/**'
       - '.github/workflows/docs.yml'
@@ -42,11 +44,11 @@ jobs:
       fail-fast: false
       matrix:
         compiler: ['g++']
-        os-release: [ '15.2', '15.3', '15.4' ]
+        os-release: [ '15.3', '15.4' ]
         build-type: ['Release']
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Install Packages
       timeout-minutes: 25

diff --git a/.github/workflows/redhat.yml b/.github/workflows/redhat.yml
@@ -6,6 +6,7 @@ on:
     branches: [ main, develop ]
     paths-ignore:
       - '*.md'
+      - 'docs/**'
       - 'source/docs/**'
       - 'source/python/gui/**'
       - '.github/workflows/docs.yml'
@@ -17,6 +18,7 @@ on:
     branches: [ main, develop ]
     paths-ignore:
       - '*.md'
+      - 'docs/**'
       - 'source/docs/**'
       - 'source/python/gui/**'
       - '.github/workflows/docs.yml'

diff --git a/.github/workflows/ubuntu-bionic.yml b/.github/workflows/ubuntu-bionic.yml
diff --git a/.github/workflows/ubuntu-focal.yml b/.github/workflows/ubuntu-focal.yml
@@ -6,6 +6,7 @@ on:
     branches: [ main, develop ]
     paths-ignore:
       - '*.md'
+      - 'docs/**'
       - 'source/docs/**'
       - 'source/python/gui/**'
       - '.github/workflows/docs.yml'
@@ -17,6 +18,7 @@ on:
     branches: [ main, develop ]
     paths-ignore:
       - '*.md'
+      - 'docs/**'
       - 'source/docs/**'
       - 'source/python/gui/**'
       - '.github/workflows/docs.yml'

diff --git a/.github/workflows/ubuntu-jammy.yml b/.github/workflows/ubuntu-jammy.yml
@@ -6,6 +6,7 @@ on:
     branches: [ main, develop ]
     paths-ignore:
       - '*.md'
+      - 'docs/**'
       - 'source/docs/**'
       - 'source/python/gui/**'
       - '.github/workflows/docs.yml'
@@ -17,6 +18,7 @@ on:
     branches: [ main, develop ]
     paths-ignore:
       - '*.md'
+      - 'docs/**'
       - 'source/docs/**'
       - 'source/python/gui/**'
       - '.github/workflows/docs.yml'

diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "external/timemory"]
 	path = external/timemory
-	url = https://github.com/NERSC/timemory.git
+	url = https://github.com/NERSC/timemory
 [submodule "external/perfetto"]
 	path = external/perfetto
 	url = https://android.googlesource.com/platform/external/perfetto
@@ -9,7 +9,7 @@
 	url = https://github.com/jrmadsen/ELFIO.git
 [submodule "external/dyninst"]
 	path = external/dyninst
-	url = https://github.com/jrmadsen/dyninst.git
+	url = https://github.com/jrmadsen/dyninst
 [submodule "external/PTL"]
 	path = external/PTL
 	url = https://github.com/jrmadsen/PTL.git

diff --git a/README.md b/README.md
@@ -1,6 +1,5 @@
 # Omnitrace: Application Profiling, Tracing, and Analysis
 
-[![Ubuntu 18.04 with GCC and MPICH](https://github.com/ROCm/omnitrace/actions/workflows/ubuntu-bionic.yml/badge.svg)](https://github.com/ROCm/omnitrace/actions/workflows/ubuntu-bionic.yml)
 [![Ubuntu 20.04 with GCC, ROCm, and MPI](https://github.com/ROCm/omnitrace/actions/workflows/ubuntu-focal.yml/badge.svg)](https://github.com/ROCm/omnitrace/actions/workflows/ubuntu-focal.yml)
 [![Ubuntu 22.04 (GCC, Python, ROCm)](https://github.com/ROCm/omnitrace/actions/workflows/ubuntu-jammy.yml/badge.svg)](https://github.com/ROCm/omnitrace/actions/workflows/ubuntu-jammy.yml)
 [![OpenSUSE 15.x with GCC](https://github.com/ROCm/omnitrace/actions/workflows/opensuse.yml/badge.svg)](https://github.com/ROCm/omnitrace/actions/workflows/opensuse.yml)

diff --git a/cmake/ConfigCPack.cmake b/cmake/ConfigCPack.cmake
@@ -47,7 +47,7 @@ set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
 set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY OFF)
 set(OMNITRACE_CPACK_SYSTEM_NAME
     "${_SYSTEM_NAME}"
-    CACHE STRING "System name, e.g. Linux or Ubuntu-18.04")
+    CACHE STRING "System name, e.g. Linux or Ubuntu-20.04")
 set(OMNITRACE_CPACK_PACKAGE_SUFFIX "")
 
 if(OMNITRACE_USE_HIP

diff --git a/cmake/ElfUtils.cmake b/cmake/ElfUtils.cmake
@@ -102,7 +102,8 @@ set(_eu_build_byproducts "${_eu_root}/lib/libdw${CMAKE_STATIC_LIBRARY_SUFFIX}"
 externalproject_add(
     omnitrace-elfutils-build
     PREFIX ${PROJECT_BINARY_DIR}/external/elfutils
-    URL https://sourceware.org/elfutils/ftp/${ElfUtils_DOWNLOAD_VERSION}/elfutils-${ElfUtils_DOWNLOAD_VERSION}.tar.bz2
+    URL ${ElfUtils_DOWNLOAD_URL}
+        "https://sourceware.org/elfutils/ftp/${ElfUtils_DOWNLOAD_VERSION}/elfutils-${ElfUtils_DOWNLOAD_VERSION}.tar.bz2"
     BUILD_IN_SOURCE 1
     CONFIGURE_COMMAND
         ${CMAKE_COMMAND} -E env CC=${ElfUtils_C_COMPILER}

diff --git a/cmake/Templates/omnitrace-install.py.in b/cmake/Templates/omnitrace-install.py.in
@@ -103,8 +103,8 @@ def get_os_info(os_distrib, os_version):
             if "debian" in _os_info["ID_LIKE"]:
                 os_distrib = "ubuntu"
                 if os_version is None:
-                    # fallback on 18.04 if ID is not ubuntu but debian-like
-                    os_version = "18.04"
+                    # fallback on 20.04 if ID is not ubuntu but debian-like
+                    os_version = "20.04"
             elif "suse" in _os_info["ID_LIKE"]:
                 os_distrib = "opensuse"
                 # fallback on 15.3 if ID is not opensuse but suse-like

diff --git a/docker/build-docker-release.sh b/docker/build-docker-release.sh
@@ -98,7 +98,7 @@ reset-last
 
 : ${USER:=$(whoami)}
 : ${DISTRO:=ubuntu}
-: ${VERSIONS:=20.04 18.04}
+: ${VERSIONS:=22.04 20.04}
 : ${ROCM_VERSIONS:=5.0 4.5 4.3}
 : ${MPI:=0}
 : ${PYTHON_VERSIONS:="6 7 8 9 10 11 12"}

diff --git a/external/dyninst b/external/dyninst
diff --git a/external/timemory b/external/timemory