Merge pull request #154 from AndreasGocht/master

Finalise Score-P 8.0 Support

Author: AndreasGocht

.github/workflows/publish.yml

@@ -12,17 +12,17 @@ jobs:
 
 
     - name: Set up Python 3.8
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v4
       with:
         python-version: 3.8
     - name: Check Version
       run: test ${{ github.event.release.tag_name }} = `python -c "import scorep._version; print('v'+scorep._version.__version__)"`
-    
+
     - name: Add Score-P repo
       run: sudo add-apt-repository ppa:andreasgocht/scorep
 
     - name: Install Score-P      
-      run: sudo apt install scorep
+      run: sudo apt-get -y install scorep
 
     - name: Setup environment
       run: echo "$HOME/scorep/bin" >> $GITHUB_PATH

.github/workflows/static_analysis.yml

@@ -3,7 +3,7 @@ on: [push, pull_request]
 
 jobs:
   Cpp:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v2
     - name: Formatting
@@ -13,10 +13,10 @@ jobs:
         clangFormatVersion: 9
 
   Python:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2
+    - uses: actions/setup-python@v4
       with:
         python-version: 3.8
     - name: Install Python packages

.github/workflows/unit_tests.yml

@@ -3,18 +3,20 @@ on: [push, pull_request, workflow_dispatch]
 
 env:
   SCOREP_TIMER: clock_gettime # tsc causes warnings
+  RDMAV_FORK_SAFE: 
+  IBV_FORK_SAFE: 
 
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", 'pypy-2.7', 'pypy-3.6', 'pypy-3.7', 'pypy-3.8']
+        python: ["2.7", "3.7", "3.8", "3.9", "3.10", "3.11", 'pypy-2.7', 'pypy-3.6', 'pypy-3.7', 'pypy-3.8']
       fail-fast: false
 
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/cache@v1
+    - uses: actions/cache@v3
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip
@@ -23,12 +25,12 @@ jobs:
       run: sudo add-apt-repository ppa:andreasgocht/scorep
 
     - name: Install Score-P      
-      run: sudo apt install scorep
+      run: sudo apt-get -y install scorep
 
     - name: Setup environment
       run: echo "$HOME/scorep/bin" >> $GITHUB_PATH
     - name: set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{matrix.python}}
         architecture: x64

test/test_scorep.py

@@ -265,7 +265,7 @@ def test_mpi(scorep_env, instrumenter):
         env=scorep_env,
     )
 
-    assert re.search(r"\[Score-P\] [\w/.: ]*MPI_THREAD_FUNNELED", std_err)
+    assert re.search(r"\[Score-P\] [\w/.: ]*MPI_THREAD_\(SERIALIZED\|MULTIPLE\) ", std_err)
     assert "[00] [0. 1. 2. 3. 4.]\n" in std_out
     assert "[01] [0. 1. 2. 3. 4.]\n" in std_out
     assert "bar\n" in std_out