From b45a02a68decbac533ee36c3fc663a2fab99a9b2 Mon Sep 17 00:00:00 2001 From: Ian Guinn Date: Wed, 14 Aug 2024 15:51:09 -0400 Subject: [PATCH 1/2] Change MaGe and MGDO default forks to legend-exp instead of mppmu --- installMaGe.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/installMaGe.py b/installMaGe.py index 0f88e50..f0865f8 100644 --- a/installMaGe.py +++ b/installMaGe.py @@ -38,11 +38,11 @@ parser.add_argument('-j', '--jobs', type=int, default=1, help="Number of threads to run with Make") -parser.add_argument('--mgdofork', type=str, default='mppmu', +parser.add_argument('--mgdofork', type=str, default='legend-exp', help="Github fork to install MGDO from") parser.add_argument('--mgdobranch', type=str, default='master', help="Git branch to install MGDO from") -parser.add_argument('--magefork', type=str, default='mppmu', +parser.add_argument('--magefork', type=str, default='legend-exp', help="Github fork to install MaGe from") parser.add_argument('--magebranch', type=str, default='main', help="Git branch to install MaGe from") From ed79f5543e79a17ef6194ca740a2d272de96d3ec Mon Sep 17 00:00:00 2001 From: iguinn Date: Thu, 15 Aug 2024 08:30:35 -0700 Subject: [PATCH 2/2] Change default behavior to do pip user install of magepostproc. Added --pipinstallnone option --- installMaGe.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/installMaGe.py b/installMaGe.py index f0865f8..a5dd9f7 100644 --- a/installMaGe.py +++ b/installMaGe.py @@ -51,10 +51,15 @@ parser.add_argument('--mppbranch', type=str, default='main', help="Git branch to install MPP from") -parser.add_argument('--pipinstallglobal', action='store_true', default=False, +parser.add_argument('--pipinstallnone', dest='pip', action='store_const', + const="none", default="user", + help="Do not pip install magepostproc module") +parser.add_argument('--pipinstallglobal', dest='pip', action='store_const', + const="global", default="user", help="Install magepostproc module to global site-packages") -parser.add_argument('--pipinstalluser', action='store_true', default=False, - help="Install magepostproc module to user site-packages") +parser.add_argument('--pipinstalluser', dest='pip', action='store_const', + const="user", default="user", + help="Install magepostproc module to user site-packages (this is the default)") args = parser.parse_args() @@ -171,9 +176,9 @@ def cmd(command): # install mage-post-proc mpp_cmake_opts = '' -if(args.pipinstallglobal): +if(args.pip=="global"): mpp_cmake_opts += f" -DPYTHON_EXE={sys.executable} -DPIP_GLOBAL_INSTALL=ON" -if(args.pipinstalluser): +if(args.pip=="user"): mpp_cmake_opts += f" -DPYTHON_EXE={sys.executable} -DPIP_USER_INSTALL=ON" cmd("pwd")