From f817d3347bb4b385754141a50029ebf8e03a9912 Mon Sep 17 00:00:00 2001 From: abdul124 Date: Fri, 17 Jan 2025 17:56:43 +0800 Subject: [PATCH] [artiq] cleanup module functionality tests --- nac3artiq/demo/module.py | 26 ++++++++++++++++++++++++ nac3artiq/demo/module_support.py | 17 +++++++--------- nac3artiq/demo/tests/global_variables.py | 14 ------------- 3 files changed, 33 insertions(+), 24 deletions(-) create mode 100644 nac3artiq/demo/module.py delete mode 100644 nac3artiq/demo/tests/global_variables.py diff --git a/nac3artiq/demo/module.py b/nac3artiq/demo/module.py new file mode 100644 index 00000000..58f92450 --- /dev/null +++ b/nac3artiq/demo/module.py @@ -0,0 +1,26 @@ +from min_artiq import * +from numpy import int32 + +# Global Variable Definition +X: Kernel[int32] = 1 + +# TopLevelFunction Defintion +@kernel +def display_X(): + print_int32(X) + +# TopLevel Class Definition +@nac3 +class A: + @kernel + def __init__(self): + self.set_x(1) + + @kernel + def set_x(self, new_val: int32): + global X + X = new_val + + @kernel + def get_X(self) -> int32: + return X diff --git a/nac3artiq/demo/module_support.py b/nac3artiq/demo/module_support.py index a863b380..78ef6565 100644 --- a/nac3artiq/demo/module_support.py +++ b/nac3artiq/demo/module_support.py @@ -1,7 +1,5 @@ from min_artiq import * -import tests.string_attribute_issue337 as issue337 -import tests.support_class_attr_issue102 as issue102 -import tests.global_variables as global_variables +import module as module_definition @nac3 class TestModuleSupport: @@ -13,17 +11,16 @@ class TestModuleSupport: @kernel def run(self): # Accessing classes - issue337.Demo().run() - obj = issue102.Demo() - obj.attr3 = 3 + obj = module_definition.A() + obj.get_X() + obj.set_x(2) # Calling functions - global_variables.inc_X() - global_variables.display_X() + module_definition.display_X() # Updating global variables - global_variables.X = 9 - global_variables.display_X() + module_definition.X = 9 + module_definition.display_X() if __name__ == "__main__": TestModuleSupport().run() \ No newline at end of file diff --git a/nac3artiq/demo/tests/global_variables.py b/nac3artiq/demo/tests/global_variables.py deleted file mode 100644 index ac0e0cf0..00000000 --- a/nac3artiq/demo/tests/global_variables.py +++ /dev/null @@ -1,14 +0,0 @@ -from min_artiq import * -from numpy import int32 - -X: Kernel[int32] = 1 - -@rpc -def display_X(): - print_int32(X) - -@kernel -def inc_X(): - global X - X += 1 -