Verified Commit 20f11988 authored by Alberto Miranda's avatar Alberto Miranda ♨️
Browse files

WIP: foo (to merge with 79a38579)

parent 755ffd5f
Loading
Loading
Loading
Loading
Loading
+12 −10
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);
@@ -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);
}
+13 −10
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_adhoc_resources_t adhoc_resources =
            ADM_adhoc_resources_create(adhoc_nodes, NADHOC_NODES);
@@ -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);
+9 −8
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);
@@ -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;
+0 −4
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[]) {

+9 −8
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_adhoc_resources_t adhoc_resources =
            ADM_adhoc_resources_create(adhoc_nodes, NADHOC_NODES);
@@ -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;
Loading