Skip to content

Commit

Permalink
Merge branch 'gwastro:master' into pygrb_singleifo_cut
Browse files Browse the repository at this point in the history
  • Loading branch information
@pannarale
pannarale authored Feb 6, 2025
2 parents 486aaf5 + f38df69 commit b04c7aa
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 20 deletions.
40 changes: 23 additions & 17 deletions pycbc/workflow/pegasus_sites.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,18 +97,18 @@ def add_condorpool_symlink_site(sitecat, cp):
value="true")
site.add_profiles(Namespace.PEGASUS, key='auxillary.local',
value="true")
site.add_profiles(Namespace.CONDOR, key="+OpenScienceGrid",
site.add_profiles(Namespace.CONDOR, key="My.OpenScienceGrid",
value="False")
site.add_profiles(Namespace.CONDOR, key="should_transfer_files",
value="Yes")
site.add_profiles(Namespace.CONDOR, key="when_to_transfer_output",
value="ON_EXIT_OR_EVICT")
site.add_profiles(Namespace.CONDOR, key="getenv", value="True")
site.add_profiles(Namespace.CONDOR, key="+DESIRED_Sites",
site.add_profiles(Namespace.CONDOR, key="My.DESIRED_Sites",
value='"nogrid"')
site.add_profiles(Namespace.CONDOR, key="+IS_GLIDEIN",
site.add_profiles(Namespace.CONDOR, key="My.IS_GLIDEIN",
value='"False"')
site.add_profiles(Namespace.CONDOR, key="+flock_local",
site.add_profiles(Namespace.CONDOR, key="My.flock_local",
value="True")
site.add_profiles(Namespace.DAGMAN, key="retry", value="2")
sitecat.add_sites(site)
Expand All @@ -129,18 +129,18 @@ def add_condorpool_copy_site(sitecat, cp):
value=True)
site.add_profiles(Namespace.PEGASUS, key='auxillary.local',
value="true")
site.add_profiles(Namespace.CONDOR, key="+OpenScienceGrid",
site.add_profiles(Namespace.CONDOR, key="My.OpenScienceGrid",
value="False")
site.add_profiles(Namespace.CONDOR, key="should_transfer_files",
value="Yes")
site.add_profiles(Namespace.CONDOR, key="when_to_transfer_output",
value="ON_EXIT_OR_EVICT")
site.add_profiles(Namespace.CONDOR, key="getenv", value="True")
site.add_profiles(Namespace.CONDOR, key="+DESIRED_Sites",
site.add_profiles(Namespace.CONDOR, key="My.DESIRED_Sites",
value='"nogrid"')
site.add_profiles(Namespace.CONDOR, key="+IS_GLIDEIN",
site.add_profiles(Namespace.CONDOR, key="My.IS_GLIDEIN",
value='"False"')
site.add_profiles(Namespace.CONDOR, key="+flock_local",
site.add_profiles(Namespace.CONDOR, key="My.flock_local",
value="True")
site.add_profiles(Namespace.DAGMAN, key="retry", value="2")
sitecat.add_sites(site)
Expand Down Expand Up @@ -170,18 +170,18 @@ def add_condorpool_shared_site(sitecat, cp, local_path, local_url):
value="true")
site.add_profiles(Namespace.PEGASUS, key='auxillary.local',
value="true")
site.add_profiles(Namespace.CONDOR, key="+OpenScienceGrid",
site.add_profiles(Namespace.CONDOR, key="My.OpenScienceGrid",
value="False")
site.add_profiles(Namespace.CONDOR, key="should_transfer_files",
value="Yes")
site.add_profiles(Namespace.CONDOR, key="when_to_transfer_output",
value="ON_EXIT_OR_EVICT")
site.add_profiles(Namespace.CONDOR, key="getenv", value="True")
site.add_profiles(Namespace.CONDOR, key="+DESIRED_Sites",
site.add_profiles(Namespace.CONDOR, key="My.DESIRED_Sites",
value='"nogrid"')
site.add_profiles(Namespace.CONDOR, key="+IS_GLIDEIN",
site.add_profiles(Namespace.CONDOR, key="My.IS_GLIDEIN",
value='"False"')
site.add_profiles(Namespace.CONDOR, key="+flock_local",
site.add_profiles(Namespace.CONDOR, key="My.flock_local",
value="True")
site.add_profiles(Namespace.DAGMAN, key="retry", value="2")
# Need to set PEGASUS_HOME
Expand Down Expand Up @@ -223,21 +223,27 @@ def add_osg_site(sitecat, cp):
value="ON_SUCCESS")
site.add_profiles(Namespace.CONDOR, key="success_exit_code",
value="0")
site.add_profiles(Namespace.CONDOR, key="+OpenScienceGrid",
site.add_profiles(Namespace.CONDOR, key="My.OpenScienceGrid",
value="True")
site.add_profiles(Namespace.CONDOR, key="getenv",
value="False")
site.add_profiles(Namespace.CONDOR, key="+InitializeModulesEnv",
site.add_profiles(Namespace.CONDOR, key="ulog_execute_attrs",
value="GLIDEIN_Site")
site.add_profiles(Namespace.CONDOR, key="My.InitializeModulesEnv",
value="False")
site.add_profiles(Namespace.CONDOR, key="+SingularityCleanEnv",
site.add_profiles(Namespace.CONDOR, key="My.SingularityCleanEnv",
value="True")
# These numbers below correspond to the codes in table B.2 here:
# https://htcondor.readthedocs.io/en/24.0/codes-other-values/job-event-log-codes.html
# Values recommended by a condor expert
site.add_profiles(Namespace.CONDOR, key="My.DAGManNodesMask",
value=r"\"0,1,2,4,5,7,8,9,10,11,12,13,16,17,24,27,35,36,40\"")
site.add_profiles(Namespace.CONDOR, key="Requirements",
value="(HAS_SINGULARITY =?= TRUE) && "
"(HAS_LIGO_FRAMES =?= True) && "
"(IS_GLIDEIN =?= True)")
cvmfs_loc = '"/cvmfs/singularity.opensciencegrid.org/pycbc/pycbc-el8:v'
cvmfs_loc += sing_version + '"'
site.add_profiles(Namespace.CONDOR, key="+SingularityImage",
site.add_profiles(Namespace.CONDOR, key="My.SingularityImage",
value=cvmfs_loc)
# On OSG failure rate is high
site.add_profiles(Namespace.DAGMAN, key="retry", value="4")
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
requires = ["setuptools>=70.0.0",
"wheel",
"cython>=0.29.21",
"numpy>=2.0.0",
"numpy>=2.0.0,!=2.2.2",
]
2 changes: 1 addition & 1 deletion requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ astropy>=2.0.3,!=4.2.1,!=4.0.5
Mako>=1.0.1
scipy>=0.16.0
matplotlib>=2.0.0
numpy>=1.16.0,!=1.19.0
numpy>=1.16.0,!=1.19.0,!=2.2.2
pillow
h5py>=3.0.0,!=3.7.0
jinja2
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
setup_requires = ['numpy>=1.16.0']
install_requires = setup_requires + [
'cython>=0.29',
'numpy>=1.16.0,!=1.19.0',
'numpy>=1.16.0,!=1.19.0,!=2.2.2',
'scipy>=0.16.0',
'astropy>=2.0.3,!=4.2.1,!=4.0.5',
'matplotlib>=1.5.1',
Expand Down

0 comments on commit b04c7aa

Please sign in to comment.