diff --git a/Control/PerformanceMonitoring/PerfMonAna/CMakeLists.txt b/Control/PerformanceMonitoring/PerfMonAna/CMakeLists.txt
index 4427629d39627b13bd5dc75965d1dcb2d3b569b3..cd6c384f07969c5793da4d1b121d6b5b597a7197 100644
--- a/Control/PerformanceMonitoring/PerfMonAna/CMakeLists.txt
+++ b/Control/PerformanceMonitoring/PerfMonAna/CMakeLists.txt
@@ -1,14 +1,8 @@
-################################################################################
-# Package: PerfMonAna
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( PerfMonAna )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/PerformanceMonitoring/PerfMonEvent )
-
# External dependencies:
find_package( pandas )
find_package( sqlalchemy )
diff --git a/Control/PerformanceMonitoring/PerfMonComps/CMakeLists.txt b/Control/PerformanceMonitoring/PerfMonComps/CMakeLists.txt
index 7799e4af239c5eb738bef1d67585836a8f242ed0..c553528b686e5a1f1564dbc26be0474fb6468932 100644
--- a/Control/PerformanceMonitoring/PerfMonComps/CMakeLists.txt
+++ b/Control/PerformanceMonitoring/PerfMonComps/CMakeLists.txt
@@ -1,24 +1,8 @@
-################################################################################
-# Package: PerfMonComps
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( PerfMonComps )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PRIVATE
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/RootUtils
- Control/CxxUtils
- Control/PerformanceMonitoring/PerfMonEvent
- Control/PerformanceMonitoring/PerfMonKernel
- Control/SGTools
- Control/StoreGate
- GaudiKernel
- Tools/PyUtils )
-
# External dependencies:
find_package( AIDA )
find_package( Boost )
diff --git a/Control/PerformanceMonitoring/PerfMonEvent/CMakeLists.txt b/Control/PerformanceMonitoring/PerfMonEvent/CMakeLists.txt
index 303cad9ae74956016a5f374ef10061676d47b886..b8b87a5a403e069c7fad82484258ca9006814de9 100644
--- a/Control/PerformanceMonitoring/PerfMonEvent/CMakeLists.txt
+++ b/Control/PerformanceMonitoring/PerfMonEvent/CMakeLists.txt
@@ -1,14 +1,8 @@
-################################################################################
-# Package: PerfMonEvent
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( PerfMonEvent )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- GaudiKernel )
-
# External dependencies:
find_package( Python COMPONENTS Development )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
diff --git a/Control/PerformanceMonitoring/PerfMonGPerfTools/CMakeLists.txt b/Control/PerformanceMonitoring/PerfMonGPerfTools/CMakeLists.txt
index 19e20715ccaf15bdfb113be6970d8d9553ac62fa..80172bc979b80455a623759c4e9177b3c81233e6 100644
--- a/Control/PerformanceMonitoring/PerfMonGPerfTools/CMakeLists.txt
+++ b/Control/PerformanceMonitoring/PerfMonGPerfTools/CMakeLists.txt
@@ -1,17 +1,8 @@
-################################################################################
-# Package: PerfMonGPerfTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( PerfMonGPerfTools )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- GaudiKernel
- PRIVATE
- Control/AthenaBaseComps
- Control/AthenaKernel )
-
# External dependencies:
find_package( gperftools COMPONENTS profiler )
@@ -29,8 +20,7 @@ atlas_add_component( PerfMonGPerfTools
LINK_LIBRARIES ${GPERFTOOLS_LIBRARIES} GaudiKernel AthenaBaseComps AthenaKernel )
# Install files from the package:
-atlas_install_headers( PerfMonGPerfTools )
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
atlas_install_scripts( scripts/*.py scripts/gathena )
diff --git a/Control/PerformanceMonitoring/PerfMonKernel/CMakeLists.txt b/Control/PerformanceMonitoring/PerfMonKernel/CMakeLists.txt
index e3068845381a3298f44297bad54d9aafbb272e55..9e25e2831531903de0e1107f1b7abd23fa18e69f 100644
--- a/Control/PerformanceMonitoring/PerfMonKernel/CMakeLists.txt
+++ b/Control/PerformanceMonitoring/PerfMonKernel/CMakeLists.txt
@@ -1,16 +1,10 @@
-################################################################################
-# Package: PerfMonKernel
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( PerfMonKernel )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- GaudiKernel )
-
# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
+find_package( Boost )
# Component(s) in the package:
atlas_add_library( PerfMonKernel
diff --git a/Control/PerformanceMonitoring/PerfMonTests/CMakeLists.txt b/Control/PerformanceMonitoring/PerfMonTests/CMakeLists.txt
index e7231f868e1a5f23eaaa9f8c068cf32c8149db73..024fa60ea6359a8d89763856e5e7be48f707dac0 100644
--- a/Control/PerformanceMonitoring/PerfMonTests/CMakeLists.txt
+++ b/Control/PerformanceMonitoring/PerfMonTests/CMakeLists.txt
@@ -1,23 +1,8 @@
-################################################################################
-# Package: PerfMonTests
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( PerfMonTests )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/AthAllocators
- Control/AthContainers
- Control/PerformanceMonitoring/PerfMonComps
- Control/PerformanceMonitoring/PerfMonKernel
- Control/StoreGate
- GaudiKernel
- PhysicsAnalysis/TruthParticleID/McParticleTests
- Reconstruction/Jet/JetRec )
-
# External dependencies:
find_package( CLHEP )
@@ -26,43 +11,37 @@ atlas_add_component( PerfMonTests
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel AthAllocators AthContainers PerfMonKernel StoreGateLib SGtests GaudiKernel )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel AthAllocators AthContainers PerfMonKernel GaudiKernel )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py share/tests/*.py )
-
atlas_add_test( NoopAlg
SCRIPT test/NoopAlg.sh
PROPERTIES TIMEOUT 600
LOG_IGNORE_PATTERN "running" )
-
atlas_add_test( NoopAlg_WriteDataHdr
SCRIPT test/NoopAlg_WriteDataHdr.sh
PROPERTIES TIMEOUT 600
LOG_IGNORE_PATTERN "running" )
-
atlas_add_test( NoopAlg_WriteEvtInfo
SCRIPT test/NoopAlg_WriteEvtInfo.sh
PROPERTIES TIMEOUT 600
LOG_IGNORE_PATTERN "running" )
-
atlas_add_test( LeakyAlg
SCRIPT test/LeakyAlg.sh
PROPERTIES TIMEOUT 600
LOG_IGNORE_PATTERN "running" )
-
atlas_add_test( BasicAlg
SCRIPT test/BasicAlg.sh
PROPERTIES TIMEOUT 600
LOG_IGNORE_PATTERN "running" )
-
atlas_add_test( BaseLine
SCRIPT test/BaseLine.sh
PROPERTIES TIMEOUT 600
diff --git a/Control/PerformanceMonitoring/PerfMonTests/python/IoTestsLib.py b/Control/PerformanceMonitoring/PerfMonTests/python/IoTestsLib.py
index d08ffc5d9dc03a58937ed776cfa29778386e24d1..35865b6066f91c8ce71de4252d9b82b805f39a9e 100644
--- a/Control/PerformanceMonitoring/PerfMonTests/python/IoTestsLib.py
+++ b/Control/PerformanceMonitoring/PerfMonTests/python/IoTestsLib.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
## @file PerfMonTests.IoTestsLib
## @date April 2009
@@ -12,6 +12,7 @@ a set of simple minded functions to test ROOT I/O (from python)
"""
from array import array as carray
+from builtins import range
import random
# set some dummy seed, for reproducibility
@@ -62,7 +63,7 @@ def comp_delta(d, verbose=False):
def import_ROOT():
import sys
# for ROOT...
- if not '-b' in sys.argv:
+ if '-b' not in sys.argv:
sys.argv.insert(1, '-b')
import ROOT
return ROOT
@@ -85,8 +86,8 @@ def io_test1_write(fname, nevts=1000, sz=1000, dtype='i'):
from random import randint
fill = t.Fill
- for i in xrange(nevts):
- for j in xrange(sz):
+ for i in range(nevts):
+ for j in range(sz):
data[j] = randint(0, sz)
fill()
@@ -106,7 +107,7 @@ def io_test1_read(fname, verbose=False):
tot_bytes = 0
get_entry = t.GetEntry
start = pymon()
- for ievt in xrange(nevts):
+ for ievt in range(nevts):
# copy next entry into memory and verify
nb = get_entry(ievt)
if nb <= 0:
@@ -144,10 +145,10 @@ def io_test2_write(fname, nevts=1000, sz=1000, dtype='i'):
from random import randint
fill = t.Fill
- for i in xrange(nevts):
+ for i in range(nevts):
jmax = randint(1, sz)
n[0] = jmax
- for j in xrange(jmax):
+ for j in range(jmax):
data[j] = randint(0, sz)
fill()
@@ -167,7 +168,7 @@ def io_test2_read(fname, verbose=False):
tot_bytes = 0
get_entry = t.GetEntry
start = pymon()
- for ievt in xrange(nevts):
+ for ievt in range(nevts):
# copy next entry into memory and verify
nb = get_entry(ievt)
if nb <= 0:
@@ -206,7 +207,7 @@ if __name__ == "__main__":
nevts=100000, sz=1000,
dtype='i')
mon_data['io_test1-ints'] = []
- for _ in xrange(nreads):
+ for _ in range(nreads):
mon_data['io_test1-ints'].append(comp_delta(io_test1_read(fname=fname)))
# io_test1 - floats
@@ -215,7 +216,7 @@ if __name__ == "__main__":
nevts=100000, sz=1000,
dtype='f')
mon_data['io_test1-flts'] = []
- for _ in xrange(nreads):
+ for _ in range(nreads):
mon_data['io_test1-flts'].append(comp_delta(io_test1_read(fname=fname)))
# -----
@@ -228,7 +229,7 @@ if __name__ == "__main__":
nevts=100000, sz=1000,
dtype='i')
mon_data['io_test2-ints'] = []
- for _ in xrange(nreads):
+ for _ in range(nreads):
mon_data['io_test2-ints'].append(comp_delta(io_test2_read(fname=fname)))
# io_test2 - floats
@@ -237,7 +238,7 @@ if __name__ == "__main__":
nevts=100000, sz=1000,
dtype='f')
mon_data['io_test2-flts'] = []
- for _ in xrange(nreads):
+ for _ in range(nreads):
mon_data['io_test2-flts'].append(comp_delta(io_test2_read(fname=fname)))
diff --git a/Control/PerformanceMonitoring/PerfMonTests/python/tests.py b/Control/PerformanceMonitoring/PerfMonTests/python/tests.py
index a345c5ab6050539e8dabbd94119a67c837103843..fe292367180d1b7bcee82e9255efe7ccbf853000 100755
--- a/Control/PerformanceMonitoring/PerfMonTests/python/tests.py
+++ b/Control/PerformanceMonitoring/PerfMonTests/python/tests.py
@@ -1,14 +1,12 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
##
## A little py-module holding methods to ease the scheduling of PerfMonTests
## @author: Sebastien Binet
-## $Id: tests.py,v 1.5 2007-11-12 01:04:14 binet Exp $
from __future__ import print_function
import os
-import sys
from AthenaCommon import ChapPy
from future import standard_library
@@ -22,7 +20,6 @@ from TestTools.iobench import workDir
###-----------------------------------------------------
## Little helper to validate output of jobs
from TestTools.iobench import ScOutput
-from TestTools.iobench import BenchSequence
def testPerfMon( jobOptName = "PerfMonTests/test_perfMonSvc_noopalg.py",
perfMonFileName = "perfmon.noopalg.root",
diff --git a/Control/PerformanceMonitoring/PerfMonVTune/CMakeLists.txt b/Control/PerformanceMonitoring/PerfMonVTune/CMakeLists.txt
index fa0737f564b4e9922e7a3a1693cf4d34a0bd517e..51ae73f5f861936e0c7e2a7917ea2067ad9f859b 100644
--- a/Control/PerformanceMonitoring/PerfMonVTune/CMakeLists.txt
+++ b/Control/PerformanceMonitoring/PerfMonVTune/CMakeLists.txt
@@ -1,17 +1,8 @@
-################################################################################
-# Package: PerfMonVTune
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( PerfMonVTune )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- GaudiKernel
- PRIVATE
- Control/AthenaBaseComps
- Control/AthenaKernel )
-
####
# VTune hack for the time-being
find_program( VTUNE_EXECUTABLE amplxe-cl )
@@ -31,7 +22,6 @@ atlas_add_component( PerfMonVTune
LINK_LIBRARIES GaudiKernel AthenaBaseComps AthenaKernel ${ITT_LIBRARY} ${CMAKE_DL_LIBS} )
# Install files from the package:
-atlas_install_headers( PerfMonVTune )
atlas_install_python_modules( python/*.py )
atlas_install_joboptions( share/*.py )
atlas_install_scripts( scripts/*.py )