From 11146a3e10857f2234fa72cf0ddcf2f7df83a1dd Mon Sep 17 00:00:00 2001 From: Cosmin Ciocan Date: Tue, 2 Jan 2024 10:59:08 +0100 Subject: [PATCH] Move source files to nvcc4jupyter directory --- common/__init__.py | 0 nvcc4jupyter/__init__.py | 1 + common/helper.py => nvcc4jupyter/parsers.py | 4 ---- v1/v1.py => nvcc4jupyter/plugin.py | 19 ++++++++++++------- v1/__init__.py | 0 5 files changed, 13 insertions(+), 11 deletions(-) delete mode 100644 common/__init__.py create mode 100644 nvcc4jupyter/__init__.py rename common/helper.py => nvcc4jupyter/parsers.py (97%) rename v1/v1.py => nvcc4jupyter/plugin.py (95%) delete mode 100644 v1/__init__.py diff --git a/common/__init__.py b/common/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/nvcc4jupyter/__init__.py b/nvcc4jupyter/__init__.py new file mode 100644 index 0000000..5becc17 --- /dev/null +++ b/nvcc4jupyter/__init__.py @@ -0,0 +1 @@ +__version__ = "1.0.0" diff --git a/common/helper.py b/nvcc4jupyter/parsers.py similarity index 97% rename from common/helper.py rename to nvcc4jupyter/parsers.py index 94ca898..62a1c15 100644 --- a/common/helper.py +++ b/nvcc4jupyter/parsers.py @@ -106,7 +106,3 @@ def get_parser_cuda_group_delete() -> argparse.ArgumentParser: ) return parser - -def print_out(out: str): - for l in out.split("\n"): - print(l) diff --git a/v1/v1.py b/nvcc4jupyter/plugin.py similarity index 95% rename from v1/v1.py rename to nvcc4jupyter/plugin.py index c4daa5a..f5b77d4 100644 --- a/v1/v1.py +++ b/nvcc4jupyter/plugin.py @@ -10,22 +10,27 @@ from typing import List, Optional from IPython.core.interactiveshell import InteractiveShell from IPython.core.magic import Magics, cell_magic, line_magic, magics_class -from common import helper +from . import parsers DEFAULT_EXEC_FNAME = "cuda_exec.out" SHARED_GROUP_NAME = "shared" +def print_out(out: str): + for l in out.split("\n"): + print(l) + + @magics_class class NVCCPlugin(Magics): def __init__(self, shell: InteractiveShell): super(NVCCPlugin, self).__init__(shell) self.shell: InteractiveShell # type hint not provided by parent class - self.parser_cuda = helper.get_parser_cuda() - self.parser_cuda_group_save = helper.get_parser_cuda_group_save() - self.parser_cuda_group_delete = helper.get_parser_cuda_group_delete() - self.parser_cuda_group_run = helper.get_parser_cuda_group_run() + self.parser_cuda = parsers.get_parser_cuda() + self.parser_cuda_group_save = parsers.get_parser_cuda_group_save() + self.parser_cuda_group_delete = parsers.get_parser_cuda_group_delete() + self.parser_cuda_group_run = parsers.get_parser_cuda_group_run() self.workdir = tempfile.mkdtemp() print(f'Source files will be saved in "{self.workdir}".') @@ -241,7 +246,7 @@ class NVCCPlugin(Magics): ) output = self._compile_and_run(group_name, args) - helper.print_out(output) + print_out(output) @cell_magic def cuda_group_save(self, line: str, cell: str) -> None: @@ -280,7 +285,7 @@ class NVCCPlugin(Magics): return output = self._compile_and_run(args.group, args) - helper.print_out(output) + print_out(output) @line_magic def cuda_group_delete(self, line: str) -> None: diff --git a/v1/__init__.py b/v1/__init__.py deleted file mode 100644 index e69de29..0000000