Commit 0a272ea1 authored by Alberto Miranda's avatar Alberto Miranda ♨️
Browse files

Merge branch... 

Merge branch 'amiranda/67-admire-job_requirements-should-become-admire-job-requirements-symmetrically-with-job-resources' into 'main'

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

Closes #67

See merge request !83
parents 956958b6 bfbebe5e

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ message(STATUS "[${PROJECT_NAME}] Downloading and building genopts") 
FetchContent_Declare(

  genopts

  GIT_REPOSITORY https://storage.bsc.es/gitlab/utils/genopts

  GIT_TAG 1dcef400f8fbc6e1969c856ca844707b730c3002 # v0.1.0-pre

  GIT_TAG c456c2d8ec92f26d9074b123446261103e5c847c # v0.1.0-pre

  GIT_SHALLOW ON

  GIT_PROGRESS ON

)

examples/cxx/ADM_register_job.cpp

+1 −1
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
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
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
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 =