diff --git a/artifacts/nickel/europar24/canon_solving.ncl b/artifacts/nickel/europar24/canon_solving.ncl index 3d95def..22fc9eb 100644 --- a/artifacts/nickel/europar24/canon_solving.ncl +++ b/artifacts/nickel/europar24/canon_solving.ncl @@ -5,7 +5,8 @@ doi = "10.5281/zenodo.11636529", conf_date = 2024, virtualization = "docker", - buildfile_dir = ".docker", + buildfile_dir = ".", + dockerfile_path = ".docker/Dockerfile", package_managers = [ "dpkg" ], misc_packages = [ { name = "gurobi10.0.1_linux64", url = "https://packages.gurobi.com/10.0/gurobi10.0.1_linux64.tar.gz" } diff --git a/artifacts/nickel/europar24/hiraga_peanuts.ncl b/artifacts/nickel/europar24/hiraga_peanuts.ncl index 669cfe0..b9e6944 100644 --- a/artifacts/nickel/europar24/hiraga_peanuts.ncl +++ b/artifacts/nickel/europar24/hiraga_peanuts.ncl @@ -6,7 +6,7 @@ conf_date = 2024, comment = "Files in /var/lib/apt/lists/ are removed.", virtualization = "docker", - buildfile_dir = "./", + buildfile_dir = "peanuts-playground", package_managers = [ "dpkg" ], git_packages = [ { name = "spack", location = "/home/vscode/.cache/spack" } diff --git a/artifacts/nickel/europar24/lee_accelerated.ncl b/artifacts/nickel/europar24/lee_accelerated.ncl.nope similarity index 100% rename from artifacts/nickel/europar24/lee_accelerated.ncl rename to artifacts/nickel/europar24/lee_accelerated.ncl.nope diff --git a/ecg/app/ecg.py b/ecg/app/ecg.py index d98e76f..d32169f 100755 --- a/ecg/app/ecg.py +++ b/ecg/app/ecg.py @@ -34,19 +34,19 @@ def download_sources(url, archive_type, arthashlog_path, dl_dir, artifact_name): artifact_dir = "" tmp_artifact_file = tempfile.NamedTemporaryFile() - tmp_artifact_path = artifact_file.name + tmp_artifact_path = tmp_artifact_file.name artifact_hash = download_file_and_get_hash(url, tmp_artifact_path) if artifact_hash != "-1": - logging.info(f"Extracting artifact at {artifact_dir}") artcache_dir = f"ecg_{artifact_hash[:9]}" artifact_dir = os.path.join(dl_dir, artcache_dir) + logging.info(f"Extracting artifact at {artifact_dir}") extractors = { "zip": zipfile.ZipFile, "tar": tarfile.open } os.mkdir(artifact_dir) - extractors[archive_type](artifact_path).extractall(artifact_dir) + extractors[archive_type](tmp_artifact_path).extractall(artifact_dir) with open(arthashlog_path, "w") as arthashlog_file: now = datetime.datetime.now() @@ -74,10 +74,9 @@ def buildresult_saver(result, buildstatus_path, config_path): timestamp = str(datetime.datetime.timestamp(now)) buildstatus_file.write(f"{artifact_name},{timestamp},{result}\n") -def build_image(path, image_name): +def build_image(path, dockerfile_path, image_name): logging.info(f"Starting building image {image_name}") - path = os.path.join(src_dir, config["buildfile_dir"]) - build_command = f"docker build --no-cache -t {image_name} ." + build_command = f"docker build --no-cache -t {image_name} -f {dockerfile_path} ." build_process = subprocess.run(build_command.split(" "), cwd=path, capture_output=True) build_output = f"stdout:\n{build_process.stdout.decode('utf-8')}\nstderr:\n{build_process.stderr.decode('utf-8')}" logging.info(f"Output of '{build_command}':\n\n{build_output}") @@ -221,35 +220,40 @@ def main(): help = "Path to the file where to write the log of the hash of the downloaded artifact.", required = True ) + parser.add_argument( + "-l", "--log", + help = "Path to the file where to write the log of the execution of ecg.", + required = True + ) args = parser.parse_args() - logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.INFO) + logging.basicConfig(filename=args.log, encoding='utf-8', format='%(levelname)s: %(message)s', level=logging.INFO) config_path = args.config - with open(config_path, "r") as config_file: - config = json.loads(config_file.read()) - artifact_name = os.path.splitext(os.path.basename(config_path))[0] - ecg(artifact_name, config, args.pkg_list, args.build_status, args.artifact_hash) + ecg(artifact_name, config_path, args.pkg_list, args.build_status, args.artifact_hash) return 0 -def ecg(artifact_name, config, pkglist_path, buildstatus_path, arthashlog_path): +def ecg(artifact_name, config_path, pkglist_path, buildstatus_path, arthashlog_path): # just in case Snakemake does not create them pathlib.Path(pkglist_path).touch() pathlib.Path(buildstatus_path).touch() pathlib.Path(arthashlog_path).touch() + with open(config_path, "r") as config_file: + config = json.loads(config_file.read()) + + status = "" - with tempfile.TemporaryDirectory() as tmp_dir: - dl_dir = tmp_dir.name - artifact_dir = download_sources(config["url"], config["type"], arthashlog_path, dl_dir, artifact_name) + with tempfile.TemporaryDirectory() as dl_dir: + artifact_dir = download_sources(config["artifact_url"], config["type"], arthashlog_path, dl_dir, artifact_name) if artifact_dir != "": path = os.path.join(artifact_dir, config["buildfile_dir"]) - return_code, build_output = build_image(path, artifact_name) + return_code, build_output = build_image(path, config["dockerfile_path"], artifact_name) if return_code == 0: status = "success" check_env(config, artifact_dir, artifact_name, pkglist_path) diff --git a/workflow/envs/snakemake.nix b/workflow/envs/snakemake.nix index e5791c7..9291a1d 100644 --- a/workflow/envs/snakemake.nix +++ b/workflow/envs/snakemake.nix @@ -5,6 +5,7 @@ pkgs.mkShell { snakemake gawk gnused + nickel (python3.withPackages (ps: with ps; [ kapkgs.execo ])) diff --git a/workflow/measure.smk b/workflow/measure.smk index 5fe7d2b..f7a970f 100644 --- a/workflow/measure.smk +++ b/workflow/measure.smk @@ -28,7 +28,7 @@ rule check_artifact: f"{ARTIFACTS_FOLDER_JSON}/{{conference}}/{{artifact}}.json" shell: """ - nix develop .#nickel --command nickel export --format json --output {output} <<< 'let {{Artifact, ..}} = import "{input.contract}" in ((import "{input.artifact}") | Artifact)' + nickel export --format json --output {output} <<< 'let {{Artifact, ..}} = import "{input.contract}" in ((import "{input.artifact}") | Artifact)' """ # ECG: @@ -57,7 +57,5 @@ rule run_ecg: --sleep_time {config['sleep_time']} \ --build_status_file {{output.build_status}} \ --artifact {{wildcards.artifact}} -- '" if SYSTEM == "g5k" else "") + \ - """ - nix shell .#ecg --command ecg -p {output.pkg} -b {output.build_status} -a {output.artifact_hash} {input.artifact} &> {output.log} || echo "{input.artifact}, `date +%s.%N`, script_crash" > {output.build_status} - """ + \ - ("'" if SYSTEM == "g5k" else "") + "nix shell .#ecg --command ecg -p {output.pkg} -b {output.build_status} -a {output.artifact_hash} -l {output.log} {input.artifact}" + \ + ("'" if SYSTEM == "g5k" else "echo \"{input.artifact}, `date +%s.%N`, script_crash\" > {output.build_status}") diff --git a/workflow/nickel/artifact_contract.ncl b/workflow/nickel/artifact_contract.ncl index 40613e9..7db8b82 100644 --- a/workflow/nickel/artifact_contract.ncl +++ b/workflow/nickel/artifact_contract.ncl @@ -78,6 +78,10 @@ in buildfile_dir | doc "Path to the directory containing the file used to build the container in the artifact" | FilePath, + dockerfile_path + | doc "Path to the Dockerfile from the build directory" + | FilePath + | default = "Dockerfile", package_managers | doc "Package Managers used in the container. Possible values: dpkg, rpm, pacman, pip, conda" | optional diff --git a/workflow/scripts/ecg_oar_wrapper.oar.bash b/workflow/scripts/ecg_oar_wrapper.oar.bash index bef502f..02c022c 100755 --- a/workflow/scripts/ecg_oar_wrapper.oar.bash +++ b/workflow/scripts/ecg_oar_wrapper.oar.bash @@ -22,4 +22,4 @@ handler() { trap handler SIGUSR2 cd ${DIRECTORY} -nix develop --command $@ +$@ || echo "${ARTIFACT_FILE}, `date +%s.%N`, script_crash" > ${BUILD_STATUS_FILE} diff --git a/workflow/utils.smk b/workflow/utils.smk index 9039e9c..931cea3 100644 --- a/workflow/utils.smk +++ b/workflow/utils.smk @@ -23,4 +23,4 @@ def get_blacklisted(blacklist_dir_path): # raise(Exception(f"There is no artifact to build! Either no artifact configuration files have been found, or they have all been blacklisted.")) def get_artifacts_to_build(artifacts_folder): - return [os.path.splitext(a)[0] for a in os.listdir(artifacts_folder) if not os.path.isdir(os.path.join(artifacts_folder, a))] + return [os.path.splitext(a)[0] for a in os.listdir(artifacts_folder) if not os.path.isdir(os.path.join(artifacts_folder, a)) and os.path.splitext(a)[-1] == ".ncl"]