rename quisp_run -> crispr

zigen · Jan 8, 2022 · 820ecd0 · 820ecd0
1 parent da46a32
commit 820ecd0
Show file tree

Hide file tree

Showing 35 changed files with 78 additions and 78 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 .PHONY: format build all clean
 format:
-	poetry run black ./quisp_run/*.py ./quisp_run/**/*.py 
+	poetry run black ./crispr/*.py ./crispr/**/*.py 
 
 build:
 	poetry build
@@ -10,4 +10,4 @@ all:
 	pip install -e .
 
 clean:
-	rm -rf dist quisp_run/__pycache__ __pycache__
+	rm -rf dist crispr/__pycache__ __pycache__
diff --git a/quisp_run/__init__.py → crispr/__init__.py b/quisp_run/__init__.py → crispr/__init__.py
diff --git a/quisp_run/__main__.py → crispr/__main__.py b/quisp_run/__main__.py → crispr/__main__.py
@@ -1,4 +1,4 @@
-from quisp_run.main import main
+from crispr.main import main
 
 
 if __name__ == "__main__":

diff --git a/quisp_run/commands/__init__.py → crispr/commands/__init__.py b/quisp_run/commands/__init__.py → crispr/commands/__init__.py
diff --git a/quisp_run/commands/plan.py → crispr/commands/plan.py b/quisp_run/commands/plan.py → crispr/commands/plan.py
@@ -1,7 +1,7 @@
 import click
-from quisp_run import config
-from quisp_run.parameter_registry.registry import ParameterRegistry, init_registry
-from quisp_run.utils import console
+from crispr import config
+from crispr.parameter_registry.registry import ParameterRegistry, init_registry
+from crispr.utils import console
 from rich.prompt import Confirm
 
 

diff --git a/quisp_run/commands/resume.py → crispr/commands/resume.py b/quisp_run/commands/resume.py → crispr/commands/resume.py
@@ -1,8 +1,8 @@
 import click
 from rich.prompt import Confirm
-from quisp_run.state import State
-from quisp_run.utils import console
-from quisp_run.run import start_simulations
+from crispr.state import State
+from crispr.utils import console
+from crispr.run import start_simulations
 
 
 @click.command()

diff --git a/quisp_run/commands/run.py → crispr/commands/run.py b/quisp_run/commands/run.py → crispr/commands/run.py
@@ -1,9 +1,9 @@
 import os
 import click
 from git import Repo
-from quisp_run.run import start_simulations
-from quisp_run.utils import console, error_console, logger
-from quisp_run.state import State
+from crispr.run import start_simulations
+from crispr.utils import console, error_console, logger
+from crispr.state import State
 
 
 @click.command()
@@ -37,7 +37,7 @@ def run(ui, ned_path, quisp_root, pool_size, result_dir, simulation_plan_file_pa
             console.print("[green]Found previous state.")
             console.print(
                 "\n[green]if you want to resume the last simulation, "
-                "type[cyan] $ quisp_run resume \n"
+                "type[cyan] $ crispr resume \n"
                 "[green]or if you want to start a new simulation, "
                 "add [cyan]-f[green] or [cyan]--force[green] option."
             )

diff --git a/quisp_run/commands/status.py → crispr/commands/status.py b/quisp_run/commands/status.py → crispr/commands/status.py
@@ -1,7 +1,7 @@
 import click
 import os, pickle
-from quisp_run.state import State
-from quisp_run.utils import console
+from crispr.state import State
+from crispr.utils import console
 
 
 @click.command()

diff --git a/quisp_run/config/__init__.py → crispr/config/__init__.py b/quisp_run/config/__init__.py → crispr/config/__init__.py
diff --git a/quisp_run/config/parser.py → crispr/config/parser.py b/quisp_run/config/parser.py → crispr/config/parser.py
@@ -1,6 +1,6 @@
-from quisp_run.simulation import SimPlan
-from quisp_run.utils import console, error_console
-from quisp_run.parameter_registry import ParameterRegistry
+from crispr.simulation import SimPlan
+from crispr.utils import console, error_console
+from crispr.parameter_registry import ParameterRegistry
 
 
 def define_param(*args, **kwargs):

diff --git a/quisp_run/config/parser_test.py → crispr/config/parser_test.py b/quisp_run/config/parser_test.py → crispr/config/parser_test.py
@@ -1,5 +1,5 @@
-from quisp_run.config.parser import parse_config
-from quisp_run.parameter_registry import ParameterRegistry, init_registry
+from crispr.config.parser import parse_config
+from crispr.parameter_registry import ParameterRegistry, init_registry
 
 
 def test_empty_plan():

diff --git a/crispr/constants.py b/crispr/constants.py
@@ -0,0 +1,18 @@
+import os
+from rich.theme import Theme
+
+CRISPR_ROOT_DIR = os.path.dirname(os.path.abspath(os.path.dirname(__file__)))
+CRISPR_TEMPALTE_OMNETPP_INI = os.path.join(CRISPR_ROOT_DIR, "templates", "omnetpp.ini")
+CRISPR_TEMPALTE_IPYNB = os.path.join(CRISPR_ROOT_DIR, "templates", "analysis.ipynb")
+CRISPR_TEMPALTE_TOPOLOGY_DIR = os.path.join(CRISPR_ROOT_DIR, "templates", "topology")
+
+DEFAULT_RICH_CONSOLE_THEME = Theme(
+    {
+        "task_name": "magenta",
+        "sim_name": "blue",
+        "log": "green",
+        "status": "cyan",
+        "num_events": "green",
+        "ev_per_sec": "yellow",
+    }
+)
diff --git a/quisp_run/main.py → crispr/main.py b/quisp_run/main.py → crispr/main.py
@@ -4,9 +4,9 @@
 import click
 from typing import List
 
-from quisp_run import commands
+from crispr import commands
 import logging
-from quisp_run.utils import logger
+from crispr.utils import logger
 
 
 @click.group()

diff --git a/quisp_run/parameter_registry/__init__.py → crispr/parameter_registry/__init__.py b/quisp_run/parameter_registry/__init__.py → crispr/parameter_registry/__init__.py
diff --git a/quisp_run/parameter_registry/parameter.py → crispr/parameter_registry/parameter.py b/quisp_run/parameter_registry/parameter.py → crispr/parameter_registry/parameter.py
@@ -10,7 +10,7 @@
     get_args,
 )
 from dataclasses import dataclass
-from quisp_run.utils import error_console
+from crispr.utils import error_console
 
 
 class ParameterKind(Enum):

diff --git a/..._run/parameter_registry/parameter_test.py → crispr/parameter_registry/parameter_test.py b/..._run/parameter_registry/parameter_test.py → crispr/parameter_registry/parameter_test.py
diff --git a/quisp_run/parameter_registry/registry.py → crispr/parameter_registry/registry.py b/quisp_run/parameter_registry/registry.py → crispr/parameter_registry/registry.py
@@ -1,5 +1,5 @@
 from typing import List, Dict, Any
-from quisp_run.utils import error_console
+from crispr.utils import error_console
 from .parameter import Parameter, ParameterKind
 
 
@@ -117,7 +117,7 @@ def init_registry(registry: ParameterRegistry) -> ParameterRegistry:
             singular="config_ini_file",
             plural=None,
             kind=ParameterKind.BUILT_IN,
-            default_value="${QUISP_RUN_ROOT_DIR}/config/omnetpp.ini",
+            default_value="${CRISPR_ROOT_DIR}/config/omnetpp.ini",
             required=True,
         )
     )

diff --git a/...p_run/parameter_registry/registry_test.py → crispr/parameter_registry/registry_test.py b/...p_run/parameter_registry/registry_test.py → crispr/parameter_registry/registry_test.py
diff --git a/quisp_run/run.py → crispr/run.py b/quisp_run/run.py → crispr/run.py
@@ -1,12 +1,12 @@
 import asyncio, shutil, glob, os
-from quisp_run.simulation import SimContext
-from quisp_run.simulation.context import OmnetppEnv
-from quisp_run.workers import Executor, Writer, job_display
-from quisp_run.config import parse_config
+from crispr.simulation import SimContext
+from crispr.simulation.context import OmnetppEnv
+from crispr.workers import Executor, Writer, job_display
+from crispr.config import parse_config
 
-from quisp_run.utils import console, error_console, logger
-from quisp_run.state import State
-from quisp_run.parameter_registry import ParameterRegistry, init_registry
+from crispr.utils import console, error_console, logger
+from crispr.state import State
+from crispr.parameter_registry import ParameterRegistry, init_registry
 
 
 def start_simulations(

diff --git a/quisp_run/simulation/__init__.py → crispr/simulation/__init__.py b/quisp_run/simulation/__init__.py → crispr/simulation/__init__.py
diff --git a/quisp_run/simulation/context.py → crispr/simulation/context.py b/quisp_run/simulation/context.py → crispr/simulation/context.py
@@ -5,7 +5,7 @@
 from typing import Optional, List, Any
 from .setting import SimSetting
 from .result import Result
-from quisp_run.parameter_registry import ParameterRegistry
+from crispr.parameter_registry import ParameterRegistry
 
 if TYPE_CHECKING:
     from .plan import SimPlan

diff --git a/quisp_run/simulation/plan.py → crispr/simulation/plan.py b/quisp_run/simulation/plan.py → crispr/simulation/plan.py
@@ -1,14 +1,14 @@
 from typing import List, Dict, Any, Tuple
 import itertools, os, time, shutil
-from quisp_run.parameter_registry import ParameterRegistry
-from quisp_run.simulation import SimSetting
-from quisp_run.state import State
-from quisp_run.utils import logger
-from quisp_run.constants import (
-    QUISP_RUN_ROOT_DIR,
-    QUISP_TEMPALTE_IPYNB,
-    QUISP_TEMPALTE_OMNETPP_INI,
-    QUISP_TEMPALTE_TOPOLOGY_DIR,
+from crispr.parameter_registry import ParameterRegistry
+from crispr.simulation import SimSetting
+from crispr.state import State
+from crispr.utils import logger
+from crispr.constants import (
+    CRISPR_ROOT_DIR,
+    CRISPR_TEMPALTE_IPYNB,
+    CRISPR_TEMPALTE_OMNETPP_INI,
+    CRISPR_TEMPALTE_TOPOLOGY_DIR,
 )
 
 
@@ -68,10 +68,10 @@ def create_result_dir(self, results_root_dir: str) -> Tuple[str, str]:
         self.result_dir = result_dir
 
         logger.debug("Creating result dir: %s", self.result_dir)
-        shutil.copy(QUISP_TEMPALTE_OMNETPP_INI, os.path.join(result_dir, "omnetpp.ini"))
-        shutil.copy(QUISP_TEMPALTE_IPYNB, os.path.join(result_dir, "analysis.ipynb"))
+        shutil.copy(CRISPR_TEMPALTE_OMNETPP_INI, os.path.join(result_dir, "omnetpp.ini"))
+        shutil.copy(CRISPR_TEMPALTE_IPYNB, os.path.join(result_dir, "analysis.ipynb"))
         topology_path = os.path.join(result_dir, "topology")
-        shutil.copytree(QUISP_TEMPALTE_TOPOLOGY_DIR, topology_path)
+        shutil.copytree(CRISPR_TEMPALTE_TOPOLOGY_DIR, topology_path)
         self.ned_path = topology_path
         return (result_dir, ned_dir)
 

diff --git a/quisp_run/simulation/plan_test.py → crispr/simulation/plan_test.py b/quisp_run/simulation/plan_test.py → crispr/simulation/plan_test.py
@@ -1,5 +1,5 @@
-from quisp_run.simulation import SimPlan
-from quisp_run.parameter_registry import init_registry, ParameterRegistry
+from crispr.simulation import SimPlan
+from crispr.parameter_registry import init_registry, ParameterRegistry
 
 
 def test_populate():

diff --git a/quisp_run/simulation/result.py → crispr/simulation/result.py b/quisp_run/simulation/result.py → crispr/simulation/result.py
diff --git a/quisp_run/simulation/result_test.py → crispr/simulation/result_test.py b/quisp_run/simulation/result_test.py → crispr/simulation/result_test.py
diff --git a/quisp_run/simulation/setting.py → crispr/simulation/setting.py b/quisp_run/simulation/setting.py → crispr/simulation/setting.py
@@ -1,7 +1,7 @@
 from typing import List, Optional, TYPE_CHECKING, Any, Dict
-from quisp_run.parameter_registry.parameter import ParameterKind
-from quisp_run.utils import replace_path_placeholder, logger
-from quisp_run.parameter_registry import registry
+from crispr.parameter_registry.parameter import ParameterKind
+from crispr.utils import replace_path_placeholder, logger
+from crispr.parameter_registry import registry
 import os
 
 if TYPE_CHECKING:

diff --git a/quisp_run/state.py → crispr/state.py b/quisp_run/state.py → crispr/state.py
diff --git a/quisp_run/utils.py → crispr/utils.py b/quisp_run/utils.py → crispr/utils.py
@@ -1,7 +1,7 @@
 import re, logging
 from rich.logging import RichHandler
 from rich.console import Console
-from quisp_run.constants import QUISP_RUN_ROOT_DIR, DEFAULT_RICH_CONSOLE_THEME
+from crispr.constants import CRISPR_ROOT_DIR, DEFAULT_RICH_CONSOLE_THEME
 
 TIME_FORMAT_PATTERN = re.compile(r"\s*([\d.]+)m\s*([\d.]+)s")
 
@@ -10,9 +10,9 @@ def replace_path_placeholder(path_str: str) -> str:
     """convert placeholder string to a valid path string
 
     e.g.
-    "${QUISP_RUN_ROOT_DIR}/config/omnetpp.ini" -> "/home/user/quisp_run/config/omnetpp.ini"
+    "${CRISPR_ROOT_DIR}/config/omnetpp.ini" -> "/home/user/crispr/config/omnetpp.ini"
     """
-    return path_str.replace("${QUISP_RUN_ROOT_DIR}", QUISP_RUN_ROOT_DIR)
+    return path_str.replace("${CRISPR_ROOT_DIR}", CRISPR_ROOT_DIR)
 
 
 def parse_time(s: str) -> float:

diff --git a/quisp_run/utils_test.py → crispr/utils_test.py b/quisp_run/utils_test.py → crispr/utils_test.py
diff --git a/quisp_run/workers/__init__.py → crispr/workers/__init__.py b/quisp_run/workers/__init__.py → crispr/workers/__init__.py
diff --git a/quisp_run/workers/executor.py → crispr/workers/executor.py b/quisp_run/workers/executor.py → crispr/workers/executor.py
@@ -3,8 +3,8 @@
 from enum import Enum
 from rich.progress import TaskID
 from rich.console import Console
-from quisp_run.simulation import Result, SimContext, SimSetting
-from quisp_run.utils import parse_time, logger
+from crispr.simulation import Result, SimContext, SimSetting
+from crispr.utils import parse_time, logger
 
 
 class WorkerStatus(Enum):

diff --git a/quisp_run/workers/job_dispaly.py → crispr/workers/job_dispaly.py b/quisp_run/workers/job_dispaly.py → crispr/workers/job_dispaly.py
@@ -5,8 +5,8 @@
 from rich.progress import Progress
 from rich.live import Live
 
-from quisp_run.simulation import SimContext
-from quisp_run.workers.executor import Executor, WorkerStatus
+from crispr.simulation import SimContext
+from crispr.workers.executor import Executor, WorkerStatus
 
 
 def simulation_progress(console: Console) -> Progress:

diff --git a/quisp_run/workers/writer.py → crispr/workers/writer.py b/quisp_run/workers/writer.py → crispr/workers/writer.py
@@ -1,6 +1,6 @@
 import pickle, os
 from typing import Dict
-from quisp_run.simulation import SimContext
+from crispr.simulation import SimContext
 
 
 class Writer:

diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 description = ""
 authors = ["zigen <hrlclb@gmail.com>"]
 include = ["templates"]
-packages = [ {include = "quisp_run"}]
+packages = [ {include = "crispr"}]
 
 [tool.poetry.dependencies]
 python = "^3.9"
@@ -23,7 +23,7 @@ build-backend = "poetry.core.masonry.api"
 
 
 [tool.poetry.scripts]
-crispr = "quisp_run.main:main"
+crispr = "crispr.main:main"
 
 [tool.poetry.build]
 generate-setup-file = false

diff --git a/quisp_run/constants.py b/quisp_run/constants.py