diff options
| author | Thomas White <taw@physics.org> | 2020-08-27 10:52:41 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2020-08-27 10:52:41 +0200 |
| commit | 6520cb697a87413e8f3ee22d5f5817261f7bf3ab (patch) | |
| tree | dc93d5f269856278445cda883ad12507645462cd /src | |
| parent | beed39e09a3573380ee2cc0792b547c2f2d52852 (diff) | |
Build system parts for SLURM library
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui_backend_slurm.c | 3 | ||||
| -rw-r--r-- | src/gui_project.c | 12 |
2 files changed, 11 insertions, 4 deletions
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 <glib.h> #include <sys/wait.h> #include <gtk/gtk.h> +#include <slurm/slurm.h> #include <utils.h> @@ -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; |