From 6520cb697a87413e8f3ee22d5f5817261f7bf3ab Mon Sep 17 00:00:00 2001 From: Thomas White Date: Thu, 27 Aug 2020 10:52:41 +0200 Subject: Build system parts for SLURM library --- src/gui_backend_slurm.c | 3 +++ src/gui_project.c | 12 ++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/gui_backend_slurm.c b/src/gui_backend_slurm.c index c2b2b93e..dfd0d9f5 100644 --- a/src/gui_backend_slurm.c +++ b/src/gui_backend_slurm.c @@ -30,6 +30,7 @@ #include #include #include +#include #include @@ -79,6 +80,8 @@ static void *run_indexing(const char *job_title, void *opts_priv) { //struct slurm_indexing_opts *opts = opts_priv; + STATUS("SLURM API version = %li\n", + slurm_api_version()); return NULL; } diff --git a/src/gui_project.c b/src/gui_project.c index 637aa85d..7b9c44c8 100644 --- a/src/gui_project.c +++ b/src/gui_project.c @@ -559,17 +559,21 @@ void default_project(struct crystfelproject *proj) proj->indexing_new_job_title = NULL; /* FIXME: Crappy error handling */ - proj->n_backends = 2; - proj->backends = malloc(proj->n_backends*sizeof(struct crystfel_backend)); + proj->n_backends = 0; + proj->backends = malloc(2*sizeof(struct crystfel_backend)); if ( proj->backends == NULL ) { ERROR("Couldn't allocate space for backends\n"); } - if ( make_local_backend(&proj->backends[0]) ) { + + if ( make_local_backend(&proj->backends[proj->n_backends++]) ) { ERROR("Local backend setup failed\n"); } - if ( make_slurm_backend(&proj->backends[1]) ) { + + #ifdef HAVE_SLURM + if ( make_slurm_backend(&proj->backends[proj->n_backends++]) ) { ERROR("SLURM backend setup failed\n"); } + #endif /* Default parameter values */ proj->show_peaks = 0; -- cgit v1.2.3