From 3651dbeea4a2960c90f953fa00bc276a95921bc5 Mon Sep 17 00:00:00 2001
From: iamashwin99 <ashwin-kumar.karnad@mpsd.mpg.de>
Date: Wed, 3 May 2023 11:58:59 +0200
Subject: [PATCH] update interface and test logging
---
install-mpsd-software-environment.py | 41 ++++++++++++++++------------
1 file changed, 23 insertions(+), 18 deletions(-)
diff --git a/install-mpsd-software-environment.py b/install-mpsd-software-environment.py
index 11ca6b5..0168447 100755
--- a/install-mpsd-software-environment.py
+++ b/install-mpsd-software-environment.py
@@ -101,11 +101,14 @@ class builder:
def run(self):
if self.run_mode == "remove":
- self.remove_toolchains()
+ pass
+ # self.remove_toolchains()
elif self.run_mode == "start_new":
- self.start_new_env()
+ pass
+ # self.start_new_env()
elif self.run_mode == "install":
- self.build_toolchains()
+ pass
+ # self.build_toolchains()
else:
self.prepare_env()
@@ -116,7 +119,9 @@ class builder:
if self.mpsd_spack_ver is None:
raise ValueError("Error: Please specify the release version to install")
if self.toolchain_base_dir is None:
- raise ValueError("Error: Please specify the target directory for installation")
+ raise ValueError(
+ "Error: Please specify the target directory for installation"
+ )
if not os.path.exists(self.toolchain_base_dir):
os.makedirs(self.toolchain_base_dir)
else:
@@ -136,7 +141,7 @@ class builder:
with os_chdir("spack-environments"):
subprocess.run(["git", "checkout", self.mpsd_spack_ver])
- def install_toolchains(
+ def build_toolchains(
self,
release,
install,
@@ -208,23 +213,23 @@ def main():
sys.exit(1)
if args.remove:
- remove_toolchain(args.release, args.remove)
+ cmd = "remove"
elif args.set_up:
- start_new_env(args.set_up, args.from_release)
+ cmd = "start_new"
else:
- target_dir = args.target_directory
-
if args.install:
- install_toolchains(
- args.release,
- args.install,
- target_dir,
- args.force_reinstall,
- args.skip_build_cache,
- args.skip_dir_check,
- )
+ cmd = "install"
else:
- prepare_env(args.skip_dir_check, args.release, target_dir)
+ cmd = "prepare_env"
+ run = builder(
+ release=args.release,
+ cmd=cmd,
+ toolchain_list=args.install,
+ target_dir=args.target_directory,
+ # force_reinstall=args.force_reinstall,
+ skip_build_cache=args.skip_build_cache,
+ )
+ run.run()
if __name__ == "__main__":
--
GitLab