Commit a45a6b0a authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[revert] d700915d and 27876683

parent 4d99ac60
Loading
Loading
Loading
Loading
Loading
+1 −4
Original line number Diff line number Diff line
@@ -9,11 +9,8 @@
### git commit SHA; default = git rev-parse HEAD
# git_sha: abc123

### Whether to use multiprocessing in general; default = true
### Whether to use multiprocessing; default = true
# multiprocessing: false
### Whether to use multiprocessing in main loop for items and/or conditions; default = true
# multiprocessing_items: false
# multiprocessing_conditions: false
### Deletion of temporary directories containing 
### intermediate processing files, bitstreams etc.; default = false
# delete_tmp: true
+21 −32
Original line number Diff line number Diff line
@@ -147,24 +147,10 @@ def main(args):
            # preprocess 2
            preprocess_2(cfg, logger)

        apply_func_parallel(
            process_item_parallel,
            zip(
                repeat(cfg),
                cfg.proc_chains,
                cfg.tmp_dirs,
                cfg.out_dirs,
                repeat(logger)
            ),
            None,
            "mp" if cfg.multiprocessing_conditions else None,
        )

    # copy configuration to output directory
    cfg.to_file(cfg.output_path.joinpath(f"{cfg.name}.yml"))

def process_item_parallel(cfg, condition, tmp_dir, out_dir, logger):

        # run conditions
        for condition, out_dir, tmp_dir in zip(
            cfg.proc_chains, cfg.out_dirs, cfg.tmp_dirs
        ):
            chain = condition["processes"]

            logger.info(f"  Generating condition: {condition['name']}")
@@ -180,5 +166,8 @@ def process_item_parallel(cfg, condition, tmp_dir, out_dir, logger):
                    cfg.metadata_path,
                ),
                None,
        "mp" if cfg.multiprocessing_items else None,
                "mp" if cfg.multiprocessing else None,
            )

    # copy configuration to output directory
    cfg.to_file(cfg.output_path.joinpath(f"{cfg.name}.yml"))
+0 −2
Original line number Diff line number Diff line
@@ -58,8 +58,6 @@ DEFAULT_CONFIG = {
    "date": f"{datetime.now().strftime('%Y%m%d_%H.%M.%S')}",
    "git_sha": f"{get_gitsha()}",
    "multiprocessing": True,
    "multiprocessing_items": True,
    "multiprocessing_conditions": True,
    "use_windows_codec_binaries": False,
    "delete_tmp": False,
    "master_seed": 0,