Merge pull request #3557 from Flamefire/parallel_prop

Update easyblocks to use `EasyConfig.parallel` property

Author: boegel

easybuild/easyblocks/a/adf.py

@@ -80,7 +80,7 @@ def install_step(self):
         except OSError as err:
             raise EasyBuildError("Failed to copy %s to %s: %s", src_init_path, target_init_path, err)
 
-        cmd = "./bin/foray -j %d" % self.cfg['parallel']
+        cmd = f"./bin/foray -j {self.cfg.parallel}"
         run_shell_cmd(cmd)
 
     def sanity_check_step(self):

easybuild/easyblocks/a/aomp.py

@@ -85,11 +85,7 @@ def configure_step(self):
             'AOMP_APPLY_ROCM_PATCHES=0',
             'AOMP_STANDALONE_BUILD=1',
         ]
-        if self.cfg['parallel']:
-            install_options.append(
-                'NUM_THREADS={!s}'.format(self.cfg['parallel']))
-        else:
-            install_options.append('NUM_THREADS=1')
+        install_options.append(f'NUM_THREADS={self.cfg.parallel}')
         # Check if CUDA is loaded and alternatively build CUDA backend
         if get_software_root('CUDA') or get_software_root('CUDAcore'):
             cuda_root = get_software_root('CUDA') or get_software_root('CUDAcore')

easybuild/easyblocks/b/bazel.py

@@ -158,7 +158,7 @@ def configure_step(self):
         ])
 
         # enable building in parallel
-        bazel_args = '--jobs=%d' % self.cfg['parallel']
+        bazel_args = f'--jobs={self.cfg.parallel}'
 
         # Bazel provides a JDK by itself for some architectures
         # We want to enforce it using the JDK we provided via modules
@@ -206,7 +206,7 @@ def test_step(self):
                 # Avoid bazel using $HOME
                 '--output_user_root=%s' % self.output_user_root,
                 runtest,
-                '--jobs=%d' % self.cfg['parallel'],
+                f'--jobs={self.cfg.parallel}',
                 '--host_javabase=@local_jdk//:jdk',
                 # Be more verbose
                 '--subcommands', '--verbose_failures',

easybuild/easyblocks/b/berkeleygw.py

@@ -62,7 +62,7 @@ def configure_step(self):
     def build_step(self):
         """Custom build step for BerkeleyGW."""
 
-        self.cfg['parallel'] = 1
+        self.cfg.parallel = 1
 
         self.cfg['buildopts'] = 'all-flavors'
 

easybuild/easyblocks/b/boost.py

@@ -227,8 +227,8 @@ def build_step(self):
                 self.bjamoptions += " -s%s_INCLUDE=%s/include" % (lib.upper(), libroot)
                 self.bjamoptions += " -s%s_LIBPATH=%s/lib" % (lib.upper(), libroot)
 
-        if self.cfg['parallel']:
-            self.paracmd = "-j %s" % self.cfg['parallel']
+        if self.cfg.parallel > 1:
+            self.paracmd = f"-j {self.cfg.parallel}"
         else:
             self.paracmd = ''
 

easybuild/easyblocks/c/clang.py

@@ -124,7 +124,6 @@ def __init__(self, *args, **kwargs):
         self.llvm_obj_dir_stage1 = None
         self.llvm_obj_dir_stage2 = None
         self.llvm_obj_dir_stage3 = None
-        self.make_parallel_opts = ""
         self.runtime_lib_path = "lib"
 
         # Bypass the .mod file check for GCCcore installs
@@ -404,9 +403,6 @@ def configure_step(self):
 
         self.cfg.update('configopts', '-DLLVM_TARGETS_TO_BUILD="%s"' % ';'.join(build_targets))
 
-        if self.cfg['parallel']:
-            self.make_parallel_opts = "-j %s" % self.cfg['parallel']
-
         # If hwloc is included as a dep, use it in OpenMP runtime for affinity
         hwloc_root = get_software_root('hwloc')
         if hwloc_root:
@@ -554,7 +550,7 @@ def build_with_prev_stage(self, prev_obj, next_obj):
             run_shell_cmd("cmake %s %s" % (' '.join(options), self.llvm_src_dir))
 
         self.log.info("Building")
-        run_shell_cmd("make %s VERBOSE=1" % self.make_parallel_opts)
+        run_shell_cmd(f"make {self.parallel_flag} VERBOSE=1")
 
         # restore $PATH
         setvar('PATH', orig_path)
@@ -581,7 +577,7 @@ def test_step(self):
                 change_dir(self.llvm_obj_dir_stage3)
             else:
                 change_dir(self.llvm_obj_dir_stage1)
-            run_shell_cmd("make %s check-all" % self.make_parallel_opts)
+            run_shell_cmd(f"make {self.parallel_flag} check-all")
 
     def install_step(self):
         """Install stage 3 binaries."""

easybuild/easyblocks/c/cp2k.py

@@ -669,18 +669,17 @@ def build_step(self):
             change_dir(makefiles)
 
             # modify makefile for parallel build
-            parallel = self.cfg['parallel']
-            if parallel:
-
+            parallel = self.cfg.parallel
+            if parallel > 1:
                 try:
                     for line in fileinput.input('Makefile', inplace=1, backup='.orig.patchictce'):
-                        line = re.sub(r"^PMAKE\s*=.*$", "PMAKE\t= $(SMAKE) -j %s" % parallel, line)
+                        line = re.sub(r"^PMAKE\s*=.*$", f"PMAKE\t= $(SMAKE) -j {parallel}", line)
                         sys.stdout.write(line)
                 except IOError as err:
                     raise EasyBuildError("Can't modify/write Makefile in %s: %s", makefiles, err)
 
         # update make options with MAKE
-        self.cfg.update('buildopts', 'MAKE="make -j %s"' % self.cfg['parallel'])
+        self.cfg.update('buildopts', f'MAKE="make -j {self.cfg.parallel}"')
 
         # update make options with ARCH and VERSION
         self.cfg.update('buildopts', 'ARCH=%s VERSION=%s' % (self.typearch, self.cfg['type']))
@@ -757,7 +756,7 @@ def test_step(self):
                 self.log.info("No reference output found for regression test, just continuing without it...")
 
             # prefer using 4 cores, since some tests require/prefer square (n^2) numbers or powers of 2 (2^n)
-            test_core_cnt = min(self.cfg['parallel'], 4)
+            test_core_cnt = min(self.cfg.parallel, 4)
             if get_avail_core_count() < test_core_cnt:
                 raise EasyBuildError("Cannot run MPI tests as not enough cores (< %s) are available", test_core_cnt)
             else:

easybuild/easyblocks/d/dm_reverb.py

@@ -91,7 +91,7 @@ def build_step(self, *args, **kwargs):
         # use JDK from EB
         bazel_build_opts += " --host_javabase=@local_jdk//:jdk"
         # explicitly set the number of processes
-        bazel_build_opts += " --jobs=%d" % self.cfg['parallel']
+        bazel_build_opts += f" --jobs={self.cfg.parallel}"
         # print full compilation commands
         bazel_build_opts += " --subcommands"
 

easybuild/easyblocks/f/flook.py

@@ -55,7 +55,7 @@ def __init__(self, *args, **kwargs):
         else:
             local_comp_flags = 'FFLAGS="$FFLAGS" CFLAGS="$CFLAGS"'
         self.cfg.update('buildopts', 'liball %s' % local_comp_flags)
-        self.cfg['parallel'] = 1
+        self.cfg.parallel = 1
 
     def configure_step(self):
         # flook has no configure step

easybuild/easyblocks/g/gamess_us.py

@@ -427,11 +427,11 @@ def test_step(self):
                     return
 
                 # MPI builds can only run tests that support parallel execution
-                if int(self.cfg['parallel']) < 2:
+                if self.cfg.parallel < 2:
                     self.log.info("Skipping testing of GAMESS-US as MPI tests need at least 2 CPU cores to run")
                     return
 
-                test_procs = str(self.cfg['parallel'])
+                test_procs = str(self.cfg.parallel)
                 target_tests = [exam for exam in target_tests if exam[0] not in GAMESS_SERIAL_TESTS]
 
                 if self.toolchain.mpi_family() == toolchain.INTELMPI: