Resolve "`admire::job_requirements` should become `admire::job::requirements` symmetrically with `job::resources`"

Alberto Mirandarequested to merge
amiranda/67-admire-job_requirements-should-become-admire-job-requirements-symmetrically-with-job-resources into main

Closes #67 (closed)

Edited by Alberto Miranda

Merge request reports

examples/cxx/ADM_register_job.cpp

+1 −1
Changes for examples/cxx/ADM_register_job.cpp: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ main(int argc, char* argv[]) { 
                server, name, scord::adhoc_storage::type::gekkofs,

                adhoc_storage_ctx);



        scord::job_requirements reqs(inputs, outputs, adhoc_storage);

        scord::job::requirements reqs(inputs, outputs, adhoc_storage);



        [[maybe_unused]] const auto job = scord::register_job(

                server, scord::job::resources{job_nodes}, reqs, 0);

examples/cxx/ADM_remove_job.cpp

+1 −1
Changes for examples/cxx/ADM_remove_job.cpp: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ main(int argc, char* argv[]) { 
                server, name, scord::adhoc_storage::type::gekkofs,

                adhoc_storage_ctx);



        scord::job_requirements reqs(inputs, outputs, adhoc_storage);

        scord::job::requirements reqs(inputs, outputs, adhoc_storage);



        [[maybe_unused]] const auto job = scord::register_job(

                server, scord::job::resources{job_nodes}, reqs, 0);

examples/cxx/ADM_transfer_datasets.cpp

+1 −1
Changes for examples/cxx/ADM_transfer_datasets.cpp: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ main(int argc, char* argv[]) { 
                server, name, scord::adhoc_storage::type::gekkofs,

                adhoc_storage_ctx);



        scord::job_requirements reqs(inputs, outputs, adhoc_storage);

        scord::job::requirements reqs(inputs, outputs, adhoc_storage);



        const auto job = scord::register_job(

                server, scord::job::resources{job_nodes}, reqs, 0);

examples/cxx/ADM_update_job.cpp

+1 −1
Changes for examples/cxx/ADM_update_job.cpp: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ main(int argc, char* argv[]) { 
                    scord::adhoc_storage::access_type::read_write,

                    scord::adhoc_storage::resources{adhoc_nodes}, 100, false});



    scord::job_requirements reqs{inputs, outputs, gkfs_storage};

    scord::job::requirements reqs{inputs, outputs, gkfs_storage};



    const auto new_inputs = prepare_datasets("input-new-dataset-{}", NINPUTS);

    const auto new_outputs =

src/lib/detail/impl.cpp

+1 −1
Changes for src/lib/detail/impl.cpp: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ ping(const server& srv) { 


tl::expected<scord::job, scord::error_code>

register_job(const server& srv, const job::resources& job_resources,

             const job_requirements& job_requirements,

             const job::requirements& job_requirements,

             scord::slurm_job_id slurm_id) {



    scord::network::client rpc_client{srv.protocol()};