diff --git a/examples/core-scanner.py b/examples/core-scanner.py index e34006a..74c07d2 100644 --- a/examples/core-scanner.py +++ b/examples/core-scanner.py @@ -12,8 +12,8 @@ client = CouchDB(url=picasconfig.PICAS_HOST_URL, db=picasconfig.PICAS_DATABASE, username=picasconfig.PICAS_USERNAME, password=picasconfig.PICAS_PASSWORD) -design_doc_1c = "MonitorSingleCore" -design_doc_4c = "MonitorMultiCore" +design_doc_1c = "SingleCore" +design_doc_4c = "MultiCore" work_1c_avail = client.is_view_nonempty("todo", design_doc=design_doc_1c) work_4c_avail = client.is_view_nonempty("todo", design_doc=design_doc_4c) diff --git a/examples/createViews.py b/examples/createViews.py index 3d5616b..fdf6d19 100644 --- a/examples/createViews.py +++ b/examples/createViews.py @@ -91,5 +91,5 @@ def get_db(): db = get_db() # Create the Views in database createViews(db) - createViews(db, design_doc_name='MonitorSingleCore', logic_appendix=' && doc.cores == 1') - createViews(db, design_doc_name='MonitorMultiCore', logic_appendix=' && doc.cores == 4') + createViews(db, design_doc_name='SingleCore', logic_appendix=' && doc.cores == 1') + createViews(db, design_doc_name='MultiCore', logic_appendix=' && doc.cores == 4') diff --git a/examples/local_example.py b/examples/local_example.py index 0353629..8a70b9b 100755 --- a/examples/local_example.py +++ b/examples/local_example.py @@ -16,6 +16,7 @@ import os import time import couchdb +import picasconfig from picas.actors import RunActor from picas.clients import CouchDB @@ -24,7 +25,6 @@ from picas.iterators import EndlessViewIterator from picas.modifiers import BasicTokenModifier from picas.util import Timer -from . import picasconfig log = logging.getLogger(__name__) @@ -87,7 +87,7 @@ def arg_parser(): parser = argparse.ArgumentParser(description="Arguments used in the different classes in the example.") parser.add_argument("-d", "--design_doc", default="Monitor", type=str, help="Select the designdoc used by the actor class") parser.add_argument("-V", "--view", default="todo", type=str, help="Select the view used by the actor class") - parser.add_argument("-v", "--verbose", action="store_true", type=bool, help="Set verbose") # add v for optional verbosity in the future + parser.add_argument("-v", "--verbose", action="store_true", help="Set verbose") # add v for optional verbosity in the future return parser.parse_args() diff --git a/examples/multi-core-job.sh b/examples/multi-core-job.sh index a3fb48d..109c2a3 100644 --- a/examples/multi-core-job.sh +++ b/examples/multi-core-job.sh @@ -2,4 +2,4 @@ #SBATCH -c 4 -python local_example.py -d MonitorMultiCore +python local_example.py -d MultiCore diff --git a/examples/single-core-job.sh b/examples/single-core-job.sh index 9fc915f..761bacf 100644 --- a/examples/single-core-job.sh +++ b/examples/single-core-job.sh @@ -2,4 +2,4 @@ #SBATCH -c 1 -python local_example.py -d MonitorSingleCore +python local_example.py -d SingleCore