Added support for OpenACC

packages/taucmdr/cf/software/libelf_installation.py

@@ -61,6 +61,7 @@ def __init__(self, sources, target_arch, target_os, compilers):
     def configure(self, flags):
         flags.extend(['--disable-debuginfod'])
         cc = None
+        # Libelf's configure script requires CC to be a GNU compiler, so we have to set the environment variable before running the configure script
         if 'CC' in os.environ :
             cc = os.environ['CC']
         os.environ['CC'] = GNU.installation()[CC].unwrap().info.command

packages/taucmdr/cf/software/scorep_installation.py

@@ -135,7 +135,7 @@ def _get_flags(self):
         flags = ['--enable-shared', '--without-otf2', '--without-opari2', '--without-cube',
                  '--without-gui', '--disable-gcc-plugin', '--disable-dependency-tracking']
         if self.target_arch in (X86_64, IBM64, PPC64, PPC64LE):
-            suites = {host.INTEL: 'intel', host.IBM: 'ibm', host.PGI: 'pgi', host.NVHPC: 'nvhpc', host.GNU: 'gcc'}
+            suites = {host.INTEL: 'intel', host.IBM: 'ibm', host.PGI: 'pgi', host.GNU: 'gcc'}
             suite = suites.get(self.compilers[host.CC].unwrap().info.family)
             flags.append('--with-nocross-compiler-suite' + ('='+suite if suite else ''))
         if self.use_mpi:

packages/taucmdr/cf/software/tau_installation.py

@@ -506,7 +506,7 @@ def check_env_compat(cls):
                                      "Unload the darshan module and try again.")
         if os.environ.get('PE_ENV', '').lower() == 'cray':
             raise ConfigurationError("TAU Commander cannot be used with Cray compilers. ",
-                                     "Replace PrgEnv-cray with PrgEnv-intel, PrgEnv-gnu, PrgEnv-nvhpc, or PrgEnv-pgi and try again.")
+                                     "Replace PrgEnv-cray with PrgEnv-intel, PrgEnv-gnu, PrgEnv-nvidia, or PrgEnv-pgi and try again.")
 
     def uid_items(self):
         uid_parts = [self.target_arch.name, self.target_os.name]

packages/taucmdr/cli/commands/trial/tests/test_create.py

@@ -33,7 +33,7 @@
 import tempfile
 from taucmdr import tests
 from taucmdr.cf.platforms import HOST_ARCH, HOST_OS, DARWIN
-from taucmdr.cf.compiler.host import CC
+from taucmdr.cf.compiler.host import CC, NVHPC
 from taucmdr.cli.commands.select import COMMAND as select_cmd
 from taucmdr.cli.commands.trial.list import COMMAND as trial_list_cmd
 from taucmdr.cli.commands.trial.create import COMMAND as trial_create_cmd
@@ -92,7 +92,8 @@ def test_heap_usage_memory_alloc_sample(self):
         self.assertIn("Selected experiment 'targ1-app1-sample'", stdout)
         self.assertFalse(stderr)
         ccflags = ['-g']
-        if (not util.which('nvc')) :
+        # The NVHPC compilers do not accept the -no-pie option
+        if (not (util.which('nvc') and self.assertCompiler(CC) == util.which('nvc'))) :
             ccflags.append('-no-pie')
         self.assertManagedBuild(0, CC, ccflags, 'matmult.c')
         stdout, stderr = self.assertCommandReturnValue(0, trial_create_cmd, ['./a.out'])
@@ -280,4 +281,4 @@ def test_run_openacc(self):
         self.assertManagedBuild(0, CC, ['-acc', '-g', '-o', 'jacobi'], 'jacobi.c')
         stdout, stderr = self.assertCommandReturnValue(0, trial_create_cmd, [os.path.join(test_dir, 'jacobi')])
         self.assertIn('Trial 0 produced 2 profile files', stdout)
-        self.assertFalse(stderr)
+        self.assertFalse(stderr)

packages/taucmdr/cli/commands/trial/tests/test_export.py

@@ -54,7 +54,7 @@ def test_export_tau_profile(self):
         export_file = expr['name'] + '.trial0.ppk'
         self.assertTrue(os.path.exists(export_file))
 
-    @tests.skipIf(util.which('nvc'), "NVHPC compilers do not work with sqlite")
+    @tests.skipIf(util.which('nvc'), "NVHPC compilers do not work with sqlite (due to a compiler bug in NVHPC)")
     def test_export_sqlite_profile(self):
         self.reset_project_storage(['--profile', 'sqlite', '--trace', 'none'])
         util.mkdirp(os.getcwd())
@@ -82,7 +82,7 @@ def test_export_merged_profile(self):
         self.assertTrue(os.path.exists(export_file))
 
     @tests.skipUnlessHaveCompiler(MPI_CC)
-    @tests.skipIf(util.which('nvc'), "This test cannot be run with NVHPC compilers")
+    @tests.skipIf(util.which('nvc'), "This test cannot be run with NVHPC compilers (ScoreP cannot be configured with NVHPC compilers)")
     def test_export_cubex(self):
         self.reset_project_storage(['--mpi', '--profile', 'cubex', '--trace', 'none'])
         expr = Project.selected().experiment()

packages/taucmdr/model/target.py

@@ -660,6 +660,7 @@ def compilers(self):
             InstalledCompilerSet: Collection of installed compilers used by this target.
         """
         if not self._compilers:
+            # We use the paths to the compilers as unique identifiers since the EIDs for the records may come from different tables, and so may not be unique
             paths = []
             compilers = {}
             for role in Knowledgebase.all_roles():

packages/taucmdr/tests/__init__.py

@@ -201,7 +201,6 @@ def reset_project_storage(self, init_args=None):
             prefix = PROJECT_STORAGE.prefix
         except StorageError:
             pass
-
         PROJECT_STORAGE.destroy(ignore_errors=False)
         try:
             prefix = PROJECT_STORAGE.prefix