Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use install.sh from utilix #217

Merged
merged 1 commit into from
Sep 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion alea/submitters/combine.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ls -lh
output_filename=$workflow_id-combined_output.tar.gz

# Tar all the .h5 files into the output file
tar -czf $output_filename *.h5 *.h5.log
tar czfv $output_filename *.h5 *.h5.log

# Check the output
echo "Checking the output"
Expand Down
5 changes: 3 additions & 2 deletions alea/submitters/htcondor.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import shutil
from pathlib import Path
from tqdm import tqdm
import utilix
from utilix.x509 import _validate_x509_proxy
from utilix.tarball import Tarball
from Pegasus.api import (
Expand Down Expand Up @@ -66,8 +67,8 @@ def __init__(self, *args, **kwargs):
self.combine_disk = self.htcondor_configurations.pop("combine_disk", 20_000)

# Dagman configurations
self.dagman_maxidle = self.htcondor_configurations.pop("dagman_maxidle", 100_000)
self.dagman_retry = self.htcondor_configurations.pop("dagman_retry", 2)
self.dagman_maxidle = self.htcondor_configurations.pop("dagman_maxidle", 100_000)
self.dagman_maxjobs = self.htcondor_configurations.pop("dagman_maxjobs", 100_000)

super().__init__(*args, **kwargs)
Expand Down Expand Up @@ -383,7 +384,7 @@ def _generate_rc(self):
rc.add_replica(
"local",
"install.sh",
"file://{}".format(self.top_dir / "alea/submitters/install.sh"),
f"file://{os.path.join(os.path.dirname(utilix.__file__), 'install.sh')}",
)

return rc
Expand Down
34 changes: 0 additions & 34 deletions alea/submitters/install.sh

This file was deleted.

2 changes: 1 addition & 1 deletion alea/submitters/run_toymc_wrapper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ SEED=$(echo "$seed" | sed "s/'/\"/g")
METADATA=$(echo "$metadata" | sed "s/'/\"/g")

# Installing customized packages
. install.sh
. install.sh alea

# Extract tarballs input
mkdir -p templates
Expand Down
Loading