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

Read _CONDOR_JOB_AD not _CONDOR_MACHINE_AD #1945

Merged
merged 2 commits into from
Dec 1, 2021
Merged

Read _CONDOR_JOB_AD not _CONDOR_MACHINE_AD #1945

merged 2 commits into from
Dec 1, 2021

Conversation

rjgildea
Copy link
Contributor

@rjgildea rjgildea commented Dec 1, 2021

No description provided.

@rjgildea rjgildea requested a review from isikhar December 1, 2021 17:50
@codecov
Copy link

codecov bot commented Dec 1, 2021

Codecov Report

Merging #1945 (d283634) into main (075d32b) will not change coverage.
The diff coverage is 95.65%.

@@           Coverage Diff           @@
##             main    #1945   +/-   ##
=======================================
  Coverage   67.15%   67.15%           
=======================================
  Files         620      620           
  Lines       70129    70129           
  Branches    10360    10360           
=======================================
  Hits        47095    47095           
  Misses      21063    21063           
  Partials     1971     1971           

@isikhar isikhar merged commit f1c851c into main Dec 1, 2021
@isikhar isikhar deleted the condor-job-ad branch December 1, 2021 19:42
rjgildea added a commit that referenced this pull request Dec 1, 2021
* Read _CONDOR_JOB_AD not _CONDOR_MACHINE_AD

* Rename newsfragments/XXX.bugfix to newsfragments/1945.bugfix

Co-authored-by: DiamondLightSource-build-server <DiamondLightSource-build-server@users.noreply.github.com>
DiamondLightSource-build-server added a commit that referenced this pull request Dec 1, 2021
Features
--------

- ``dials.integrate``: When determining available memory, take into account ``MemoryProvisioned`` from HTCondor machine ad if the ``_CONDOR_JOB_AD`` environment variable is set.
  ``nproc=auto``: Take into account ``CpusProvisioned`` from HTCondor machine ad. (#1943)

Bugfixes
--------

- Read ``_CONDOR_JOB_AD`` not ``_CONDOR_MACHINE_AD`` (#1945)
DiamondLightSource-build-server added a commit that referenced this pull request Dec 2, 2021
Features
--------

- ``dials.integrate``: When determining available memory, take into account ``MemoryProvisioned`` from HTCondor machine ad if the ``_CONDOR_JOB_AD`` environment variable is set.
  ``nproc=auto``: Take into account ``CpusProvisioned`` from HTCondor machine ad. (#1943)

Bugfixes
--------

- Read ``_CONDOR_JOB_AD`` not ``_CONDOR_MACHINE_AD`` (#1945)
dagewa pushed a commit to dagewa/dials that referenced this pull request Dec 13, 2021
* Read _CONDOR_JOB_AD not _CONDOR_MACHINE_AD

* Rename newsfragments/XXX.bugfix to newsfragments/1945.bugfix

Co-authored-by: DiamondLightSource-build-server <DiamondLightSource-build-server@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants