Remove version 2 of the plugin as its functionality was integrated into v1

nvcc_plugin.py

@@ -1,10 +1,8 @@
+from IPython.core.interactiveshell import InteractiveShell
+
 from v1.v1 import NVCCPlugin as NVCC_V1
-from v2.v2 import NVCCPluginV2 as NVCC_V2
 
 
-def load_ipython_extension(ip):
+def load_ipython_extension(shell: InteractiveShell):
-    nvcc_plugin = NVCC_V1(ip)
+    nvcc_plugin = NVCC_V1(shell)
-    ip.register_magics(nvcc_plugin)
+    shell.register_magics(nvcc_plugin)
-
-    nvcc_plugin_v2 = NVCC_V2(ip)
-    ip.register_magics(nvcc_plugin_v2)

v2/v2.py

@@ -1,107 +0,0 @@
-import os
-import subprocess
-
-from IPython.core.magic import Magics, cell_magic, magics_class
-from IPython.core.magic_arguments import argument, magic_arguments, parse_argstring
-from common import helper
-
-compiler = '/usr/local/cuda/bin/nvcc'
-profiler = '/usr/local/cuda/bin/ncu'
-
-
-@magics_class
-class NVCCPluginV2(Magics):
-
-    def __init__(self, shell):
-        super(NVCCPluginV2, self).__init__(shell)
-        self.argparser = helper.get_argparser()
-        current_dir = os.getcwd()
-        self.output_dir = os.path.join(current_dir, 'src')
-        if not os.path.exists(self.output_dir):
-            os.mkdir(self.output_dir)
-            print(f'created output directory at {self.output_dir}')
-        else:
-            print(f'directory {self.output_dir} already exists')
-
-        self.out = os.path.join(current_dir, "result.out")
-        print(f'Out bin {self.out}')
-
-    @staticmethod
-    def compile(output_dir, file_paths, out):
-        res = subprocess.check_output(
-            [compiler, '-I' + output_dir, file_paths, "-o", out, '-Wno-deprecated-gpu-targets'], stderr=subprocess.STDOUT)
-        res = res.decode()
-        helper.print_out(res)
-
-    def run(self, timeit=False, profile=False, profiler_args=[]):
-        if timeit:
-            stmt = f"subprocess.check_output(['{self.out}'], stderr=subprocess.STDOUT)"
-            output = self.shell.run_cell_magic(
-                magic_name="timeit", line="-q -o import subprocess", cell=stmt)
-            output = str(output) # convert TimeitResult object to human readable string
-        else:
-            run_args = []
-            if profile:
-                run_args.extend([profiler] + profiler_args)
-            run_args.append(self.out)
-            output = subprocess.check_output(run_args, stderr=subprocess.STDOUT)
-            output = output.decode('utf8')
-
-        helper.print_out(output)
-        return None
-
-    @magic_arguments()
-    @argument('-n', '--name', type=str, help='file name that will be produced by the cell. must end with .cu extension')
-    @argument('-c', '--compile', type=bool, help='Should be compiled?')
-    @cell_magic
-    def cuda(self, line='', cell=None):
-        args = parse_argstring(self.cuda, line)
-        ex = args.name.split('.')[-1]
-        if ex not in ['cu', 'h']:
-            raise Exception('name must end with .cu or .h')
-
-        if not os.path.exists(self.output_dir):
-            print(f'Output directory does not exist, creating')
-            try:
-                os.mkdir(self.output_dir)
-            except OSError:
-                print(f"Creation of the directory {self.output_dir} failed")
-            else:
-                print(f"Successfully created the directory {self.output_dir}")
-
-        file_path = os.path.join(self.output_dir, args.name)
-        with open(file_path, "w") as f:
-            f.write(cell)
-
-        if args.compile:
-            try:
-                self.compile(self.output_dir, file_path, self.out)
-                output = self.run(timeit=args.timeit, profile=args.profile, profiler_args=args.profiler_args)
-            except subprocess.CalledProcessError as e:
-                helper.print_out(e.output.decode("utf8"))
-                output = None
-        else:
-            output = f'File written in {file_path}'
-
-        return output
-
-    @cell_magic
-    def cuda_run(self, line='', cell=None):
-        try:
-            args = self.argparser.parse_args(line.split())
-        except SystemExit:
-            self.argparser.print_help()
-            return
-
-        try:
-            cuda_src = os.listdir(self.output_dir)
-            cuda_src = [os.path.join(self.output_dir, x)
-                        for x in cuda_src if x[-3:] == '.cu']
-            print(f'found sources: {cuda_src}')
-            self.compile(self.output_dir, ' '.join(cuda_src), self.out)
-            output = self.run(timeit=args.timeit, profile=args.profile, profiler_args=args.profiler_args)
-        except subprocess.CalledProcessError as e:
-            helper.print_out(e.output.decode("utf8"))
-            output = None
-
-        return output