Skip to content

Commit

Permalink
Merge pull request #133 from NWChemEx/with_clang
Browse files Browse the repository at this point in the history
Test with Clang-14
  • Loading branch information
jwaldrop107 authored Apr 29, 2024
2 parents d7fa850 + eea13cd commit dbefd4f
Show file tree
Hide file tree
Showing 12 changed files with 33 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ jobs:
with:
config_file: '.github/.licenserc.yaml'
source_dir: 'include src tests'
compilers: '["gcc-11", "clang-11"]'
compilers: '["gcc-11", "clang-14"]'
doc_target: 'parallelzone_cxx_api'
secrets: inherit
4 changes: 2 additions & 2 deletions docs/source/quickstart.rst
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ the current process. As an example:

.. literalinclude:: ../../tests/python/doc_snippets/test_quickstart.py
:language: python
:lines: 24-34
:lines: 27-37
:dedent: 8

The ``RuntimeView`` also allows you to access other ``ResourceSet`` instances.
Expand Down Expand Up @@ -94,7 +94,7 @@ environment. Say we wanted to know how much total RAM each resource set has:

.. literalinclude:: ../../tests/python/doc_snippets/test_quickstart.py
:language: python
:lines: 36-37
:lines: 39-40
:dedent: 8

To summarize:
Expand Down
4 changes: 1 addition & 3 deletions tests/python/doc_snippets/test_doc_snippets.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
import sys
import unittest



if __name__ == '__main__':
# Make a RuntimeView and hold it until all tests run so MPI isn't shut
# down
Expand All @@ -28,7 +26,7 @@
my_dir = os.path.dirname(os.path.realpath(__file__))
print(my_dir)
loader = unittest.TestLoader()
tests = loader.discover(my_dir)
tests = loader.discover(my_dir)
testrunner = unittest.runner.TextTestRunner()
ret = not testrunner.run(tests).wasSuccessful()
sys.exit(ret)
3 changes: 3 additions & 0 deletions tests/python/doc_snippets/test_quickstart.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,13 @@
import parallelzone as pz
import unittest


def get_runtime():
return pz.runtime.RuntimeView()


class TestQuickstartTestCase(unittest.TestCase):

def test_quickstart(self):
# 99.9% of the time you will be using an existing RuntimeView
rt = get_runtime()
Expand Down
2 changes: 2 additions & 0 deletions tests/python/doc_snippets/test_ram.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
import parallelzone as pz
import unittest


class TestRAMTestCase(unittest.TestCase):

def test_ram(self):
rv = pz.runtime.RuntimeView()

Expand Down
2 changes: 2 additions & 0 deletions tests/python/doc_snippets/test_resource_set.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
import parallelzone as pz
import unittest


class TestResourceSetTestCase(unittest.TestCase):

def test_resourceset(self):
rv = pz.runtime.RuntimeView()

Expand Down
2 changes: 2 additions & 0 deletions tests/python/doc_snippets/test_runtime_view.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
import parallelzone as pz
import unittest


class TestRuntimeViewTestCase(unittest.TestCase):

def test_runtimeview(self):
rv = pz.runtime.RuntimeView()
result = [0, 1, 2]
Expand Down
6 changes: 4 additions & 2 deletions tests/python/unit_tests/hardware/test_ram.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
import parallelzone as pz
import unittest


class RAMTestCase(unittest.TestCase):

def setUp(self):
"""
For unit testing purposes we "create" two RAM instances:
Expand All @@ -26,8 +28,8 @@ def setUp(self):
"""

self.defaulted = pz.hardware.RAM()
self.rv = pz.runtime.RuntimeView()
self.rs = self.rv.my_resource_set()
self.rv = pz.runtime.RuntimeView()
self.rs = self.rv.my_resource_set()
self.has_value = self.rs.ram()

def test_default_ctor(self):
Expand Down
7 changes: 4 additions & 3 deletions tests/python/unit_tests/runtime/test_resource_set.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
import parallelzone as pz
import unittest


class ResourceSetTestCase(unittest.TestCase):

def test_default_ctor(self):
self.assertTrue(self.defaulted.empty())
self.assertFalse(self.defaulted.is_mine())
Expand Down Expand Up @@ -57,7 +59,6 @@ def test_ram(self):
self.assertEqual(my_ram, default_ram)
self.assertNotEqual(self.rs.ram(), default_ram)


def test_logger(self):
"""
Default-initialized instances have no logger object, so we check that
Expand Down Expand Up @@ -90,5 +91,5 @@ def test_comparisons(self):

def setUp(self):
self.defaulted = pz.runtime.ResourceSet()
self.rv = pz.runtime.RuntimeView()
self.rs = self.rv.my_resource_set()
self.rv = pz.runtime.RuntimeView()
self.rs = self.rv.my_resource_set()
10 changes: 5 additions & 5 deletions tests/python/unit_tests/runtime/test_runtime_view.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
import parallelzone as pz
import unittest


class RuntimeViewTestCase(unittest.TestCase):

def test_default_ctor(self):
self.assertGreater(self.defaulted.size(), 0)
self.assertFalse(self.defaulted.did_i_start_mpi())
Expand Down Expand Up @@ -47,7 +49,6 @@ def test_at(self):
self.assertEqual(rs0, default_rs)
self.assertNotEqual(self.defaulted.at(0), default_rs)


def test_has_me(self):
self.assertTrue(self.defaulted.has_me())

Expand All @@ -67,10 +68,9 @@ def test_my_resource_set(self):
self.assertEqual(my_rs, default_rs)
self.assertNotEqual(self.defaulted.my_resource_set(), default_rs)


def test_count_ram(self):
default_ram = pz.hardware.RAM()
ram = self.defaulted.my_resource_set().ram()
ram = self.defaulted.my_resource_set().ram()

self.assertEqual(self.defaulted.count(default_ram), 0)
self.assertEqual(self.defaulted.count(ram), 1)
Expand All @@ -81,10 +81,10 @@ def test_logger(self):

def test_stack_callback_1(self):
is_running = [True]

def turn_off(val=is_running):
val[0] = False

falls_off = pz.runtime.RuntimeView()
falls_off.stack_callback(turn_off)
del falls_off
Expand Down
10 changes: 6 additions & 4 deletions tests/python/unit_tests/test_logging/test_logger.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import parallelzone as pz
import unittest


class LoggerTestCase(unittest.TestCase):
"""
Testing the logger from Python is difficult because we have not
Expand All @@ -30,9 +31,11 @@ def setUp(self):
severity = pz.Logger.severity

self.defaulted = pz.Logger()
self.log = pz.runtime.RuntimeView().logger()
self.severities = [severity.trace, severity.debug, severity.info,
severity.warn, severity.error, severity.critical]
self.log = pz.runtime.RuntimeView().logger()
self.severities = [
severity.trace, severity.debug, severity.info, severity.warn,
severity.error, severity.critical
]

def test_set_severity(self):
self.defaulted.set_severity(pz.Logger.severity.debug)
Expand Down Expand Up @@ -97,7 +100,6 @@ def test_log1(self):
self.defaulted.log("Hello").log("World!")
self.log.log("Hello").log("World!")


def test_log2(self):
"""
This method tests the overload of the Logger class which takes the
Expand Down
4 changes: 1 addition & 3 deletions tests/python/unit_tests/test_parallelzone.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
import sys
import unittest



if __name__ == '__main__':
# Make a RuntimeView and hold it until all tests run so MPI isn't shut
# down
Expand All @@ -29,7 +27,7 @@
my_dir = os.path.dirname(os.path.realpath(__file__))

loader = unittest.TestLoader()
tests = loader.discover(my_dir)
tests = loader.discover(my_dir)
testrunner = unittest.runner.TextTestRunner()
ret = not testrunner.run(tests).wasSuccessful()
sys.exit(ret)

0 comments on commit dbefd4f

Please sign in to comment.