Skip to content

Merge discvr-24.7 to develop #219

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.

Sign up for GitHub

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

Merged
bbimber merged 3 commits into from
Sep 26, 2024
Merged

Merge discvr-24.7 to develop #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ef593f
Allow more memory for CacheAlignerIndexesTask
bbimber Sep 24, 2024
93e150a
Augment kinship calculation to check modification date and only run a…
bbimber Sep 25, 2024
067cbda
Merge discvr-24.7 to develop
bbimber Sep 26, 2024
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
3 changes: 2 additions & 1 deletion PMR/resources/queries/study/pedigree.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ AS status,
d.id.demographics.calculated_status as status_code,
d.id.demographics.species,
'' as Display,
'Demographics' as source
'Demographics' as source,
d.modified

FROM study.demographicsParents d
WHERE d.numParents > 0 and d.id.demographics.species IS NOT NULL
3 changes: 2 additions & 1 deletion mcc/resources/queries/study/pedigree.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ AS status,
d.id.demographics.calculated_status as status_code,
d.id.demographics.species,
'' as Display,
'Demographics' as source
'Demographics' as source,
d.modified

FROM study.demographicsParents d
WHERE d.numParents > 0 and d.id.demographics.species IS NOT NULL
4 changes: 2 additions & 2 deletions primeseq/src/org/labkey/primeseq/pipeline/SequenceJobResourceAllocator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,8 @@ public Integer getMaxRequestMemory(PipelineJob job)
// NOTE: STAR in particular needs more memory
if (isCacheAlignerIndexesTask(job))
{
job.getLogger().debug("setting memory to 24");
return 24;
job.getLogger().debug("setting memory to 36");
return 36;
}

if (isLuceneIndexJob(job))
Expand Down