Draft: Resolve "Integrate with Cargo"

Alberto Mirandarequested to merge
amiranda/111-integrate-with-cargo into main

Closes #111 (closed)

Merge request reports

examples/c/ADM_cancel_transfer.c

+14 −12
Changes for examples/c/ADM_cancel_transfer.c: 14 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -28,11 +28,6 @@ 
#include <assert.h>

#include "common.h"



#define NJOB_NODES   50

#define NADHOC_NODES 25

#define NINPUTS      10

#define NOUTPUTS     5



int

main(int argc, char* argv[]) {
@@ -55,10 +50,15 @@ main(int argc, char* argv[]) { 
    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);

    ADM_dataset_route_t* inputs =

            prepare_routes("%s-input-dataset-%d", NINPUTS);

    assert(inputs);

    ADM_dataset_t* outputs = prepare_datasets("output-dataset-%d", NOUTPUTS);

    ADM_dataset_route_t* outputs =

            prepare_routes("%s-output-dataset-%d", NOUTPUTS);

    assert(outputs);

    ADM_dataset_route_t* expected_outputs =

            prepare_routes("%s-exp-output-dataset-%d", NEXPOUTPUTS);

    assert(expected_outputs);



    ADM_job_resources_t job_resources =

            ADM_job_resources_create(job_nodes, NJOB_NODES);
@@ -69,8 +69,8 @@ main(int argc, char* argv[]) { 
    assert(adhoc_resources);



    ADM_adhoc_context_t ctx = ADM_adhoc_context_create(

            cli_args.controller_address, ADM_ADHOC_MODE_SEPARATE_NEW,

            ADM_ADHOC_ACCESS_RDWR, 100, false);

            cli_args.controller_address, cli_args.data_stager_address,

            ADM_ADHOC_MODE_SEPARATE_NEW, ADM_ADHOC_ACCESS_RDWR, 100, false);

    assert(ctx);



    const char* name = "adhoc_storage_42";
@@ -90,7 +90,8 @@ main(int argc, char* argv[]) { 
    }



    ADM_job_requirements_t reqs = ADM_job_requirements_create(

            inputs, NINPUTS, outputs, NOUTPUTS, adhoc_storage);

            inputs, NINPUTS, outputs, NOUTPUTS, expected_outputs, NEXPOUTPUTS,

            adhoc_storage);

    assert(reqs);



    uint64_t slurm_job_id = 42;
@@ -143,7 +144,8 @@ main(int argc, char* argv[]) { 
cleanup:

    ADM_remove_job(server, job);

    ADM_server_destroy(server);

    destroy_datasets(inputs, NINPUTS);

    destroy_datasets(outputs, NOUTPUTS);

    destroy_routes(inputs, NINPUTS);

    destroy_routes(outputs, NOUTPUTS);

    destroy_routes(expected_outputs, NEXPOUTPUTS);

    exit(exit_status);

}

examples/c/ADM_connect_data_operation.c

+15 −12
Changes for examples/c/ADM_connect_data_operation.c: 15 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -28,11 +28,6 @@ 
#include <assert.h>

#include "common.h"



#define NJOB_NODES   50

#define NADHOC_NODES 25

#define NINPUTS      10

#define NOUTPUTS     5



int

main(int argc, char* argv[]) {
@@ -55,18 +50,23 @@ main(int argc, char* argv[]) { 
    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);

    ADM_dataset_route_t* inputs =

            prepare_routes("%s-input-dataset-%d", NINPUTS);

    assert(inputs);

    ADM_dataset_t* outputs = prepare_datasets("output-dataset-%d", NOUTPUTS);

    ADM_dataset_route_t* outputs =

            prepare_routes("%s-output-dataset-%d", NOUTPUTS);

    assert(outputs);

    ADM_dataset_route_t* expected_outputs =

            prepare_routes("%s-exp-output-dataset-%d", NEXPOUTPUTS);

    assert(expected_outputs);



    ADM_adhoc_resources_t adhoc_resources =

            ADM_adhoc_resources_create(adhoc_nodes, NADHOC_NODES);

    assert(adhoc_resources);



    ADM_adhoc_context_t ctx = ADM_adhoc_context_create(

            cli_args.controller_address, ADM_ADHOC_MODE_SEPARATE_NEW,

            ADM_ADHOC_ACCESS_RDWR, 100, false);

            cli_args.controller_address, cli_args.data_stager_address,

            ADM_ADHOC_MODE_SEPARATE_NEW, ADM_ADHOC_ACCESS_RDWR, 100, false);

    assert(ctx);



    const char* name = "adhoc_storage_42";
@@ -90,7 +90,8 @@ main(int argc, char* argv[]) { 
    assert(job_resources);



    ADM_job_requirements_t reqs = ADM_job_requirements_create(

            inputs, NINPUTS, outputs, NOUTPUTS, adhoc_storage);

            inputs, NINPUTS, outputs, NOUTPUTS, expected_outputs, NEXPOUTPUTS,

            adhoc_storage);

    assert(reqs);



    uint64_t slurm_job_id = 42;
@@ -108,8 +109,8 @@ main(int argc, char* argv[]) { 
    exit_status = EXIT_SUCCESS;



    bool should_stream = false;

    ret = ADM_connect_data_operation(server, job, inputs[0], outputs[0],

                                     should_stream);

    ret = ADM_connect_data_operation(server, job, /*inputs[0]*/ NULL,

                                     /*outputs[0]*/ NULL, should_stream);





    if(ret != ADM_SUCCESS) {
@@ -125,6 +126,7 @@ main(int argc, char* argv[]) { 
                    "successfully\n");



cleanup:

    /*

    for(int i = 0; i < NINPUTS; ++i) {

        ADM_dataset_destroy(inputs[i]);

    }
@@ -132,6 +134,7 @@ cleanup: 
    for(int i = 0; i < NOUTPUTS; ++i) {

        ADM_dataset_destroy(outputs[i]);

    }

    */



    ADM_remove_job(server, job);

    ADM_server_destroy(server);

examples/c/ADM_define_data_operation.c

+11 −10
Changes for examples/c/ADM_define_data_operation.c: 11 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -28,11 +28,6 @@ 
#include <assert.h>

#include "common.h"



#define NJOB_NODES   50

#define NADHOC_NODES 25

#define NINPUTS      10

#define NOUTPUTS     5



int

main(int argc, char* argv[]) {
@@ -56,10 +51,15 @@ main(int argc, char* argv[]) { 
    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);

    ADM_dataset_route_t* inputs =

            prepare_routes("%s-input-dataset-%d", NINPUTS);

    assert(inputs);

    ADM_dataset_t* outputs = prepare_datasets("output-dataset-%d", NOUTPUTS);

    ADM_dataset_route_t* outputs =

            prepare_routes("%s-output-dataset-%d", NOUTPUTS);

    assert(outputs);

    ADM_dataset_route_t* expected_outputs =

            prepare_routes("%s-exp-output-dataset-%d", NEXPOUTPUTS);

    assert(expected_outputs);



    ADM_job_resources_t job_resources =

            ADM_job_resources_create(job_nodes, NJOB_NODES);
@@ -70,8 +70,8 @@ main(int argc, char* argv[]) { 
    assert(adhoc_resources);



    ADM_adhoc_context_t ctx = ADM_adhoc_context_create(

            cli_args.controller_address, ADM_ADHOC_MODE_SEPARATE_NEW,

            ADM_ADHOC_ACCESS_RDWR, 100, false);

            cli_args.controller_address, cli_args.data_stager_address,

            ADM_ADHOC_MODE_SEPARATE_NEW, ADM_ADHOC_ACCESS_RDWR, 100, false);

    assert(ctx);



    const char* name = "adhoc_storage_42";
@@ -91,7 +91,8 @@ main(int argc, char* argv[]) { 
    }



    ADM_job_requirements_t reqs = ADM_job_requirements_create(

            inputs, NINPUTS, outputs, NOUTPUTS, adhoc_storage);

            inputs, NINPUTS, outputs, NOUTPUTS, expected_outputs, NEXPOUTPUTS,

            adhoc_storage);

    assert(reqs);



    uint64_t slurm_job_id = 42;

examples/c/ADM_deploy_adhoc_storage.c

+6 −10
Changes for examples/c/ADM_deploy_adhoc_storage.c: 6 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -27,10 +27,6 @@ 
#include <scord/scord.h>

#include "common.h"



#define NADHOC_NODES 25

#define NINPUTS      10

#define NOUTPUTS     5



int

main(int argc, char* argv[]) {
@@ -82,9 +78,9 @@ main(int argc, char* argv[]) { 
    }



    // 3. the adhoc storage execution context

    adhoc_ctx = ADM_adhoc_context_create(cli_args.controller_address,

                                         ADM_ADHOC_MODE_SEPARATE_NEW,

                                         ADM_ADHOC_ACCESS_RDWR, 100, false);

    adhoc_ctx = ADM_adhoc_context_create(

            cli_args.controller_address, cli_args.data_stager_address,

            ADM_ADHOC_MODE_SEPARATE_NEW, ADM_ADHOC_ACCESS_RDWR, 100, false);



    if(adhoc_ctx == NULL) {

        fprintf(stderr, "Fatal error preparing adhoc context\n");
@@ -115,9 +111,9 @@ main(int argc, char* argv[]) { 
    // system, let's prepare a new execution context for the adhoc

    // storage system



    new_adhoc_ctx = ADM_adhoc_context_create(cli_args.controller_address,

                                             ADM_ADHOC_MODE_SEPARATE_NEW,

                                             ADM_ADHOC_ACCESS_RDWR, 200, false);

    new_adhoc_ctx = ADM_adhoc_context_create(

            cli_args.controller_address, cli_args.data_stager_address,

            ADM_ADHOC_MODE_SEPARATE_NEW, ADM_ADHOC_ACCESS_RDWR, 200, false);



    if(new_adhoc_ctx == NULL) {

        fprintf(stderr, "Fatal error preparing new adhoc context\n");

examples/c/ADM_finalize_data_operation.c

+11 −10
Changes for examples/c/ADM_finalize_data_operation.c: 11 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -28,11 +28,6 @@ 
#include <assert.h>

#include "common.h"



#define NJOB_NODES   50

#define NADHOC_NODES 25

#define NINPUTS      10

#define NOUTPUTS     5



int

main(int argc, char* argv[]) {
@@ -55,18 +50,23 @@ main(int argc, char* argv[]) { 
    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);

    ADM_dataset_route_t* inputs =

            prepare_routes("%s-input-dataset-%d", NINPUTS);

    assert(inputs);

    ADM_dataset_t* outputs = prepare_datasets("output-dataset-%d", NOUTPUTS);

    ADM_dataset_route_t* outputs =

            prepare_routes("%s-output-dataset-%d", NOUTPUTS);

    assert(outputs);

    ADM_dataset_route_t* expected_outputs =

            prepare_routes("%s-exp-output-dataset-%d", NEXPOUTPUTS);

    assert(expected_outputs);



    ADM_adhoc_resources_t adhoc_resources =

            ADM_adhoc_resources_create(adhoc_nodes, NADHOC_NODES);

    assert(adhoc_resources);



    ADM_adhoc_context_t ctx = ADM_adhoc_context_create(

            cli_args.controller_address, ADM_ADHOC_MODE_SEPARATE_NEW,

            ADM_ADHOC_ACCESS_RDWR, 100, false);

            cli_args.controller_address, cli_args.data_stager_address,

            ADM_ADHOC_MODE_SEPARATE_NEW, ADM_ADHOC_ACCESS_RDWR, 100, false);

    assert(ctx);



    const char* name = "adhoc_storage_42";
@@ -90,7 +90,8 @@ main(int argc, char* argv[]) { 
    assert(job_resources);



    ADM_job_requirements_t reqs = ADM_job_requirements_create(

            inputs, NINPUTS, outputs, NOUTPUTS, adhoc_storage);

            inputs, NINPUTS, outputs, NOUTPUTS, expected_outputs, NEXPOUTPUTS,

            adhoc_storage);

    assert(reqs);



    uint64_t slurm_job_id = 42;