diff --git a/src/interface/python/instrumentation.cpp b/src/interface/python/instrumentation.cpp index 27a3d721..ecfdc64a 100644 --- a/src/interface/python/instrumentation.cpp +++ b/src/interface/python/instrumentation.cpp @@ -1,5 +1,5 @@ #include "instrumentation.h" -#include "variant.h" + #include namespace cali { diff --git a/src/interface/python/pycaliper/__init__.py b/src/interface/python/pycaliper/__init__.py index 63bf6f5f..2a4ed0a8 100644 --- a/src/interface/python/pycaliper/__init__.py +++ b/src/interface/python/pycaliper/__init__.py @@ -11,6 +11,5 @@ import pycaliper.instrumentation import pycaliper.loop import pycaliper.types -import pycaliper.variant from pycaliper.high_level import annotate_function diff --git a/test/ci_app_tests/ci_test_py_ann.py b/test/ci_app_tests/ci_test_py_ann.py index c92ee433..4cbe27ad 100644 --- a/test/ci_app_tests/ci_test_py_ann.py +++ b/test/ci_app_tests/ci_test_py_ann.py @@ -12,8 +12,7 @@ set_byname, end_byname, ) -from pycaliper.types import CALI_TYPE_INT, CALI_ATTR_ASVALUE, CALI_TYPE_STRING, CALI_ATTR_UNALIGNED -from pycaliper.variant import Variant +from pycaliper.types import CALI_TYPE_INT, CALI_ATTR_ASVALUE from pycaliper.config_manager import ConfigManager @@ -45,23 +44,6 @@ def main(): end_byname("phase") - begin_byname("ci_test_c_ann.meta-attr") - - meta_attr = Attribute("meta-attr", CALI_TYPE_INT) - meta_val = Variant(47) - - test_attr = Attribute( - "test-attr-with-metadata", - CALI_TYPE_STRING, - CALI_ATTR_UNALIGNED, - [meta_attr], - [meta_val], - ) - - test_attr.set("abracadabra") - - end_byname("ci_test_c_ann.meta-attr") - begin_byname("ci_test_c_ann.setbyname") set_byname("attr.int", 20) diff --git a/test/ci_app_tests/test_python_api.py b/test/ci_app_tests/test_python_api.py index bbc59811..b28da0b9 100644 --- a/test/ci_app_tests/test_python_api.py +++ b/test/ci_app_tests/test_python_api.py @@ -52,11 +52,6 @@ def test_py_ann_trace(self): snapshots, {"attr.int": "20", "attr.str": "fidibus"} ) ) - self.assertTrue( - cat.has_snapshot_with_attributes( - snapshots, {"test-attr-with-metadata": "abracadabra"} - ) - ) def test_py_ann_globals(self): target_cmd = [sys.executable, "./ci_test_py_ann.py"] @@ -96,42 +91,6 @@ def test_py_ann_globals(self): ) ) - def test_py_ann_metadata(self): - target_cmd = [sys.executable, "./ci_test_py_ann.py"] - query_cmd = [ - "../../src/tools/cali-query/cali-query", - "-e", - "--list-attributes", - "--print-attributes", - "cali.attribute.name,cali.attribute.type,meta-attr", - ] - - caliper_config = { - "CALI_CONFIG_PROFILE": "serial-trace", - "CALI_RECORDER_FILENAME": "stdout", - "CALI_LOG_VERBOSITY": "0", - } - - query_output = cat.run_test_with_query(target_cmd, query_cmd, caliper_config) - snapshots = cat.get_snapshots_from_text(query_output) - - self.assertTrue( - cat.has_snapshot_with_attributes( - snapshots, - {"cali.attribute.name": "meta-attr", "cali.attribute.type": "int"}, - ) - ) - self.assertTrue( - cat.has_snapshot_with_attributes( - snapshots, - { - "cali.attribute.name": "test-attr-with-metadata", - "cali.attribute.type": "string", - "meta-attr": "47", - }, - ) - ) - if __name__ == "__main__": unittest.main()