Skip to content

Commit

Permalink
145: Fixes to promotion (#223)
Browse files Browse the repository at this point in the history 
* some simple fixes

There were basic problems when booting and promotion was active. Fixed the order that variables are set etc to boot and run with promotion. Fixed other typos in the promotion processing.

* need parents

The test for empty parents allow the code to progress, but it was not correct. Instead, dawgie.pl.dag needs to recreate the parents in the trimmed tree.

* updates to promotion

The original structure was to process the children of a node. Changed to add the children to the queue and process them directly. Those with a consistent data set are being promoted correctly.
  • Loading branch information
@al-niessner
al-niessner authored Feb 1, 2024
1 parent 9beca4d commit 0f128cf
Show file tree
Hide file tree
Showing 141 changed files with 240 additions and 202 deletions.
2 changes: 1 addition & 1 deletion .ci/Dockerfile.ap
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# COPYRIGHT:
# Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
# Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
# U.S. Government sponsorship acknowledged.
#
# All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion .ci/Dockerfile.cit
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# COPYRIGHT:
# Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
# Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
# U.S. Government sponsorship acknowledged.
#
# All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion .ci/Dockerfile.dit
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# COPYRIGHT:
# Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
# Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
# U.S. Government sponsorship acknowledged.
#
# All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion .ci/Dockerfile.ex
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# COPYRIGHT:
# Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
# Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
# U.S. Government sponsorship acknowledged.
#
# All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion .ci/Dockerfile.os
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# COPYRIGHT:
# Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
# Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
# U.S. Government sponsorship acknowledged.
#
# All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion .ci/Dockerfile.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# COPYRIGHT:
# Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
# Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
# U.S. Government sponsorship acknowledged.
#
# All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion .ci/check_01.sh
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /usr/bin/env bash

# COPYRIGHT:
# Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
# Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
# U.S. Government sponsorship acknowledged.
#
# All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion .ci/check_02.sh
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /usr/bin/env bash

# COPYRIGHT:
# Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
# Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
# U.S. Government sponsorship acknowledged.
#
# All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion .ci/check_03.sh
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /usr/bin/env bash

# COPYRIGHT:
# Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
# Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
# U.S. Government sponsorship acknowledged.
#
# All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion .ci/check_04.sh
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /usr/bin/env bash

# COPYRIGHT:
# Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
# Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
# U.S. Government sponsorship acknowledged.
#
# All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion .ci/check_05.sh
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /usr/bin/env bash

# COPYRIGHT:
# Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
# Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
# U.S. Government sponsorship acknowledged.
#
# All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion .ci/exercise_00.sh
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /usr/bin/env bash

# COPYRIGHT:
# Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
# Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
# U.S. Government sponsorship acknowledged.
#
# All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion .ci/exercise_01.sh
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /usr/bin/env bash

# COPYRIGHT:
# Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
# Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
# U.S. Government sponsorship acknowledged.
#
# All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion .ci/pypi.sh
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /usr/bin/env bash

# COPYRIGHT:
# Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
# Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
# U.S. Government sponsorship acknowledged.
#
# All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion .ci/release_notes.sh
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /bin/bash

# COPYRIGHT:
# Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
# Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
# U.S. Government sponsorship acknowledged.
#
# All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion .ci/step_00.sh
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /usr/bin/env bash

# COPYRIGHT:
# Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
# Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
# U.S. Government sponsorship acknowledged.
#
# All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion .ci/step_99.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# need to signal the parent Jenkins script of failure if any step fails

# COPYRIGHT:
# Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
# Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
# U.S. Government sponsorship acknowledged.
#
# All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion .ci/util.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

# COPYRIGHT:
# Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
# Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
# U.S. Government sponsorship acknowledged.
#
# All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion Bash/crew.sh
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /usr/bin/env bash

# COPYRIGHT:
# Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
# Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
# U.S. Government sponsorship acknowledged.
#
# All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion Bash/sdppiped.sh
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

# COPYRIGHT:
# Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
# Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
# U.S. Government sponsorship acknowledged.
#
# All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion Bash/worker.sh
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /usr/bin/env bash

# COPYRIGHT:
# Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
# Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
# U.S. Government sponsorship acknowledged.
#
# All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion Python/Coda/aws_lambda.py
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'''
COPYRIGHT:
Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
U.S. Government sponsorship acknowledged.
All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion Python/Coda/build.sh
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /usr/bin/env bash

# COPYRIGHT:
# Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
# Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
# U.S. Government sponsorship acknowledged.
#
# All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion Python/dawgie/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'''
--
COPYRIGHT:
Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
U.S. Government sponsorship acknowledged.
All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion Python/dawgie/context.py
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'''
--
COPYRIGHT:
Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
U.S. Government sponsorship acknowledged.
All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion Python/dawgie/db/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
--
COPYRIGHT:
Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
U.S. Government sponsorship acknowledged.
All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion Python/dawgie/db/lockview.py
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'''
COPYRIGHT:
Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
U.S. Government sponsorship acknowledged.
All rights reserved.
Expand Down
4 changes: 2 additions & 2 deletions Python/dawgie/db/post.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
--
COPYRIGHT:
Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
U.S. Government sponsorship acknowledged.
All rights reserved.
Expand Down Expand Up @@ -920,7 +920,7 @@ def consistent (inputs:[REF], outputs:[REF], target_name:str)->():
'sv_ID = ANY(%s) AND val_ID = ANY(%s);',
[tn_ID, task_ID, alg_IDs, sv_IDs, val_IDs])
ridbns[key].append (sorted (cur.fetchall(), key=lambda t:t[0]))
kval = ridbns[key][-1][0][1]
kval = ridbns[key][-1][-1][1]
i_runids[key].append ({runid for runid,_bn in filter
(lambda t,k=kval:t[1] == k, ridbns[key][-1])})
pass
Expand Down
2 changes: 1 addition & 1 deletion Python/dawgie/db/shelve/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
--
COPYRIGHT:
Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
U.S. Government sponsorship acknowledged.
All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion Python/dawgie/db/shelve/comms.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
--
COPYRIGHT:
Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
U.S. Government sponsorship acknowledged.
All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion Python/dawgie/db/shelve/enums.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
--
COPYRIGHT:
Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
U.S. Government sponsorship acknowledged.
All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion Python/dawgie/db/shelve/model.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
--
COPYRIGHT:
Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
U.S. Government sponsorship acknowledged.
All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion Python/dawgie/db/shelve/state.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
--
COPYRIGHT:
Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
U.S. Government sponsorship acknowledged.
All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion Python/dawgie/db/shelve/util.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
--
COPYRIGHT:
Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
U.S. Government sponsorship acknowledged.
All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion Python/dawgie/db/test.py
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
''' unit testing implementation of dawgie.db
COPYRIGHT:
Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
U.S. Government sponsorship acknowledged.
All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion Python/dawgie/db/testdata.py
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'''test data set for test13 and potenitally other uses
COPYRIGHT:
Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
U.S. Government sponsorship acknowledged.
All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion Python/dawgie/db/tools/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'''
COPYRIGHT:
Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
U.S. Government sponsorship acknowledged.
All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion Python/dawgie/db/tools/dbsinfo.py
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /usr/bin/env python3
'''
COPYRIGHT:
Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
U.S. Government sponsorship acknowledged.
All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion Python/dawgie/db/tools/extract.py
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /usr/bin/env python3
'''
COPYRIGHT:
Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
U.S. Government sponsorship acknowledged.
All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion Python/dawgie/db/tools/inter.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
'''tool to inter data for a mausoleum
COPYRIGHT:
Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
U.S. Government sponsorship acknowledged.
All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion Python/dawgie/db/tools/list.py
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /usr/bin/env python3
'''
COPYRIGHT:
Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
U.S. Government sponsorship acknowledged.
All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion Python/dawgie/db/tools/post2shelve.py
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python3
'''
COPYRIGHT:
Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
U.S. Government sponsorship acknowledged.
All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion Python/dawgie/db/tools/purge.py
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /usr/bin/env python3
'''
COPYRIGHT:
Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
U.S. Government sponsorship acknowledged.
All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion Python/dawgie/db/tools/sandbox.py
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /usr/bin/env python3
'''
COPYRIGHT:
Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
U.S. Government sponsorship acknowledged.
All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion Python/dawgie/db/tools/util.py
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'''General utility functions for all of the DB tools
COPYRIGHT:
Copyright (c) 2015-2023, California Institute of Technology ("Caltech").
Copyright (c) 2015-2024, California Institute of Technology ("Caltech").
U.S. Government sponsorship acknowledged.
All rights reserved.
Expand Down
Loading

0 comments on commit 0f128cf

Please sign in to comment.