Update script path

Author: dk19y

test/integration/__init__.py

@@ -30,21 +30,21 @@
 model_cpu_tar = file_utils.make_tarfile(mnist_cpu_script,
                                         os.path.join(model_cpu_dir, "model.pth"),
                                         model_cpu_dir,
-                                        preserve_script_path=True)
+                                        script_path="code")
 
 model_cpu_1d_dir = os.path.join(model_cpu_dir, '1d')
 mnist_1d_script = os.path.join(model_cpu_1d_dir, code_sub_dir, 'mnist_1d.py')
 model_cpu_1d_tar = file_utils.make_tarfile(mnist_1d_script,
                                            os.path.join(model_cpu_1d_dir, "model.pth"),
                                            model_cpu_1d_dir,
-                                           preserve_script_path=True)
+                                           script_path="code")
 
 model_gpu_dir = os.path.join(mnist_path, gpu_sub_dir)
 mnist_gpu_script = os.path.join(model_gpu_dir, code_sub_dir, 'mnist.py')
 model_gpu_tar = file_utils.make_tarfile(mnist_gpu_script,
                                         os.path.join(model_gpu_dir, "model.pth"),
                                         model_gpu_dir,
-                                        preserve_script_path=True)
+                                        script_path="code")
 
 model_eia_dir = os.path.join(mnist_path, eia_sub_dir)
 mnist_eia_script = os.path.join(model_eia_dir, 'mnist.py')
@@ -57,7 +57,7 @@
                                                  os.path.join(model_cpu_dir, "model.pth"),
                                                  model_cpu_dir,
                                                  "model_call_model_fn_once.tar.gz",
-                                                 preserve_script_path=True)
+                                                 script_path="code")
 
 ROLE = 'dummy/unused-role'
 DEFAULT_TIMEOUT = 20

test/utils/file_utils.py

@@ -16,11 +16,11 @@
 import tarfile
 
 
-def make_tarfile(script, model, output_path, filename="model.tar.gz", preserve_script_path=False):
+def make_tarfile(script, model, output_path, filename="model.tar.gz", script_path=None):
     output_filename = os.path.join(output_path, filename)
     with tarfile.open(output_filename, "w:gz") as tar:
-        if(preserve_script_path):
-            tar.add(script, arcname=script)
+        if(script_path):
+            tar.add(script, arcname=os.path.join(script_path, os.path.basename(script)))
         else:
             tar.add(script, arcname=os.path.basename(script))
         tar.add(model, arcname=os.path.basename(model))