grahamc/hydra2 - Change FHXU6346V2UFSLCIVXTPRJUBBACOACJ7LFD432IVALTYYHEE4DEQC

hydra-eval-jobs: Pass all inputs as 'inputs' arg.

If there is no input named 'inputs', hydra-eval-jobs now passes in a set of lists, where each attribute corresponds to an input defined in the jobset specification and each list element is a different input alt, as an argument named 'inputs'.

Among other things, this allows for generic hydra expressions to be shared amongst projects with similar structures but different sets of specific inputs.

Created by Shea Levy on August 4, 2015

FHXU6346V2UFSLCIVXTPRJUBBACOACJ7LFD432IVALTYYHEE4DEQC

Dependencies

In channels

main

Change contents

Insertion in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 256 [3.303]

[2.1432]

        Value * inputsSet = state.allocValue();
        state.mkAttrs(*inputsSet, autoArgs_.size());

Insertion in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 259 [3.303]

[2.1469]

            Symbol inputName = state.symbols.create(i.first);
            Value * inputAttr = state.allocAttr(*inputsSet, inputName);
            state.mkList(*inputAttr, i.second.size());
            int altIndex = 0;

Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 269 [3.303]

B:BD[2.1750] → [2.1750:1820]

                autoArgs[state.symbols.create(i.first)].push_back(v);

[2.1750]

[2.1820]

                autoArgs[inputName].push_back(v);
                inputAttr->list.elems[altIndex++] = v;

Insertion in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 273 [3.303]

[2.1844]

[4.1624]

        Symbol sInputs = state.symbols.create("inputs");
        if (autoArgs.find(sInputs) == autoArgs.end()) {
            inputsSet->attrs->sort();
            autoArgs[sInputs].push_back(inputsSet);
        }