Use a decorator to register chares (#231)

Author: adityapb

charm4py/__init__.py

@@ -22,7 +22,7 @@
         pass
 
 if os.environ.get('CHARM_NOLOAD', '0') == '0':
-    from .charm import charm, readonlies, Options
+    from .charm import register, charm, readonlies, Options
     Reducer = charm.reducers
     Future = charm.createFuture
 

charm4py/charm.py

@@ -41,6 +41,16 @@ def SECTION_ALL(obj):
     return 0
 
 
+def register(C):
+    if ArrayMap in C.mro():
+        charm.register(C, (GROUP,))  # register ArrayMap only as Group
+    elif Chare in C.mro():
+        charm.register(C)
+    else:
+        raise Charm4PyError("Class " + str(C) + " is not a Chare (can't register)")
+    return C
+
+
 class Options(object):
 
     def __str__(self):
@@ -477,6 +487,7 @@ def registerMainModule(self):
             self.registerInCharm(C)
 
     def registerAs(self, C, charm_type_id):
+        from .sections import SectionManager
         if charm_type_id == MAINCHARE:
             assert not self.mainchareRegistered, 'More than one entry point has been specified'
             self.mainchareRegistered = True

examples/multi-module/goodbye.py

@@ -1,9 +1,10 @@
-from charm4py import charm, Chare
+from charm4py import register, charm, Chare
 
 # this will be set by Main chare
 mainProxy = None
 
 
+@register
 class Goodbye(Chare):
 
     def SayGoodbye(self):

examples/multi-module/hello.py

@@ -1,10 +1,11 @@
-from charm4py import charm, Chare
+from charm4py import register, charm, Chare
 import time
 
 # this will be set by Main chare
 bye_chares = None
 
 
+@register
 class Hello(Chare):
 
     def SayHi(self):

examples/multi-module/main.py

@@ -27,4 +27,4 @@ def done(self):
 # Start a main chare of type Main. We specify to the charm runtime which
 # modules contain Chare definitions. Note that the __main__ module is always
 # searched for chare definitions, so we don't have to specify it
-charm.start(Main, modules=['hello', 'goodbye'])
+charm.start(Main)