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

Merge branch... 

Merge branch 'amiranda/69-adm_register_adhoc_storage-requires-obsolete-adm_job_t-argument' into 'main'

Resolve "`ADM_register_adhoc_storage` requires obsolete `ADM_job_t` argument."

Closes #69

See merge request !50
parents f4303a6d baa03b10

examples/c/ADM_deploy_adhoc_storage.c

+2 −17
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include <assert.h>

#include "common.h"



#define NJOB_NODES   50

#define NADHOC_NODES 25

#define NINPUTS      10

#define NOUTPUTS     5
@@ -45,9 +44,6 @@ main(int argc, char* argv[]) { 
    int exit_status = EXIT_SUCCESS;

    ADM_server_t server = ADM_server_create("tcp", argv[1]);



    ADM_job_t job;

    ADM_node_t* job_nodes = prepare_nodes(NJOB_NODES);

    assert(job_nodes);

    ADM_node_t* adhoc_nodes = prepare_nodes(NADHOC_NODES);

    assert(adhoc_nodes);

    ADM_dataset_t* inputs = prepare_datasets("input-dataset-%d", NINPUTS);
@@ -55,10 +51,6 @@ main(int argc, char* argv[]) { 
    ADM_dataset_t* outputs = prepare_datasets("output-dataset-%d", NOUTPUTS);

    assert(outputs);



    ADM_job_resources_t job_resources =

            ADM_job_resources_create(job_nodes, NJOB_NODES);

    assert(job_resources);



    ADM_adhoc_resources_t adhoc_resources =

            ADM_adhoc_resources_create(adhoc_nodes, NADHOC_NODES);

    assert(adhoc_resources);
@@ -75,18 +67,11 @@ main(int argc, char* argv[]) { 
            ADM_job_requirements_create(inputs, NINPUTS, outputs, NOUTPUTS, st);

    assert(reqs);



    ADM_return_t ret = ADM_register_job(server, job_resources, reqs, &job);



    if(ret != ADM_SUCCESS) {

        fprintf(stdout, "ADM_register_job() remote procedure not completed "

                        "successfully\n");

        exit_status = EXIT_FAILURE;

    }



    const char* user_id = "adhoc_storage_42";



    ADM_storage_t adhoc_storage;

    ret = ADM_register_adhoc_storage(server, job, user_id, ctx, &adhoc_storage);

    ADM_return_t ret =

            ADM_register_adhoc_storage(server, user_id, ctx, &adhoc_storage);



    if(ret != ADM_SUCCESS) {

        fprintf(stdout,

examples/c/ADM_register_adhoc_storage.c

+2 −17
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include "common.h"



#define NADHOC_NODES 25

#define NJOB_NODES   50

#define NINPUTS      10

#define NOUTPUTS     5
@@ -45,9 +44,6 @@ main(int argc, char* argv[]) { 
    int exit_status = EXIT_SUCCESS;

    ADM_server_t server = ADM_server_create("tcp", argv[1]);



    ADM_job_t job;

    ADM_node_t* job_nodes = prepare_nodes(NJOB_NODES);

    assert(job_nodes);

    ADM_node_t* adhoc_nodes = prepare_nodes(NADHOC_NODES);

    assert(adhoc_nodes);

    ADM_dataset_t* inputs = prepare_datasets("input-dataset-%d", NINPUTS);
@@ -55,10 +51,6 @@ main(int argc, char* argv[]) { 
    ADM_dataset_t* outputs = prepare_datasets("output-dataset-%d", NOUTPUTS);

    assert(outputs);



    ADM_job_resources_t job_resources =

            ADM_job_resources_create(job_nodes, NJOB_NODES);

    assert(job_resources);



    ADM_adhoc_resources_t adhoc_resources =

            ADM_adhoc_resources_create(adhoc_nodes, NADHOC_NODES);

    assert(adhoc_resources);
@@ -75,18 +67,11 @@ main(int argc, char* argv[]) { 
            ADM_job_requirements_create(inputs, NINPUTS, outputs, NOUTPUTS, st);

    assert(reqs);



    ADM_return_t ret = ADM_register_job(server, job_resources, reqs, &job);



    if(ret != ADM_SUCCESS) {

        fprintf(stdout, "ADM_register_job() remote procedure not completed "

                        "successfully\n");

        exit_status = EXIT_FAILURE;

    }



    const char* user_id = "adhoc_storage_42";



    ADM_storage_t adhoc_storage;

    ret = ADM_register_adhoc_storage(server, job, user_id, ctx, &adhoc_storage);

    ADM_return_t ret =

            ADM_register_adhoc_storage(server, user_id, ctx, &adhoc_storage);



    if(ret != ADM_SUCCESS) {

        fprintf(stdout,

examples/c/ADM_remove_adhoc_storage.c

+2 −17
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include <assert.h>

#include "common.h"



#define NJOB_NODES   50

#define NADHOC_NODES 25

#define NINPUTS      10

#define NOUTPUTS     5
@@ -45,9 +44,6 @@ main(int argc, char* argv[]) { 
    int exit_status = EXIT_SUCCESS;

    ADM_server_t server = ADM_server_create("tcp", argv[1]);



    ADM_job_t job;

    ADM_node_t* job_nodes = prepare_nodes(NJOB_NODES);

    assert(job_nodes);

    ADM_node_t* adhoc_nodes = prepare_nodes(NADHOC_NODES);

    assert(adhoc_nodes);

    ADM_dataset_t* inputs = prepare_datasets("input-dataset-%d", NINPUTS);
@@ -55,10 +51,6 @@ main(int argc, char* argv[]) { 
    ADM_dataset_t* outputs = prepare_datasets("output-dataset-%d", NOUTPUTS);

    assert(outputs);



    ADM_job_resources_t job_resources =

            ADM_job_resources_create(job_nodes, NJOB_NODES);

    assert(job_resources);



    ADM_adhoc_resources_t adhoc_resources =

            ADM_adhoc_resources_create(adhoc_nodes, NADHOC_NODES);

    assert(adhoc_resources);
@@ -75,18 +67,11 @@ main(int argc, char* argv[]) { 
            ADM_job_requirements_create(inputs, NINPUTS, outputs, NOUTPUTS, st);

    assert(reqs);



    ADM_return_t ret = ADM_register_job(server, job_resources, reqs, &job);



    if(ret != ADM_SUCCESS) {

        fprintf(stdout, "ADM_register_job() remote procedure not completed "

                        "successfully\n");

        exit_status = EXIT_FAILURE;

    }



    const char* user_id = "adhoc_storage_42";



    ADM_storage_t adhoc_storage;

    ret = ADM_register_adhoc_storage(server, job, user_id, ctx, &adhoc_storage);

    ADM_return_t ret =

            ADM_register_adhoc_storage(server, user_id, ctx, &adhoc_storage);



    if(ret != ADM_SUCCESS) {

        fprintf(stdout,

examples/c/ADM_update_adhoc_storage.c

+2 −18
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include <assert.h>

#include "common.h"



#define NJOB_NODES   50

#define NADHOC_NODES 25

#define NINPUTS      10

#define NOUTPUTS     5
@@ -45,9 +44,6 @@ main(int argc, char* argv[]) { 
    int exit_status = EXIT_SUCCESS;

    ADM_server_t server = ADM_server_create("tcp", argv[1]);



    ADM_job_t job;

    ADM_node_t* job_nodes = prepare_nodes(NJOB_NODES);

    assert(job_nodes);

    ADM_node_t* adhoc_nodes = prepare_nodes(NADHOC_NODES);

    assert(adhoc_nodes);

    ADM_dataset_t* inputs = prepare_datasets("input-dataset-%d", NINPUTS);
@@ -55,10 +51,6 @@ main(int argc, char* argv[]) { 
    ADM_dataset_t* outputs = prepare_datasets("output-dataset-%d", NOUTPUTS);

    assert(outputs);



    ADM_job_resources_t job_resources =

            ADM_job_resources_create(job_nodes, NJOB_NODES);

    assert(job_resources);



    ADM_adhoc_resources_t adhoc_resources =

            ADM_adhoc_resources_create(adhoc_nodes, NADHOC_NODES);

    assert(adhoc_resources);
@@ -75,19 +67,11 @@ main(int argc, char* argv[]) { 
            ADM_job_requirements_create(inputs, NINPUTS, outputs, NOUTPUTS, st);

    assert(reqs);



    ADM_return_t ret = ADM_register_job(server, job_resources, reqs, &job);



    if(ret != ADM_SUCCESS) {

        fprintf(stdout, "ADM_register_job() remote procedure not completed "

                        "successfully\n");

        exit_status = EXIT_FAILURE;

        goto cleanup;

    }



    const char* user_id = "adhoc_storage_42";



    ADM_storage_t adhoc_storage;

    ret = ADM_register_adhoc_storage(server, job, user_id, ctx, &adhoc_storage);

    ADM_return_t ret =

            ADM_register_adhoc_storage(server, user_id, ctx, &adhoc_storage);



    if(ret != ADM_SUCCESS) {

        fprintf(stdout,

examples/cxx/ADM_register_adhoc_storage.cpp

+5 −14
Original line number Diff line number Diff line
@@ -61,28 +61,19 @@ main(int argc, char* argv[]) { 
            admire::adhoc_storage::execution_mode::separate_new,

            admire::adhoc_storage::access_type::read_write,

            admire::adhoc_storage::resources{adhoc_nodes}, 100, false};

    ADM_return_t ret = ADM_SUCCESS;



    try {

        const auto job = admire::register_job(

                server, admire::job::resources{job_nodes}, reqs);

        const auto adhoc_storage = admire::register_adhoc_storage(

                server, job, user_id, adhoc_storage_ctx);

                server, user_id, adhoc_storage_ctx);



        fmt::print(stdout,

                   "ADM_register_adhoc_storage() remote procedure completed "

                   "successfully\n");

    } catch(const std::exception& e) {

        fmt::print(stderr, "FATAL: ADM_register_adhoc_storage() failed: {}\n",

                   e.what());

        exit(EXIT_FAILURE);

    }



    if(ret != ADM_SUCCESS) {

        fmt::print(

                stdout,

                "ADM_register_adhoc_storage() remote procedure not completed "

                "successfully\n");

        exit(EXIT_FAILURE);

    }



    fmt::print(stdout,

               "ADM_register_adhoc_storage() remote procedure completed "

               "successfully\n");

}