Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create batch_queue_flux as experimental module #3978

Merged
merged 8 commits into from
Jan 10, 2025
Merged

Create batch_queue_flux as experimental module #3978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a4ce2b5
Create batch_queue_flux stub
dblitt Nov 12, 2024
966e81a
Mark batch_queue_flux as experimental
dblitt Nov 12, 2024
2c017ea
flux_{submit,wait,remove}
dblitt Dec 2, 2024
ccfd878
clang format
dblitt Dec 2, 2024
1e31610
fix macos build errors?
dblitt Dec 2, 2024
542b00a
small PR changes
dblitt Dec 12, 2024
778fd1b
add memset of buffer
dblitt Dec 12, 2024
4cdb7a7
add flux to makeflow documentation
dblitt Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion batch_job/src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ SOURCES = \
batch_queue_work_queue.c \
batch_queue_cluster.c \
batch_queue_k8s.c \
batch_queue_amazon.c
batch_queue_amazon.c \
batch_queue_flux.c

PUBLIC_HEADERS = batch_queue.h batch_job.h batch_job_info.h batch_file.h batch_wrapper.h

Expand Down
4 changes: 3 additions & 1 deletion batch_job/src/batch_queue.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ See the file COPYING for details.
extern const struct batch_queue_module batch_queue_amazon;
extern const struct batch_queue_module batch_queue_cluster;
extern const struct batch_queue_module batch_queue_condor;
extern const struct batch_queue_module batch_queue_flux;
extern const struct batch_queue_module batch_queue_local;
extern const struct batch_queue_module batch_queue_moab;
extern const struct batch_queue_module batch_queue_uge;
Expand All @@ -45,13 +46,14 @@ static struct batch_queue_module batch_queue_unknown = {
NULL,
};

#define BATCH_JOB_SYSTEMS "local, vine, wq, condor, uge (sge), pbs, lsf, torque, moab, slurm, amazon, k8s, dryrun"
#define BATCH_JOB_SYSTEMS "local, vine, wq, condor, uge (sge), pbs, lsf, torque, moab, slurm, amazon, k8s, flux, dryrun"

const struct batch_queue_module *const batch_queue_modules[] = {
&batch_queue_amazon,
&batch_queue_cluster,
&batch_queue_condor,
&batch_queue_dryrun,
&batch_queue_flux,
&batch_queue_local,
&batch_queue_moab,
&batch_queue_uge,
Expand Down
5 changes: 3 additions & 2 deletions batch_job/src/batch_queue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Basic use is as follows:

<pre>
// Create a queue for submitting to HTCondor.
struct batch_queue *queue = batch_queue_create(BATCH_QUEUE_TYPE_CONDOR);
struct batch_queue *queue = batch_queue_create(BATCH_QUEUE_TYPE_CONDOR,0,0);

// Define a batch job consiting of a command with input and output files.
struct batch_job *job = batch_job_create(queue);
Expand All @@ -43,7 +43,7 @@ batch_job_add_input_file(job,"/usr/share/dict/words","words.txt");
batch_job_add_output_file(job,"output.txt","output.txt");

// Submit the job to the queue, which returns a jobid
batch_job_id_t jobid = batch_queue_submit(queue,job);
batch_queue_id_t jobid = batch_queue_submit(queue,job);
printf("jobid %" PRIbjid" submitted\n",jobid);

// Wait for a job to complete, which returns the jobid and info.
Expand Down Expand Up @@ -79,6 +79,7 @@ typedef enum {
BATCH_QUEUE_TYPE_TORQUE, /**< Batch jobs will be send to the Torque scheduler. */
BATCH_QUEUE_TYPE_AMAZON, /**< Batch jobs will be run inside Amazon EC2 Instances */
BATCH_QUEUE_TYPE_K8S, /**< Batch jobs will be run inside Kubernetes pods. */
BATCH_QUEUE_TYPE_FLUX, /**< Batch jobs will be run on Flux. */
BATCH_QUEUE_TYPE_DRYRUN, /**< Batch jobs will not actually run. */
BATCH_QUEUE_TYPE_UNKNOWN = -1 /**< An invalid batch queue type. */
} batch_queue_type_t;
Expand Down
Loading
Loading